ignite git commit: ignite-1079 debug
Repository: ignite Updated Branches: refs/heads/ignite-1079 [created] edced9938 ignite-1079 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/edced993 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/edced993 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/edced993 Branch: refs/heads/ignite-1079 Commit: edced9938ba9fcb1230e0b8c6039b2f638475b5a Parents: ce3f20b Author: sboikov Authored: Tue Sep 29 10:26:29 2015 +0300 Committer: sboikov Committed: Tue Sep 29 10:26:29 2015 +0300 -- .../testsuites/IgniteCacheTestSuite4.java | 142 +-- 1 file changed, 4 insertions(+), 138 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/edced993/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index 3842336..50f1842 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@ -136,145 +136,11 @@ public class IgniteCacheTestSuite4 extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("IgniteCache Test Suite part 4"); -// Multi node update. -suite.addTestSuite(GridCacheMultinodeUpdateSelfTest.class); -suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledSelfTest.class); - suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.class); -suite.addTestSuite(GridCacheMultinodeUpdateAtomicSelfTest.class); - suite.addTestSuite(GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.class); - -suite.addTestSuite(IgniteCacheAtomicLoadAllTest.class); -suite.addTestSuite(IgniteCacheAtomicLocalLoadAllTest.class); -suite.addTestSuite(IgniteCacheTxLoadAllTest.class); -suite.addTestSuite(IgniteCacheTxLocalLoadAllTest.class); - -suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class); -suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class); - -suite.addTestSuite(IgniteCacheAtomicStoreSessionTest.class); -suite.addTestSuite(IgniteCacheTxStoreSessionTest.class); -suite.addTestSuite(IgniteCacheAtomicStoreSessionWriteBehindTest.class); -suite.addTestSuite(IgniteCacheTxStoreSessionWriteBehindTest.class); - -suite.addTestSuite(IgniteCacheAtomicNoReadThroughTest.class); - suite.addTestSuite(IgniteCacheAtomicNearEnabledNoReadThroughTest.class); -suite.addTestSuite(IgniteCacheAtomicLocalNoReadThroughTest.class); -suite.addTestSuite(IgniteCacheTxNoReadThroughTest.class); -suite.addTestSuite(IgniteCacheTxNearEnabledNoReadThroughTest.class); -suite.addTestSuite(IgniteCacheTxLocalNoReadThroughTest.class); - -suite.addTestSuite(IgniteCacheAtomicNoLoadPreviousValueTest.class); - suite.addTestSuite(IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.class); - suite.addTestSuite(IgniteCacheAtomicLocalNoLoadPreviousValueTest.class); -suite.addTestSuite(IgniteCacheTxNoLoadPreviousValueTest.class); - suite.addTestSuite(IgniteCacheTxNearEnabledNoLoadPreviousValueTest.class); -suite.addTestSuite(IgniteCacheTxLocalNoLoadPreviousValueTest.class); - -suite.addTestSuite(IgniteCacheAtomicNoWriteThroughTest.class); - suite.addTestSuite(IgniteCacheAtomicNearEnabledNoWriteThroughTest.class); -suite.addTestSuite(IgniteCacheAtomicLocalNoWriteThroughTest.class); -suite.addTestSuite(IgniteCacheTxNoWriteThroughTest.class); -suite.addTestSuite(IgniteCacheTxNearEnabledNoWriteThroughTest.class); -suite.addTestSuite(IgniteCacheTxLocalNoWriteThroughTest.class); - -suite.addTestSuite(IgniteCacheAtomicPeekModesTest.class); -suite.addTestSuite(IgniteCacheAtomicNearPeekModesTest.class); -suite.addTestSuite(IgniteCacheAtomicReplicatedPeekModesTest.class); -suite.addTestSuite(IgniteCacheAtomicLocalPeekModesTest.class); -suite.addTestSuite(IgniteCacheTxPeekModesTest.class); -suite.addTestSuite(IgniteCacheTxNearPeekModesTest.class); -suite.addTestSuite(IgniteCacheTxLocalPeekModesTest.class); -suite.addTestSuite(IgniteCacheTxReplicatedPeekModesTest.class); - -suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class); -suite.addTestSuite(GridCacheVersionMultinodeTest.class); - -suite.addTestSuite(IgniteCacheNearReadCommittedTest.class); -suite.addTestSuite(IgniteCa
ignite git commit: ignite-1485 Only not indexed fields.
Repository: ignite Updated Branches: refs/heads/ignite-843 87d9f4150 -> ae8035828 ignite-1485 Only not indexed fields. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae803582 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae803582 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae803582 Branch: refs/heads/ignite-843 Commit: ae8035828ee122f1cf1309fe369361fcaa2ab4ad Parents: 87d9f41 Author: Andrey Authored: Tue Sep 29 15:01:52 2015 +0700 Committer: Andrey Committed: Tue Sep 29 15:01:52 2015 +0700 -- .../main/js/controllers/metadata-controller.js| 18 +- 1 file changed, 17 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ae803582/modules/control-center-web/src/main/js/controllers/metadata-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index c14169f..8a8f085 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -452,7 +452,8 @@ consoleModule.controller('metadataController', [ var colName = col.name; var jdbcType = $common.findJdbcType(col.type); -qryFields.push(queryField(colName, jdbcType)); +if (!fieldIndexed(colName, table)) +qryFields.push(queryField(colName, jdbcType)); if (_.includes(table.ascCols, colName)) ascFields.push(queryField(colName, jdbcType)); @@ -524,6 +525,21 @@ consoleModule.controller('metadataController', [ }); /** + * Check field with specified name is indexed. + * + * @param name Field name. + * @param table Table to check indexed fields. + * @returns {boolean} True when field is indexed of false otherwise. + */ +function fieldIndexed(name, table) { +// Check if in asc or desc fields. +if (_.includes(table.ascCols, name) || _.includes(table.descCols, name) || !table.idxs) +return true; + +return _.findKey(table.idxs, function(fields) { return _.includes(Object.keys(fields), name); }) != undefined; +} + +/** * Generate message to show on confirm dialog. * * @param meta Object to confirm.
ignite git commit: ignite-1219 Required field.
Repository: ignite Updated Branches: refs/heads/ignite-843 ae8035828 -> 24dcc8dda ignite-1219 Required field. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24dcc8dd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24dcc8dd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24dcc8dd Branch: refs/heads/ignite-843 Commit: 24dcc8ddabd899ffce23ceb90705967b280b8561 Parents: ae80358 Author: Vasiliy Sisko Authored: Tue Sep 29 15:04:16 2015 +0700 Committer: Andrey Committed: Tue Sep 29 15:04:16 2015 +0700 -- .../src/main/js/controllers/clusters-controller.js | 4 .../src/main/js/controllers/models/clusters.json | 1 + 2 files changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/24dcc8dd/modules/control-center-web/src/main/js/controllers/clusters-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index a1c9537..19c9f36 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -376,6 +376,10 @@ consoleModule.controller('clustersController', [ return showPopoverMessage($scope.panels, 'general', 'serviceAccountId', 'Account ID should not be empty'); } +if (item.sslEnabled && (!$common.isDefined(item.sslContextFactory) +|| $common.isEmptyString(item.sslContextFactory.keyStoreFilePath))) +return showPopoverMessage($scope.panels, 'sslConfiguration', 'keyStoreFilePath', 'Key store file should not be empty'); + if (!item.swapSpaceSpi || !item.swapSpaceSpi.kind && item.caches) { for (var i = 0; i < item.caches.length; i++) { var idx = $scope.indexOfCache(item.caches[i]); http://git-wip-us.apache.org/repos/asf/ignite/blob/24dcc8dd/modules/control-center-web/src/main/js/controllers/models/clusters.json -- diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json index 5e4e282..80c9f86 100644 --- a/modules/control-center-web/src/main/js/controllers/models/clusters.json +++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json @@ -756,6 +756,7 @@ "type": "text", "path": "sslContextFactory", "model": "keyStoreFilePath", + "required": true, "hide": "!backupItem.sslEnabled", "tip": [ "Path to the key store file",
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1079 [deleted] edced9938
ignite git commit: Added test.
Repository: ignite Updated Branches: refs/heads/master ce3f20be6 -> c517fcf5a Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c517fcf5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c517fcf5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c517fcf5 Branch: refs/heads/master Commit: c517fcf5a7c9444e27e5f4d261702aaa2dfe726d Parents: ce3f20b Author: sboikov Authored: Tue Sep 29 12:15:37 2015 +0300 Committer: sboikov Committed: Tue Sep 29 12:15:37 2015 +0300 -- .../IgniteCacheCreatePutMultiNodeSelfTest.java | 151 +++ .../testsuites/IgniteCacheTestSuite4.java | 2 + 2 files changed, 153 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c517fcf5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java new file mode 100644 index 000..cf0e0d3 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java @@ -0,0 +1,151 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.distributed; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.concurrent.Callable; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.atomic.AtomicReferenceArray; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +/** + * + */ +public class IgniteCacheCreatePutMultiNodeSelfTest extends GridCommonAbstractTest { +/** Grid count. */ +private static final int GRID_CNT = 4; + +/** */ +private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); +discoSpi.setIpFinder(ipFinder); + +cfg.setDiscoverySpi(discoSpi); + +OptimizedMarshaller marsh = new OptimizedMarshaller(); +marsh.setRequireSerializable(false); + +cfg.setMarshaller(marsh); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected long getTestTimeout() { +return 6 * 60 * 1000L; +} + +/** + * @throws Exception If failed. + */ +public void testStartNodes() throws Exception { +try { +Collection> futs = new ArrayList<>(GRID_CNT); +int scale = 3; + +final CyclicBarrier barrier = new CyclicBarrier(GRID_CNT * scale); +final AtomicReferenceArray err = new AtomicReferenceArray<>(GRID_CNT * scale); + +for (int i = 0; i < GRID_CNT * scale; i++) { +if (i < GRID_CNT) +startGrid(i); + +final int idx = i; + +IgniteInternalFuture fut = GridTestUtils.runAs
ignite git commit: ignite-1534 debug
Repository: ignite Updated Branches: refs/heads/ignite-1534 [created] 770861333 ignite-1534 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/77086133 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77086133 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77086133 Branch: refs/heads/ignite-1534 Commit: 7708613338f40aafe7b5da79a45a528e1f1c760b Parents: c517fcf Author: sboikov Authored: Tue Sep 29 12:22:55 2015 +0300 Committer: sboikov Committed: Tue Sep 29 12:22:55 2015 +0300 -- .../testsuites/IgniteCacheTestSuite4.java | 146 +-- 1 file changed, 8 insertions(+), 138 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/77086133/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index f8c9d26..2580201 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@ -137,146 +137,16 @@ public class IgniteCacheTestSuite4 extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("IgniteCache Test Suite part 4"); -// Multi node update. -suite.addTestSuite(GridCacheMultinodeUpdateSelfTest.class); -suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledSelfTest.class); - suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.class); -suite.addTestSuite(GridCacheMultinodeUpdateAtomicSelfTest.class); - suite.addTestSuite(GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.class); - -suite.addTestSuite(IgniteCacheAtomicLoadAllTest.class); -suite.addTestSuite(IgniteCacheAtomicLocalLoadAllTest.class); -suite.addTestSuite(IgniteCacheTxLoadAllTest.class); -suite.addTestSuite(IgniteCacheTxLocalLoadAllTest.class); - -suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class); -suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class); - -suite.addTestSuite(IgniteCacheAtomicStoreSessionTest.class); -suite.addTestSuite(IgniteCacheTxStoreSessionTest.class); -suite.addTestSuite(IgniteCacheAtomicStoreSessionWriteBehindTest.class); -suite.addTestSuite(IgniteCacheTxStoreSessionWriteBehindTest.class); - -suite.addTestSuite(IgniteCacheAtomicNoReadThroughTest.class); - suite.addTestSuite(IgniteCacheAtomicNearEnabledNoReadThroughTest.class); -suite.addTestSuite(IgniteCacheAtomicLocalNoReadThroughTest.class); -suite.addTestSuite(IgniteCacheTxNoReadThroughTest.class); -suite.addTestSuite(IgniteCacheTxNearEnabledNoReadThroughTest.class); -suite.addTestSuite(IgniteCacheTxLocalNoReadThroughTest.class); - -suite.addTestSuite(IgniteCacheAtomicNoLoadPreviousValueTest.class); - suite.addTestSuite(IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.class); - suite.addTestSuite(IgniteCacheAtomicLocalNoLoadPreviousValueTest.class); -suite.addTestSuite(IgniteCacheTxNoLoadPreviousValueTest.class); - suite.addTestSuite(IgniteCacheTxNearEnabledNoLoadPreviousValueTest.class); -suite.addTestSuite(IgniteCacheTxLocalNoLoadPreviousValueTest.class); - -suite.addTestSuite(IgniteCacheAtomicNoWriteThroughTest.class); - suite.addTestSuite(IgniteCacheAtomicNearEnabledNoWriteThroughTest.class); -suite.addTestSuite(IgniteCacheAtomicLocalNoWriteThroughTest.class); -suite.addTestSuite(IgniteCacheTxNoWriteThroughTest.class); -suite.addTestSuite(IgniteCacheTxNearEnabledNoWriteThroughTest.class); -suite.addTestSuite(IgniteCacheTxLocalNoWriteThroughTest.class); - -suite.addTestSuite(IgniteCacheAtomicPeekModesTest.class); -suite.addTestSuite(IgniteCacheAtomicNearPeekModesTest.class); -suite.addTestSuite(IgniteCacheAtomicReplicatedPeekModesTest.class); -suite.addTestSuite(IgniteCacheAtomicLocalPeekModesTest.class); -suite.addTestSuite(IgniteCacheTxPeekModesTest.class); -suite.addTestSuite(IgniteCacheTxNearPeekModesTest.class); -suite.addTestSuite(IgniteCacheTxLocalPeekModesTest.class); -suite.addTestSuite(IgniteCacheTxReplicatedPeekModesTest.class); - -suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class); -suite.addTestSuite(GridCacheVersionMultinodeTest.class); - -suite.addTestSuite(IgniteCacheNearReadCommittedTest.class); -suite.addTestSuite(IgniteCa
ignite git commit: ignite-1377
Repository: ignite Updated Branches: refs/heads/ignite-1377 [created] c493a2919 ignite-1377 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c493a291 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c493a291 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c493a291 Branch: refs/heads/ignite-1377 Commit: c493a2919e6d0f1eb2ec688ee86b23bdde4e17ca Parents: 04930ca Author: sboikov Authored: Mon Sep 28 17:03:48 2015 +0300 Committer: sboikov Committed: Mon Sep 28 17:03:48 2015 +0300 -- .../org/apache/ignite/internal/portable/PortableContext.java| 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c493a291/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java index 2ee96b7..fbc2c3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java @@ -571,9 +571,8 @@ public class PortableContext implements Externalizable { userTypes.put(typeId, desc); descByCls.put(cls, desc); -// TODO uncomment for https://issues.apache.org/jira/browse/IGNITE-1377 -//if (registerMetadata && isMetaDataEnabled(typeId)) -//metaHnd.addMeta(typeId, new PortableMetaDataImpl(typeName, desc.fieldsMeta(), null)); +if (registerMetadata && isMetaDataEnabled(typeId)) +metaHnd.addMeta(typeId, new PortableMetaDataImpl(typeName, desc.fieldsMeta(), null)); return desc; }
ignite git commit: ignite-1534 debug
Repository: ignite Updated Branches: refs/heads/ignite-1534 770861333 -> dfe4bb8b9 ignite-1534 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfe4bb8b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfe4bb8b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfe4bb8b Branch: refs/heads/ignite-1534 Commit: dfe4bb8b965cb47eb33e5962a4c9a0c3bda2ae04 Parents: 7708613 Author: sboikov Authored: Tue Sep 29 12:59:13 2015 +0300 Committer: sboikov Committed: Tue Sep 29 13:00:06 2015 +0300 -- .../processors/cache/distributed/CacheAffinityEarlyTest.java | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dfe4bb8b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java index 6b67139..73f4ac6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java @@ -61,6 +61,8 @@ public class CacheAffinityEarlyTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); +cfg.setPeerClassLoadingEnabled(false); + TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); discoSpi.setIpFinder(ipFinder); @@ -108,6 +110,8 @@ public class CacheAffinityEarlyTest extends GridCommonAbstractTest { IgniteInternalFuture fut = multithreadedAsync(new Runnable() { @Override public void run() { +Thread.currentThread().setName("thread-" + idx); + Random rnd = new Random(); try {
ignite git commit: ignite-843 Minor fix.
Repository: ignite Updated Branches: refs/heads/ignite-843 24dcc8dda -> 2783ec70a ignite-843 Minor fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2783ec70 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2783ec70 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2783ec70 Branch: refs/heads/ignite-843 Commit: 2783ec70a6c129e8a6dc9515c44ea5dfc2d8446f Parents: 24dcc8d Author: Vasiliy Sisko Authored: Tue Sep 29 17:34:13 2015 +0700 Committer: Andrey Committed: Tue Sep 29 17:34:13 2015 +0700 -- .../src/main/js/views/configuration/caches.jade | 4 ++-- .../src/main/js/views/configuration/clusters.jade | 4 ++-- .../src/main/js/views/includes/controls.jade | 10 ++ 3 files changed, 6 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2783ec70/modules/control-center-web/src/main/js/views/configuration/caches.jade -- diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade index 664d812..2dc7d1c 100644 --- a/modules/control-center-web/src/main/js/views/configuration/caches.jade +++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade @@ -40,8 +40,8 @@ block content .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true') +groups('general', 'backupItem') div(ng-show='ui.expanded') -+advanced-options-bottom ++advanced-options +groups('advanced', 'backupItem') -+advanced-options-top ++advanced-options .section(ng-if='ui.expanded') +save-remove-buttons('cache') http://git-wip-us.apache.org/repos/asf/ignite/blob/2783ec70/modules/control-center-web/src/main/js/views/configuration/clusters.jade -- diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade index 7d28c17..6412a25 100644 --- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade +++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade @@ -40,8 +40,8 @@ block content .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true') +groups('general', 'backupItem') div(ng-show='ui.expanded') -+advanced-options-bottom ++advanced-options +groups('advanced', 'backupItem') -+advanced-options-top ++advanced-options .section(ng-show='ui.expanded') +save-remove-buttons('cluster') http://git-wip-us.apache.org/repos/asf/ignite/blob/2783ec70/modules/control-center-web/src/main/js/views/includes/controls.jade -- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index ae66e2b..642cb5b 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -476,15 +476,9 @@ mixin groups(groups, dataSource) .col-sm-6 +preview('group.group', '{{::group.group + "-right"}}') -mixin advanced-options-top +mixin advanced-options .advanced-options -i.fa.fa-chevron-circle-up(ng-show='ui.expanded' ng-click='toggleExpanded()') -i.fa.fa-chevron-circle-down(ng-show='!ui.expanded' ng-click='toggleExpanded()') -a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}} - -mixin advanced-options-bottom -.advanced-options -i.fa.fa-chevron-circle-up(ng-click='toggleExpanded()') +i.fa(ng-class='ui.expanded ? "fa-chevron-circle-up" : "fa-chevron-circle-down"' ng-click='toggleExpanded()') a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}} mixin preview-content(preview, state, mode)
ignite git commit: ignite-1534 debug
Repository: ignite Updated Branches: refs/heads/ignite-1534 dfe4bb8b9 -> f823c9dcd ignite-1534 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f823c9dc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f823c9dc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f823c9dc Branch: refs/heads/ignite-1534 Commit: f823c9dcd207b77aea8f5dd34e2be1d15559d755 Parents: dfe4bb8 Author: sboikov Authored: Tue Sep 29 14:47:01 2015 +0300 Committer: sboikov Committed: Tue Sep 29 14:47:01 2015 +0300 -- .../processors/cache/distributed/CacheAffinityEarlyTest.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f823c9dc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java index 73f4ac6..f1e976a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java @@ -61,8 +61,6 @@ public class CacheAffinityEarlyTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); -cfg.setPeerClassLoadingEnabled(false); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); discoSpi.setIpFinder(ipFinder);
[1/2] ignite git commit: IGNITE-1567: WIP.
Repository: ignite Updated Branches: refs/heads/ignite-1567 [created] 11b77dd2a http://git-wip-us.apache.org/repos/asf/ignite/blob/11b77dd2/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs index 3f42db8..5db6aaa 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs @@ -20,12 +20,14 @@ namespace Apache.Ignite.Core.Impl.Portable using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using System.IO; + using Apache.Ignite.Core.Impl.Portable.IO; using Apache.Ignite.Core.Impl.Portable.Metadata; using Apache.Ignite.Core.Portable; +using PU = PortableUtils; + /// /// Portable writer implementation. /// @@ -79,7 +81,11 @@ namespace Apache.Ignite.Core.Impl.Portable /// Boolean value. public void WriteBoolean(string fieldName, bool val) { -WriteSimpleField(fieldName, PortableUtils.TypeBool, val, PortableSystemHandlers.WriteHndBoolTyped, 1); +WriteFieldId(fieldName, PU.TypeBool); + +_stream.WriteInt(PU.LengthTypeId + 1); +_stream.WriteByte(PU.TypeBool); +_stream.WriteBool(val); } /// @@ -98,8 +104,16 @@ namespace Apache.Ignite.Core.Impl.Portable /// Boolean array. public void WriteBooleanArray(string fieldName, bool[] val) { -WriteSimpleNullableField(fieldName, PortableUtils.TypeArrayBool, val, -PortableSystemHandlers.WriteHndBoolArrayTyped, val != null ? val.Length + 4 : 0); +WriteFieldId(fieldName, PU.TypeArrayBool); + +if (val == null) +WriteNullField(); +else +{ +_stream.WriteInt(PU.LengthTypeId + PU.LengthArraySize + val.Length); +_stream.WriteByte(PU.TypeArrayBool); +PU.WriteBooleanArray(val, _stream); +} } /// @@ -108,7 +122,13 @@ namespace Apache.Ignite.Core.Impl.Portable /// Boolean array. public void WriteBooleanArray(bool[] val) { -WriteSimpleNullableRawField(val, PortableSystemHandlers.WriteHndBoolArrayTyped); +if (val == null) +WriteNullRawField(); +else +{ +_stream.WriteByte(PU.TypeArrayBool); +PU.WriteBooleanArray(val, _stream); +} } /// @@ -118,7 +138,11 @@ namespace Apache.Ignite.Core.Impl.Portable /// Byte value. public void WriteByte(string fieldName, byte val) { -WriteSimpleField(fieldName, PortableUtils.TypeByte, val, PortableSystemHandlers.WriteHndByteTyped, 1); +WriteFieldId(fieldName, PU.TypeBool); + +_stream.WriteInt(PU.LengthTypeId + 1); +_stream.WriteByte(PU.TypeByte); +_stream.WriteByte(val); } /// @@ -137,8 +161,16 @@ namespace Apache.Ignite.Core.Impl.Portable /// Byte array. public void WriteByteArray(string fieldName, byte[] val) { -WriteSimpleNullableField(fieldName, PortableUtils.TypeArrayByte, val, -PortableSystemHandlers.WriteHndByteArrayTyped, val != null ? val.Length + 4 : 0); +WriteFieldId(fieldName, PU.TypeArrayByte); + +if (val == null) +WriteNullField(); +else +{ +_stream.WriteInt(PU.LengthTypeId + PU.LengthArraySize + val.Length); +_stream.WriteByte(PU.TypeArrayByte); +PU.WriteByteArray(val, _stream); +} } /// @@ -147,7 +179,13 @@ namespace Apache.Ignite.Core.Impl.Portable /// Byte array. public void WriteByteArray(byte[] val) { -WriteSimpleNullableRawField(val, PortableSystemHandlers.WriteHndByteArrayTyped); +if (val == null) +WriteNullRawField(); +else +{ +_stream.WriteByte(PU.TypeArrayByte); +PU.WriteByteArray(val, _stream); +} } /// @@ -157,7 +195,11 @@ namespace Apache.Ignite.Core.Impl.Portable /// Short value. public void WriteShort(string fieldName, short val) { -WriteSimpleField(fieldName, PortableUtils.TypeShort, val, PortableSystemHandlers.WriteHndShortTyped, 2); +WriteFieldId(fieldName, PU.TypeShort); + +_stream.WriteInt(PU.LengthTypeId + 2); +
[2/2] ignite git commit: IGNITE-1567: WIP.
IGNITE-1567: WIP. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11b77dd2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11b77dd2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11b77dd2 Branch: refs/heads/ignite-1567 Commit: 11b77dd2aa412d9d676da49fb169a893fd1b58d7 Parents: 1d6f45c Author: vozerov-gridgain Authored: Tue Sep 29 16:07:14 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 16:07:14 2015 +0300 -- .../Impl/Portable/IPortableTypeDescriptor.cs| 16 - .../Impl/Portable/PortableBuilderImpl.cs| 10 +- .../Impl/Portable/PortableFullTypeDescriptor.cs | 30 +- .../Impl/Portable/PortableMarshaller.cs | 72 +- .../Portable/PortableSurrogateTypeDescriptor.cs | 12 - .../Impl/Portable/PortableSystemHandlers.cs | 952 +- .../Impl/Portable/PortableUtils.cs | 87 +- .../Impl/Portable/PortableWriterImpl.cs | 1212 -- .../Portable/IPortableRawWriter.cs | 24 + .../Portable/IPortableWriter.cs | 28 + 10 files changed, 1236 insertions(+), 1207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/11b77dd2/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs index 4a4f0dc..62597d5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs @@ -104,21 +104,5 @@ namespace Apache.Ignite.Core.Impl.Portable { get; } - -/// -/// Typed handler. -/// -object TypedHandler -{ -get; -} - -/// -/// Untyped handler. -/// -PortableSystemWriteDelegate UntypedHandler -{ -get; -} } } http://git-wip-us.apache.org/repos/asf/ignite/blob/11b77dd2/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs index dc0f570..7ea565b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs @@ -197,7 +197,7 @@ namespace Apache.Ignite.Core.Impl.Portable try { // Write. -writer.Write(this, null); +writer.Write(this); // Process metadata. _portables.Marshaller.FinishMarshal(writer); @@ -409,7 +409,7 @@ namespace Apache.Ignite.Core.Impl.Portable object cachedVal; if (_parent._cache != null && _parent._cache.TryGetValue(inStartPos, out cachedVal)) { -ctx.Writer.Write(cachedVal, null); +ctx.Writer.Write(cachedVal); } else { @@ -445,7 +445,7 @@ namespace Apache.Ignite.Core.Impl.Portable { // Replace field with new value. if (fieldVal != PortableBuilderField.RmvMarkerObj) -ctx.Writer.Write(fieldVal, null); +ctx.Writer.Write(fieldVal); vals.Remove(inFieldId); } @@ -453,7 +453,7 @@ namespace Apache.Ignite.Core.Impl.Portable { // If field was requested earlier, then we must write tracked value if (_parent._cache != null && _parent._cache.TryGetValue(inFieldDataPos, out fieldVal)) -ctx.Writer.Write(fieldVal, null); +ctx.Writer.Write(fieldVal); else // Filed is not tracked, re-write as is. Mutate0(ctx, inStream, outStream, false, 0, EmptyVals); @@ -481,7 +481,7 @@ namespace Apache.Ignite.Core.Impl.Portable outStr
ignite git commit: minor (style)
Repository: ignite Updated Branches: refs/heads/master c517fcf5a -> c2cedb0ed minor (style) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2cedb0e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2cedb0e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2cedb0e Branch: refs/heads/master Commit: c2cedb0ed5f54cdbdc60635043555c7c47c04bea Parents: c517fcf Author: Yakov Zhdanov Authored: Tue Sep 29 16:20:26 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Sep 29 16:20:26 2015 +0300 -- .../java/org/apache/ignite/internal/util/GridArgumentCheck.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c2cedb0e/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java index 8be3610..f96773e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java @@ -157,8 +157,7 @@ public class GridArgumentCheck { public static void notNullOrEmpty(String value, String name) { notNull(value, name); -if (value.trim().length() == 0) { +if (value.trim().length() == 0) throw new IllegalArgumentException(INVALID_ARG_MSG_PREFIX + name + NOT_NULL_OR_EMPTY_SUFFIX); -} } -} \ No newline at end of file +}
ignite git commit: IGNITE-1282: Several fixes.
Repository: ignite Updated Branches: refs/heads/ignite-1282 1d6f45c42 -> 4c2965fee IGNITE-1282: Several fixes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c2965fe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c2965fe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c2965fe Branch: refs/heads/ignite-1282 Commit: 4c2965feef190dd73acca52e16f62108206be43d Parents: 1d6f45c Author: vozerov-gridgain Authored: Tue Sep 29 16:36:57 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 16:36:57 2015 +0300 -- .../platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 5 - .../Impl/Portable/PortableHandleDictionary.cs | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4c2965fe/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs index 8fd8825..d0ddefb 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs @@ -293,7 +293,10 @@ namespace Apache.Ignite.Core.Impl /// Value indicating whether specified dir looks like a Ignite home. private static bool IsIgniteHome(DirectoryInfo dir) { -return dir.Exists && dir.EnumerateDirectories().Count(x => x.Name == "examples" || x.Name == "bin") == 2; +return dir.Exists && +dir.EnumerateDirectories().Count(x => x.Name == "examples" || x.Name == "bin") == 2 && +(dir.EnumerateDirectories().Count(x => x.Name == "modules") == 1 || +dir.EnumerateDirectories().Count(x => x.Name == "platforms") == 1); } /// http://git-wip-us.apache.org/repos/asf/ignite/blob/4c2965fe/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs index 32e1e02..98e92f1 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs @@ -146,7 +146,8 @@ namespace Apache.Ignite.Core.Impl.Portable /// Other dictionary. public void Merge(PortableHandleDictionary that) { -Debug.Assert(that != null, "that == null"); +if (that == null) +return; AddIfAbsent(that._key1, that._val1); AddIfAbsent(that._key2, that._val2);
[2/3] ignite git commit: IGNITE-1282: Several fixes.
IGNITE-1282: Several fixes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c2965fe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c2965fe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c2965fe Branch: refs/heads/ignite-1567 Commit: 4c2965feef190dd73acca52e16f62108206be43d Parents: 1d6f45c Author: vozerov-gridgain Authored: Tue Sep 29 16:36:57 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 16:36:57 2015 +0300 -- .../platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 5 - .../Impl/Portable/PortableHandleDictionary.cs | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4c2965fe/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs index 8fd8825..d0ddefb 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs @@ -293,7 +293,10 @@ namespace Apache.Ignite.Core.Impl /// Value indicating whether specified dir looks like a Ignite home. private static bool IsIgniteHome(DirectoryInfo dir) { -return dir.Exists && dir.EnumerateDirectories().Count(x => x.Name == "examples" || x.Name == "bin") == 2; +return dir.Exists && +dir.EnumerateDirectories().Count(x => x.Name == "examples" || x.Name == "bin") == 2 && +(dir.EnumerateDirectories().Count(x => x.Name == "modules") == 1 || +dir.EnumerateDirectories().Count(x => x.Name == "platforms") == 1); } /// http://git-wip-us.apache.org/repos/asf/ignite/blob/4c2965fe/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs index 32e1e02..98e92f1 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs @@ -146,7 +146,8 @@ namespace Apache.Ignite.Core.Impl.Portable /// Other dictionary. public void Merge(PortableHandleDictionary that) { -Debug.Assert(that != null, "that == null"); +if (that == null) +return; AddIfAbsent(that._key1, that._val1); AddIfAbsent(that._key2, that._val2);
[3/3] ignite git commit: Merge branch 'ignite-1282' into ignite-1567
Merge branch 'ignite-1282' into ignite-1567 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c18ad80 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c18ad80 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c18ad80 Branch: refs/heads/ignite-1567 Commit: 0c18ad80c357cf0c8253b48e1c8ed1e6147f23b0 Parents: 42058e4 4c2965f Author: vozerov-gridgain Authored: Tue Sep 29 16:38:01 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 16:38:01 2015 +0300 -- .../platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 5 - .../Impl/Portable/PortableHandleDictionary.cs | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) --
[1/3] ignite git commit: IGNITE-1567: Fixing typo.
Repository: ignite Updated Branches: refs/heads/ignite-1567 11b77dd2a -> 0c18ad80c IGNITE-1567: Fixing typo. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42058e43 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42058e43 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42058e43 Branch: refs/heads/ignite-1567 Commit: 42058e438a077c37a05e6e28cbde2fb2ac202755 Parents: 11b77dd Author: vozerov-gridgain Authored: Tue Sep 29 16:14:16 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 16:14:16 2015 +0300 -- .../Impl/Portable/PortableSystemHandlers.cs | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/42058e43/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs index 81d3ade..e994e28 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs @@ -47,7 +47,7 @@ namespace Apache.Ignite.Core.Impl.Portable internal static class PortableSystemHandlers { /** Write handlers. */ -private static volatile Dictionary _writeHandlers2 = +private static volatile Dictionary _writeHandlers = new Dictionary(); /** Mutex for write handlers update. */ @@ -160,7 +160,7 @@ namespace Apache.Ignite.Core.Impl.Portable { PortableSystemWriteDelegate res; -var writeHandlers0 = _writeHandlers2; +var writeHandlers0 = _writeHandlers; // Have we ever met this type? if (writeHandlers0 != null && writeHandlers0.TryGetValue(type, out res)) @@ -277,23 +277,23 @@ namespace Apache.Ignite.Core.Impl.Portable { lock (WriteHandlersMux) { -if (_writeHandlers2 == null) +if (_writeHandlers == null) { Dictionary writeHandlers0 = new Dictionary(); writeHandlers0[type] = handler; -_writeHandlers2 = writeHandlers0; +_writeHandlers = writeHandlers0; } -else if (!_writeHandlers2.ContainsKey(type)) +else if (!_writeHandlers.ContainsKey(type)) { Dictionary writeHandlers0 = -new Dictionary(_writeHandlers2); +new Dictionary(_writeHandlers); writeHandlers0[type] = handler; -_writeHandlers2 = writeHandlers0; +_writeHandlers = writeHandlers0; } } }
ignite git commit: IGNITE-1567: Minor fix.
Repository: ignite Updated Branches: refs/heads/ignite-1567 0c18ad80c -> cfe6af02e IGNITE-1567: Minor fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cfe6af02 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cfe6af02 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cfe6af02 Branch: refs/heads/ignite-1567 Commit: cfe6af02e7ab785ecaa0452c844292e79a8379af Parents: 0c18ad8 Author: vozerov-gridgain Authored: Tue Sep 29 16:44:17 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 16:44:17 2015 +0300 -- .../Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe6af02/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs index 5db6aaa..a0cf4e1 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs @@ -1360,9 +1360,9 @@ namespace Apache.Ignite.Core.Impl.Portable // Last chance: is object seializable? if (type.IsSerializable) Write(new SerializableObjectHolder(obj)); - -// We did our best, object cannot be marshalled. -throw new PortableException("Unsupported object type [type=" + type + ", object=" + obj + ']'); +else +// We did our best, object cannot be marshalled. +throw new PortableException("Unsupported object type [type=" + type + ", object=" + obj + ']'); } } }
ignite git commit: ignite-1564 Fixed client reconnect issues
Repository: ignite Updated Branches: refs/heads/ignite-1564 [created] a3c2ddb3f ignite-1564 Fixed client reconnect issues Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a3c2ddb3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a3c2ddb3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a3c2ddb3 Branch: refs/heads/ignite-1564 Commit: a3c2ddb3f11dfbfd0ba85283feb8af034ffb3612 Parents: c517fcf Author: sboikov Authored: Tue Sep 29 16:56:42 2015 +0300 Committer: sboikov Committed: Tue Sep 29 16:56:42 2015 +0300 -- .../discovery/GridDiscoveryManager.java | 22 +-- .../processors/cache/GridCacheEventManager.java | 12 +- .../processors/cache/GridCacheProcessor.java| 68 ++--- .../dht/preloader/GridDhtPreloader.java | 6 + .../IgniteClientReconnectAbstractTest.java | 35 +++-- .../IgniteClientReconnectCacheTest.java | 137 +++ 6 files changed, 232 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a3c2ddb3/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 785613d..7afd849 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -78,7 +78,7 @@ import org.apache.ignite.internal.processors.jobmetrics.GridJobMetrics; import org.apache.ignite.internal.processors.security.SecurityContext; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; import org.apache.ignite.internal.util.F0; -import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap; +import org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap; import org.apache.ignite.internal.util.GridSpinBusyLock; import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; @@ -208,7 +208,7 @@ public class GridDiscoveryManager extends GridManagerAdapter { /** Topology cache history. */ private final Map discoCacheHist = -new GridBoundedConcurrentLinkedHashMap<>(DISCOVERY_HISTORY_SIZE, DISCOVERY_HISTORY_SIZE, 0.7f, 1); +new GridBoundedConcurrentOrderedMap<>(DISCOVERY_HISTORY_SIZE); /** Topology snapshots history. */ private volatile Map> topHist = new HashMap<>(); @@ -465,14 +465,6 @@ public class GridDiscoveryManager extends GridManagerAdapter { final Map> snapshots, @Nullable DiscoverySpiCustomMessage spiCustomMsg ) { -if (type == EVT_NODE_JOINED && node.isLocal() && ctx.clientDisconnected()) { -discoCacheHist.clear(); - -topHist.clear(); - -topSnap.set(new Snapshot(AffinityTopologyVersion.ZERO, null)); -} - DiscoveryCustomMessage customMsg = spiCustomMsg == null ? null : ((CustomMessageWrapper)spiCustomMsg).delegate(); @@ -593,6 +585,13 @@ public class GridDiscoveryManager extends GridManagerAdapter { locJoinEvt = new GridFutureAdapter<>(); registeredCaches.clear(); + +discoCacheHist.clear(); + +topHist.clear(); + +topSnap.set(new Snapshot(AffinityTopologyVersion.ZERO, +new DiscoCache(locNode, Collections.emptySet(; } else if (type == EVT_CLIENT_NODE_RECONNECTED) { assert locNode.isClient() : locNode; @@ -620,7 +619,8 @@ public class GridDiscoveryManager extends GridManagerAdapter { return; } -discoWrk.addEvent(type, nextTopVer, node, topSnapshot, customMsg); +if (type == EVT_CLIENT_NODE_DISCONNECTED || !ctx.clientDisconnected()) +discoWrk.addEvent(type, nextTopVer, node, topSnapshot, customMsg); } }); http://git-wip-us.apache.org/repos/asf/ignite/blob/a3c2ddb3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/c
ignite git commit: ignite-1564 Fixed client reconnect issues
Repository: ignite Updated Branches: refs/heads/ignite-1564 a3c2ddb3f -> d439a529a ignite-1564 Fixed client reconnect issues Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d439a529 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d439a529 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d439a529 Branch: refs/heads/ignite-1564 Commit: d439a529a9f3f895c74b901a7a16b6ccd7c19911 Parents: a3c2ddb Author: sboikov Authored: Tue Sep 29 17:06:56 2015 +0300 Committer: sboikov Committed: Tue Sep 29 17:06:56 2015 +0300 -- .../IgniteClientReconnectCacheTest.java | 51 +--- 1 file changed, 34 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d439a529/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java index f3f45e9..edd95e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java @@ -1077,36 +1077,53 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac clients.add(client); } -reconnectClientNodes(clients, grid(0), null); +int nodes = SRV_CNT + CLIENTS; +int srvNodes = SRV_CNT; -for (Ignite client : clients) { -IgniteCache cache = client.cache(null); +for (int iter = 0; iter < 3; iter++) { +log.info("Iteration: " + iter); -assertNotNull(cache); +reconnectClientNodes(clients, grid(0), null); -cache.put(client.name(), 1); +for (Ignite client : clients) { +IgniteCache cache = client.cache(null); -assertEquals(1, cache.get(client.name())); +assertNotNull(cache); -ClusterGroup grp = client.cluster().forCacheNodes(null); +cache.put(client.name(), 1); -assertEquals(CLIENTS + SRV_CNT, grp.nodes().size()); +assertEquals(1, cache.get(client.name())); -grp = client.cluster().forClientNodes(null); +ClusterGroup grp = client.cluster().forCacheNodes(null); -assertEquals(CLIENTS, grp.nodes().size()); -} +assertEquals(CLIENTS + srvNodes, grp.nodes().size()); -for (int i = 0; i < SRV_CNT; i++) { -Ignite ignite = grid(i); +grp = client.cluster().forClientNodes(null); -ClusterGroup grp = ignite.cluster().forCacheNodes(null); +assertEquals(CLIENTS, grp.nodes().size()); +} -assertEquals(CLIENTS + SRV_CNT, grp.nodes().size()); +for (int i = 0; i < nodes; i++) { +Ignite ignite = grid(i); -grp = ignite.cluster().forClientNodes(null); +ClusterGroup grp = ignite.cluster().forCacheNodes(null); + +assertEquals(CLIENTS + srvNodes, grp.nodes().size()); + +grp = ignite.cluster().forClientNodes(null); + +assertEquals(CLIENTS, grp.nodes().size()); +} + +clientMode = false; + +startGrid(nodes++); + +srvNodes++; + +clientMode = true; -assertEquals(CLIENTS, grp.nodes().size()); +startGrid(nodes++); } }
ignite git commit: IGNITE-1567: More correct fix.
Repository: ignite Updated Branches: refs/heads/ignite-1567 cfe6af02e -> e69afa1f1 IGNITE-1567: More correct fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e69afa1f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e69afa1f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e69afa1f Branch: refs/heads/ignite-1567 Commit: e69afa1f1a926b0720cdd3b0bdc68c3b2583d5da Parents: cfe6af0 Author: vozerov-gridgain Authored: Tue Sep 29 17:17:10 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 17:17:10 2015 +0300 -- .../Impl/Portable/PortableSystemHandlers.cs | 36 ++-- .../Impl/Portable/PortableWriterImpl.cs | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e69afa1f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs index e994e28..658d15d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs @@ -208,43 +208,43 @@ namespace Apache.Ignite.Core.Impl.Portable Type elemType = type.GetElementType(); // Primitives. -if (elemType == typeof (bool[])) +if (elemType == typeof (bool)) return WriteBoolArray; -else if (elemType == typeof(byte[])) +else if (elemType == typeof(byte)) return WriteByteArray; -else if (elemType == typeof(short[])) +else if (elemType == typeof(short)) return WriteShortArray; -else if (elemType == typeof(char[])) +else if (elemType == typeof(char)) return WriteCharArray; -else if (elemType == typeof(int[])) +else if (elemType == typeof(int)) return WriteIntArray; -else if (elemType == typeof(long[])) +else if (elemType == typeof(long)) return WriteLongArray; -else if (elemType == typeof(float[])) +else if (elemType == typeof(float)) return WriteFloatArray; -else if (elemType == typeof(double[])) +else if (elemType == typeof(double)) return WriteDoubleArray; // Non-CLS primitives. -else if (elemType == typeof(sbyte[])) +else if (elemType == typeof(sbyte)) return WriteSbyteArray; -else if (elemType == typeof(ushort[])) +else if (elemType == typeof(ushort)) return WriteUshortArray; -else if (elemType == typeof(uint[])) +else if (elemType == typeof(uint)) return WriteUintArray; -else if (elemType == typeof(ulong[])) +else if (elemType == typeof(ulong)) return WriteUlongArray; // Special types. -else if (elemType == typeof (decimal[])) +else if (elemType == typeof (decimal)) return WriteDecimalArray; -else if (elemType == typeof(string[])) +else if (elemType == typeof(string)) return WriteStringArray; -else if (elemType == typeof(DateTime[])) +else if (elemType == typeof(DateTime)) return WriteDateArray; -else if (elemType == typeof(DateTime?[])) +else if (elemType == typeof(DateTime?)) return WriteNullableDateArray; -else if (elemType == typeof(Guid[])) +else if (elemType == typeof(Guid)) return WriteGuidArray; -else if (elemType == typeof(Guid?[])) +else if (elemType == typeof(Guid?)) return WriteNullableGuidArray; // Enums. if (elemType.IsEnum) http://git-wip-us.apache.org/repos/asf/ignite/blob/e69afa1f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Por
ignite git commit: IGNITE-1567: More correct fix.
Repository: ignite Updated Branches: refs/heads/ignite-1567 e69afa1f1 -> 0565eec0d IGNITE-1567: More correct fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0565eec0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0565eec0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0565eec0 Branch: refs/heads/ignite-1567 Commit: 0565eec0d8881ff35137767708c932ff800bfa26 Parents: e69afa1 Author: vozerov-gridgain Authored: Tue Sep 29 17:42:00 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 17:42:00 2015 +0300 -- .../Impl/Portable/PortableWriterImpl.cs | 18 +++--- 1 file changed, 3 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0565eec0/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs index e55cc9d..a2de3b3 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs @@ -992,12 +992,8 @@ namespace Apache.Ignite.Core.Impl.Portable WriteNullRawField(); else { -int pos = SkipFieldLength(); - _stream.WriteByte(PU.TypeArrayEnum); PortableUtils.WriteArray(val, this, true); - -WriteFieldLength(_stream, pos); } } @@ -1067,12 +1063,8 @@ namespace Apache.Ignite.Core.Impl.Portable WriteNullRawField(); else { -int pos = SkipFieldLength(); - _stream.WriteByte(PU.TypeArray); PortableUtils.WriteArray(val, this, true); - -WriteFieldLength(_stream, pos); } } @@ -1630,13 +1622,9 @@ namespace Apache.Ignite.Core.Impl.Portable /// Position where length should reside private static void WriteFieldLength(IPortableStream stream, int pos) { -int retPos = stream.Position; - -stream.Seek(pos, SeekOrigin.Begin); - -stream.WriteInt(retPos - pos - 4); - -stream.Seek(retPos, SeekOrigin.Begin); +// Length is is a difference between current position and previously recorder +// length placeholder position minus 4 bytes for the length itself. +stream.WriteInt(pos, stream.Position - pos - 4); } ///
ignite git commit: IGNITE-1567: More correct fix.
Repository: ignite Updated Branches: refs/heads/ignite-1567 0565eec0d -> 02ab0b309 IGNITE-1567: More correct fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02ab0b30 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02ab0b30 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02ab0b30 Branch: refs/heads/ignite-1567 Commit: 02ab0b309892cd1a2f9ef972f9baf041927cf613 Parents: 0565eec Author: vozerov-gridgain Authored: Tue Sep 29 18:06:27 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 18:06:27 2015 +0300 -- .../Impl/Portable/PortableSystemHandlers.cs | 8 +- .../Impl/Portable/PortableWriterImpl.cs | 234 +-- .../Portable/IPortableRawWriter.cs | 44 ++-- .../Portable/IPortableWriter.cs | 52 ++--- 4 files changed, 169 insertions(+), 169 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/02ab0b30/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs index 658d15d..4e67370 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs @@ -238,12 +238,12 @@ namespace Apache.Ignite.Core.Impl.Portable return WriteDecimalArray; else if (elemType == typeof(string)) return WriteStringArray; -else if (elemType == typeof(DateTime)) -return WriteDateArray; +//else if (elemType == typeof(DateTime)) +//return WriteDateArray; else if (elemType == typeof(DateTime?)) return WriteNullableDateArray; -else if (elemType == typeof(Guid)) -return WriteGuidArray; +//else if (elemType == typeof(Guid)) +//return WriteGuidArray; else if (elemType == typeof(Guid?)) return WriteNullableGuidArray; // Enums. http://git-wip-us.apache.org/repos/asf/ignite/blob/02ab0b30/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs index a2de3b3..e502840 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs @@ -594,62 +594,62 @@ namespace Apache.Ignite.Core.Impl.Portable } } -/// -/// Write named date value. -/// -/// Field name. -/// Date value. -public void WriteDate(string fieldName, DateTime val) -{ -WriteFieldId(fieldName, PU.TypeDate); - -_stream.WriteInt(PU.LengthTypeId + 12); - -_stream.WriteByte(PortableUtils.TypeDate); -PortableUtils.WriteDate(val, _stream); -} - -/// -/// Write date value. -/// -/// Date value. -public void WriteDate(DateTime val) -{ -_stream.WriteByte(PortableUtils.TypeDate); -PortableUtils.WriteDate(val, _stream); -} - -/// -/// Write named date array. -/// -/// Field name. -/// Date array. -public void WriteDateArray(string fieldName, DateTime[] val) -{ -WriteFieldId(fieldName, PU.TypeDate); - -if (val == null) -WriteNullField(); -else -{ -int pos = SkipFieldLength(); - -_stream.WriteByte(PortableUtils.TypeArrayDate); -PortableUtils.WriteDateArray(val, _stream); - -WriteFieldLength(_stream, pos); -} -} - -/// -/// Write date array. -/// -/// Date array. -public void WriteDateArray(DateTime[] val) -{ -_stream.WriteByte(PortableUtils.TypeArrayDate); -PortableUtils.WriteDateArray(val, _stream); -} +///// +///// Write named date value. +///// +///// Field name. +///// Date value. +//public void WriteDate(string fieldName, DateTime val) +//{ +//Wr
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1567 [deleted] 02ab0b309
[2/2] ignite git commit: IGNITE-1282: Started portables refactoring on writer side.
IGNITE-1282: Started portables refactoring on writer side. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6111b55 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6111b55 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6111b55 Branch: refs/heads/ignite-1282 Commit: f6111b55927f6df9a0900bf5c906eecb23f3d422 Parents: 4c2965f Author: vozerov-gridgain Authored: Tue Sep 29 18:21:15 2015 +0300 Committer: vozerov-gridgain Committed: Tue Sep 29 18:21:15 2015 +0300 -- .../Impl/Portable/IPortableTypeDescriptor.cs| 16 - .../Impl/Portable/PortableBuilderImpl.cs| 10 +- .../Impl/Portable/PortableFullTypeDescriptor.cs | 30 +- .../Impl/Portable/PortableMarshaller.cs | 72 +- .../Portable/PortableSurrogateTypeDescriptor.cs | 12 - .../Impl/Portable/PortableSystemHandlers.cs | 952 +- .../Impl/Portable/PortableUtils.cs | 87 +- .../Impl/Portable/PortableWriterImpl.cs | 1162 -- .../Portable/IPortableRawWriter.cs | 24 + .../Portable/IPortableWriter.cs | 28 + 10 files changed, 1205 insertions(+), 1188 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f6111b55/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs index 4a4f0dc..62597d5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/IPortableTypeDescriptor.cs @@ -104,21 +104,5 @@ namespace Apache.Ignite.Core.Impl.Portable { get; } - -/// -/// Typed handler. -/// -object TypedHandler -{ -get; -} - -/// -/// Untyped handler. -/// -PortableSystemWriteDelegate UntypedHandler -{ -get; -} } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6111b55/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs index dc0f570..7ea565b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs @@ -197,7 +197,7 @@ namespace Apache.Ignite.Core.Impl.Portable try { // Write. -writer.Write(this, null); +writer.Write(this); // Process metadata. _portables.Marshaller.FinishMarshal(writer); @@ -409,7 +409,7 @@ namespace Apache.Ignite.Core.Impl.Portable object cachedVal; if (_parent._cache != null && _parent._cache.TryGetValue(inStartPos, out cachedVal)) { -ctx.Writer.Write(cachedVal, null); +ctx.Writer.Write(cachedVal); } else { @@ -445,7 +445,7 @@ namespace Apache.Ignite.Core.Impl.Portable { // Replace field with new value. if (fieldVal != PortableBuilderField.RmvMarkerObj) -ctx.Writer.Write(fieldVal, null); +ctx.Writer.Write(fieldVal); vals.Remove(inFieldId); } @@ -453,7 +453,7 @@ namespace Apache.Ignite.Core.Impl.Portable { // If field was requested earlier, then we must write tracked value if (_parent._cache != null && _parent._cache.TryGetValue(inFieldDataPos, out fieldVal)) -ctx.Writer.Write(fieldVal, null); +ctx.Writer.Write(fieldVal); else // Filed is not tracked, re-write as is. Mutate0(ctx, inStream, outStream, false, 0, EmptyVals); @@ -481,7 +481,7 @@ namespace Apache.Ignite.Core.Impl.Portable
[1/2] ignite git commit: IGNITE-1282: Started portables refactoring on writer side.
Repository: ignite Updated Branches: refs/heads/ignite-1282 4c2965fee -> f6111b559 http://git-wip-us.apache.org/repos/asf/ignite/blob/f6111b55/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs index 3f42db8..e502840 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs @@ -20,12 +20,14 @@ namespace Apache.Ignite.Core.Impl.Portable using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using System.IO; + using Apache.Ignite.Core.Impl.Portable.IO; using Apache.Ignite.Core.Impl.Portable.Metadata; using Apache.Ignite.Core.Portable; +using PU = PortableUtils; + /// /// Portable writer implementation. /// @@ -79,7 +81,11 @@ namespace Apache.Ignite.Core.Impl.Portable /// Boolean value. public void WriteBoolean(string fieldName, bool val) { -WriteSimpleField(fieldName, PortableUtils.TypeBool, val, PortableSystemHandlers.WriteHndBoolTyped, 1); +WriteFieldId(fieldName, PU.TypeBool); + +_stream.WriteInt(PU.LengthTypeId + 1); +_stream.WriteByte(PU.TypeBool); +_stream.WriteBool(val); } /// @@ -98,8 +104,16 @@ namespace Apache.Ignite.Core.Impl.Portable /// Boolean array. public void WriteBooleanArray(string fieldName, bool[] val) { -WriteSimpleNullableField(fieldName, PortableUtils.TypeArrayBool, val, -PortableSystemHandlers.WriteHndBoolArrayTyped, val != null ? val.Length + 4 : 0); +WriteFieldId(fieldName, PU.TypeArrayBool); + +if (val == null) +WriteNullField(); +else +{ +_stream.WriteInt(PU.LengthTypeId + PU.LengthArraySize + val.Length); +_stream.WriteByte(PU.TypeArrayBool); +PU.WriteBooleanArray(val, _stream); +} } /// @@ -108,7 +122,13 @@ namespace Apache.Ignite.Core.Impl.Portable /// Boolean array. public void WriteBooleanArray(bool[] val) { -WriteSimpleNullableRawField(val, PortableSystemHandlers.WriteHndBoolArrayTyped); +if (val == null) +WriteNullRawField(); +else +{ +_stream.WriteByte(PU.TypeArrayBool); +PU.WriteBooleanArray(val, _stream); +} } /// @@ -118,7 +138,11 @@ namespace Apache.Ignite.Core.Impl.Portable /// Byte value. public void WriteByte(string fieldName, byte val) { -WriteSimpleField(fieldName, PortableUtils.TypeByte, val, PortableSystemHandlers.WriteHndByteTyped, 1); +WriteFieldId(fieldName, PU.TypeBool); + +_stream.WriteInt(PU.LengthTypeId + 1); +_stream.WriteByte(PU.TypeByte); +_stream.WriteByte(val); } /// @@ -137,8 +161,16 @@ namespace Apache.Ignite.Core.Impl.Portable /// Byte array. public void WriteByteArray(string fieldName, byte[] val) { -WriteSimpleNullableField(fieldName, PortableUtils.TypeArrayByte, val, -PortableSystemHandlers.WriteHndByteArrayTyped, val != null ? val.Length + 4 : 0); +WriteFieldId(fieldName, PU.TypeArrayByte); + +if (val == null) +WriteNullField(); +else +{ +_stream.WriteInt(PU.LengthTypeId + PU.LengthArraySize + val.Length); +_stream.WriteByte(PU.TypeArrayByte); +PU.WriteByteArray(val, _stream); +} } /// @@ -147,7 +179,13 @@ namespace Apache.Ignite.Core.Impl.Portable /// Byte array. public void WriteByteArray(byte[] val) { -WriteSimpleNullableRawField(val, PortableSystemHandlers.WriteHndByteArrayTyped); +if (val == null) +WriteNullRawField(); +else +{ +_stream.WriteByte(PU.TypeArrayByte); +PU.WriteByteArray(val, _stream); +} } /// @@ -157,7 +195,11 @@ namespace Apache.Ignite.Core.Impl.Portable /// Short value. public void WriteShort(string fieldName, short val) { -WriteSimpleField(fieldName, PortableUtils.TypeShort, val, PortableSystemHandlers.WriteHndShortTyped, 2); +WriteFieldId(fieldName, PU.TypeShort); + +_stream.WriteInt(PU.LengthTypeId + 2); +
ignite git commit: IGNITE-1552 - Fixed parsing for SQL table function
Repository: ignite Updated Branches: refs/heads/master c2cedb0ed -> 740291871 IGNITE-1552 - Fixed parsing for SQL table function Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74029187 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74029187 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74029187 Branch: refs/heads/master Commit: 740291871013bef818edf3faf19c8d4c6eab1ba5 Parents: c2cedb0 Author: S.Vladykin Authored: Tue Sep 29 17:04:52 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Sep 29 17:04:52 2015 -0700 -- .../processors/query/h2/sql/GridSqlArray.java | 52 .../processors/query/h2/sql/GridSqlElement.java | 2 +- .../query/h2/sql/GridSqlFunction.java | 60 -- .../query/h2/sql/GridSqlFunctionType.java | 3 + .../query/h2/sql/GridSqlPlaceholder.java| 7 +- .../query/h2/sql/GridSqlQueryParser.java| 84 .../processors/query/h2/sql/GridSqlType.java| 29 ++- .../query/h2/sql/GridQueryParsingTest.java | 27 +++ 8 files changed, 199 insertions(+), 65 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java new file mode 100644 index 000..69e98bf --- /dev/null +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.query.h2.sql; + +import java.util.ArrayList; +import java.util.Collections; +import org.h2.util.StatementBuilder; + +/** + * SQL Array: (1, 2, ?, 'abc') + */ +public class GridSqlArray extends GridSqlElement { +/** + * @param size Array size. + */ +public GridSqlArray(int size) { +super(size == 0 ? Collections.emptyList() : new ArrayList(size)); +} + +/** {@inheritDoc} */ +@Override public String getSQL() { +if (size() == 0) +return "()"; + +StatementBuilder buff = new StatementBuilder("("); + +for (GridSqlElement e : children) { +buff.appendExceptFirst(", "); +buff.append(e.getSQL()); +} + +if (size() == 1) +buff.append(','); + +return buff.append(')').toString(); +} +} http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java index 41b7ba4..57d3c57 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java @@ -25,7 +25,7 @@ import java.util.List; */ public abstract class GridSqlElement implements Iterable { /** */ -protected List children; +protected final List children; /** */ private GridSqlType resultType; http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java b/modules/indexing/src/main/java/org/apache/ignite/internal/pr
[31/41] ignite git commit: minor (blank line)
minor (blank line) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/040f0f33 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/040f0f33 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/040f0f33 Branch: refs/heads/ignite-1168 Commit: 040f0f33994533b8acdaad5c41a6fa37c105e658 Parents: c001d47 Author: Yakov Zhdanov Authored: Mon Sep 28 15:30:37 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Sep 28 15:30:37 2015 +0300 -- .../apache/ignite/examples/computegrid/ComputeClosureExample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/040f0f33/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java index eaa54a4..43a18e2 100644 --- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClosureExample.java @@ -76,4 +76,4 @@ public class ComputeClosureExample { System.out.println(">>> Check all nodes for output (this node is also part of the cluster)."); } } -} \ No newline at end of file +}
[20/41] ignite git commit: Removed test.
Removed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d7b36d8b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d7b36d8b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d7b36d8b Branch: refs/heads/ignite-1168 Commit: d7b36d8bd804f9d5abadf230b2f24bfc14ce4b74 Parents: bf7591b Author: sboikov Authored: Fri Sep 25 14:08:13 2015 +0300 Committer: sboikov Committed: Fri Sep 25 14:08:13 2015 +0300 -- .../GridCacheReplicatedInvalidateSelfTest.java | 249 --- .../testsuites/IgniteCacheTestSuite3.java | 2 - 2 files changed, 251 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d7b36d8b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java deleted file mode 100644 index a0c2fca..000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java +++ /dev/null @@ -1,249 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache.distributed.replicated; - -import java.util.HashMap; -import java.util.Map; -import java.util.Random; -import java.util.UUID; -import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCache; -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.IgniteException; -import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.managers.communication.GridIoMessage; -import org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage; -import org.apache.ignite.lang.IgniteInClosure; -import org.apache.ignite.plugin.extensions.communication.Message; -import org.apache.ignite.spi.IgniteSpiException; -import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.apache.ignite.transactions.Transaction; -import org.apache.ignite.transactions.TransactionConcurrency; -import org.apache.ignite.transactions.TransactionIsolation; - -import static org.apache.ignite.cache.CacheMode.REPLICATED; -import static org.apache.ignite.cache.CacheRebalanceMode.NONE; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; -import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; -import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED; -import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; -import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE; - -/** - * - */ -public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTest { -/** Random number generator. */ -private static final Random RAND = new Random(); - -/** Grid count. */ -private static final int GRID_CNT = 3; - -/** */ -private static final Integer KEY = 1; - -/** */ -private static final String VAL = "test"; - -/** */ -private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - -/** - * Don't start grid by default. - */ -public GridCacheReplicatedInvalidateSelfTest() { -super(false); -} - -/** {@inheritDoc} */ -@Override protecte
[08/41] ignite git commit: Added test.
Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b0c029c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b0c029c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b0c029c Branch: refs/heads/ignite-1168 Commit: 4b0c029cef4b351f0d389a171c30b7dcf8c1ca22 Parents: b56b15c Author: sboikov Authored: Thu Sep 24 12:19:28 2015 +0300 Committer: sboikov Committed: Thu Sep 24 12:19:28 2015 +0300 -- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ 1 file changed, 217 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b0c029c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java new file mode 100644 index 000..9d92724 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java @@ -0,0 +1,217 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.distributed.near; + +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; + +/** + * + */ +public class NearCacheMultithreadedUpdateTest extends GridCommonAbstractTest { +/** */ +private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + +/** */ +private boolean client; + +/** */ +private final int SRV_CNT = 3; + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + +cfg.setClientMode(client); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected void beforeTestsStarted() throws Exception { +super.beforeTestsStarted(); + +startGridsMultiThreaded(SRV_CNT); + +client = true; + +startGrid(SRV_CNT); + +client = false; +} + +/** {@inheritDoc} */ +@Override protected void afterTestsStopped() throws Exception { +super.afterTestsStopped(); + +stopAllGrids(); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedTx() throws Exception { +updateMultithreaded(TRANSACTIONAL, false); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedTxRestart() throws Exception { +updateMultithreaded(TRANSACTIONAL, true); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedAtomic() throw
[26/41] ignite git commit: ignite-808 Fixed GridDhtTxPrepareFuture.onEntriesLocked
ignite-808 Fixed GridDhtTxPrepareFuture.onEntriesLocked Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8fea96ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8fea96ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8fea96ea Branch: refs/heads/ignite-1168 Commit: 8fea96ea1bba43bdc702e6096bb5492bdb745b67 Parents: dc379fe Author: sboikov Authored: Mon Sep 28 11:44:12 2015 +0300 Committer: sboikov Committed: Mon Sep 28 11:44:12 2015 +0300 -- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 ++- .../IgniteTxPreloadAbstractTest.java| 43 .../replicated/GridReplicatedTxPreloadTest.java | 2 - .../testsuites/IgniteCacheTestSuite4.java | 7 4 files changed, 37 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8fea96ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 81cc272..761bbb0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -318,7 +318,11 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuturehttp://git-wip-us.apache.org/repos/asf/ignite/blob/8fea96ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 939b4a6..0a7845b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -24,6 +24,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; import javax.cache.processor.EntryProcessor; +import javax.cache.processor.EntryProcessorResult; import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteTransactions; @@ -65,6 +66,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { +// No-op. } /** {@inheritDoc} */ @@ -78,7 +80,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT public void testRemoteTxPreloading() throws Exception { IgniteCache cache = jcache(0); -for (int i = 0; i < 1; i++) +for (int i = 0; i < 10_000; i++) cache.put(String.valueOf(i), 0); final AtomicInteger gridIdx = new AtomicInteger(1); @@ -104,31 +106,36 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT for (int i = 0; i < 10; i++) keys.add(String.valueOf(i * 1000)); -cache.invokeAll(keys, new EntryProcessor() { -@Override public Void process(MutableEntry e, Object... args) { -Integer val = e.getValue(); +Map> resMap = cache.invokeAll(keys, +new EntryProcessor() { +@Override public Integer process(MutableEntry e, Object... args) { +Integer val = e.getValue(); -if (val == null) { -keyNotLoaded = true; +if (val == null) { +keyNotLoaded = true; -e.setValue(1); +e.setValue(1); -return null; -} +return null; +} -e.setValue(val + 1); +e.setValue(val + 1); -return null; +return val; +} } -}); +); assertFalse(keyNotLoaded); -fut.get(); +for (String key : keys) { +EntryProcessorResult res = resMap.get(key); -for (int i = 0; i < GRID_CNT; i++) -// Wait for preloa
[11/41] ignite git commit: schema-import examples fix (cherry picked from commit 169066b)
schema-import examples fix (cherry picked from commit 169066b) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30f5b9ef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30f5b9ef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30f5b9ef Branch: refs/heads/ignite-1168 Commit: 30f5b9ef82fe9216fd89827977c601b8eb17db50 Parents: 1021d4e Author: Anton Vinogradov Authored: Thu Sep 24 14:33:26 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:16:17 2015 +0300 -- examples/schema-import/pom.xml | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/30f5b9ef/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index d302606..fdbd631 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -26,13 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache.ignite +ignite-parent +1 +../../parent + + UTF-8 -org.apache.ignite ignite-schema-import-demo -${project.version} +1.0.0-SNAPSHOT
[12/41] ignite git commit: schema-import examples fix (cherry picked from commit b054fdc)
schema-import examples fix (cherry picked from commit b054fdc) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/94f5248b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/94f5248b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/94f5248b Branch: refs/heads/ignite-1168 Commit: 94f5248b0e03f04c53f0c264a880803e20de2d3a Parents: 30f5b9e Author: Anton Vinogradov Authored: Thu Sep 24 14:52:09 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:16:20 2015 +0300 -- examples/schema-import/pom.xml | 2 +- pom.xml| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/94f5248b/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fdbd631..fce6f47 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -38,7 +38,7 @@ ignite-schema-import-demo -1.0.0-SNAPSHOT +1.3.3-p7-SNAPSHOT http://git-wip-us.apache.org/repos/asf/ignite/blob/94f5248b/pom.xml -- diff --git a/pom.xml b/pom.xml index b47958f..33689a4 100644 --- a/pom.xml +++ b/pom.xml @@ -466,6 +466,7 @@ examples examples +examples/schema-import
[01/41] ignite git commit: ignite-1524 Fixed processing of ClientReconnectMessage
Repository: ignite Updated Branches: refs/heads/ignite-1168 124c492f6 -> 3a322c055 ignite-1524 Fixed processing of ClientReconnectMessage Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04f4f54a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04f4f54a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04f4f54a Branch: refs/heads/ignite-1168 Commit: 04f4f54a7ff1d43fa3baf4fa07865a8163796a82 Parents: 1942d75 Author: sboikov Authored: Wed Sep 23 09:31:59 2015 +0300 Committer: sboikov Committed: Wed Sep 23 09:31:59 2015 +0300 -- .../ignite/spi/discovery/tcp/ServerImpl.java| 97 +++- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +-- 2 files changed, 81 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/04f4f54a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 4ce46e8..8a205d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -2958,70 +2958,81 @@ class ServerImpl extends TcpDiscoveryImpl { * @param msg Client reconnect message. */ private void processClientReconnectMessage(TcpDiscoveryClientReconnectMessage msg) { +UUID nodeId = msg.creatorNodeId(); + UUID locNodeId = getLocalNodeId(); boolean isLocNodeRouter = locNodeId.equals(msg.routerNodeId()); if (!msg.verified()) { -assert isLocNodeRouter; - -msg.verify(locNodeId); +TcpDiscoveryNode node = ring.node(nodeId); -if (ring.hasRemoteNodes()) { -sendMessageAcrossRing(msg); +assert node == null || node.isClient(); -return; +if (node != null) { +node.clientRouterNodeId(msg.routerNodeId()); +node.aliveCheck(spi.maxMissedClientHbs); } -} - -UUID nodeId = msg.creatorNodeId(); -TcpDiscoveryNode node = ring.node(nodeId); +if (isLocalNodeCoordinator()) { +msg.verify(locNodeId); -assert node == null || node.isClient(); +if (node != null) { +Collection pending = msgHist.messages(msg.lastMessageId(), node); -if (node != null) { -assert node.isClient(); +if (pending != null) { +msg.pendingMessages(pending); +msg.success(true); -node.clientRouterNodeId(msg.routerNodeId()); -node.aliveCheck(spi.maxMissedClientHbs); +if (log.isDebugEnabled()) +log.debug("Accept client reconnect, restored pending messages " + +"[locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); +} +else { +if (log.isDebugEnabled()) +log.debug("Failing reconnecting client node because failed to restore pending " + +"messages [locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); -if (isLocalNodeCoordinator()) { -Collection pending = msgHist.messages(msg.lastMessageId(), node); +processNodeFailedMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, +node.id(), node.internalOrder())); +} +} +else if (log.isDebugEnabled()) +log.debug("Reconnecting client node is already failed [nodeId=" + nodeId + ']'); -if (pending != null) { -msg.pendingMessages(pending); -msg.success(true); +if (isLocNodeRouter) { +ClientMessageWorker wrk = clientMsgWorkers.get(nodeId); -if (log.isDebugEnabled()) -log.debug("Accept client reconnect, restored pending messages " + -"[locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); +if (wrk != null) +wrk.addMessage(msg); +
[22/41] ignite git commit: fixed sha1 & md5, again (cherry picked from commit 7752aa9)
fixed sha1 & md5, again (cherry picked from commit 7752aa9) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a6306a54 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a6306a54 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a6306a54 Branch: refs/heads/ignite-1168 Commit: a6306a5471a189fd4bbdabb9c1ccd9a8f0c38cb5 Parents: 3c5758b Author: Anton Vinogradov Authored: Fri Sep 25 16:01:40 2015 +0300 Committer: Anton Vinogradov Committed: Fri Sep 25 16:21:23 2015 +0300 -- pom.xml | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a6306a54/pom.xml -- diff --git a/pom.xml b/pom.xml index 462d4a0..fad8807 100644 --- a/pom.xml +++ b/pom.xml @@ -622,7 +622,15 @@ - + + + + + + + + +
[04/41] ignite git commit: Merging IGNITE-1171 - fixed problems with custom events in discovery
Merging IGNITE-1171 - fixed problems with custom events in discovery Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f3ef6a8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f3ef6a8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f3ef6a8 Branch: refs/heads/ignite-1168 Commit: 6f3ef6a84ee1c3e77d32ca9930835d1720918e20 Parents: 517d0f5 Author: Yakov Zhdanov Authored: Wed Sep 23 16:36:15 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Sep 23 16:36:15 2015 +0300 -- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 18 +- .../continuous/CacheContinuousQueryManager.java | 10 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 301 ++ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++ .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../distributed/CacheAffEarlySelfTest.java | 245 --- .../distributed/CacheAffinityEarlyTest.java | 168 ++ ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++-- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++- .../testsuites/IgniteCacheTestSuite4.java | 2 + 20 files changed, 864 insertions(+), 425 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java index 83e2525..bac1a68 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java @@ -160,4 +160,4 @@ public interface IgniteAtomicLong extends Closeable { * @throws IgniteException If operation failed. */ @Override public void close(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java index f3c3be9..3cfc34e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java @@ -39,9 +39,6 @@ public class DynamicCacheDescriptor { @GridToStringExclude private CacheConfiguration cacheCfg; -/** Cancelled flag. */ -private boolean cancelled; - /** Locally configured flag. */ private boolean locCfg; @@ -156,6 +153,13 @@ public class DynamicCacheDescriptor { } /** + * @return Started flag. + */ +public boolean started() { +return started; +} + +/** * @return Cache configuration. */ public CacheConfiguration cacheConfiguration() { http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 34c571c..eb76233 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -1435,6 +1435,7 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana private static final long serialVersionUID = 0L; /** */ +@GridToStringInclude private AffinityTopologyVersion topVer; /** @@ -1455,5 +1456,10 @@ public class Grid
[02/41] ignite git commit: IGNITE-586: Fixed IGFS rename problem causing corrupted file system structure.
IGNITE-586: Fixed IGFS rename problem causing corrupted file system structure. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3bcf4ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3bcf4ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3bcf4ae Branch: refs/heads/ignite-1168 Commit: b3bcf4aeecf9aa1bd6d19e94c8da7b09741f5410 Parents: 0a41ae5 Author: iveselovskiy Authored: Wed Sep 23 13:45:01 2015 +0300 Committer: vozerov-gridgain Committed: Wed Sep 23 13:45:01 2015 +0300 -- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 87 ++-- .../processors/igfs/IgfsMetaManager.java| 193 -- .../processors/igfs/IgfsAbstractSelfTest.java | 201 ++- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 +- .../testsuites/IgniteHadoopTestSuite.java | 19 +- 8 files changed, 409 insertions(+), 216 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java index b02d0f1..a187a90 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java @@ -451,7 +451,7 @@ public interface IgniteFileSystem extends IgniteAsyncSupport { * @return File information for specified path or {@code null} if such path does not exist. * @throws IgniteException In case of error. */ -public IgfsFile info(IgfsPath path) throws IgniteException; +@Nullable public IgfsFile info(IgfsPath path) throws IgniteException; /** * Gets used space in bytes. http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 44a3fa9..6ac2b64 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -436,7 +436,7 @@ public class CacheConfiguration extends MutableConfiguration { * @return {@code this} for chaining. */ public CacheConfiguration setName(String name) { -A.ensure(name == null || !name.isEmpty(), "Name cannot be null or empty."); +A.ensure(name == null || !name.isEmpty(), "Name cannot be empty."); this.name = name; http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index 695db38..0dd0307 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -472,8 +472,7 @@ public final class IgfsImpl implements IgfsEx { @SuppressWarnings("ConstantConditions") @Override public IgfsStatus globalSpace() { return safeOp(new Callable() { -@Override -public IgfsStatus call() throws Exception { +@Override public IgfsStatus call() throws Exception { IgniteBiTuple space = igfsCtx.kernalContext().grid().compute().execute( new IgfsGlobalSpaceTask(name()), null); @@ -560,7 +559,7 @@ public final class IgfsImpl implements IgfsEx { } /** {@inheritDoc} */ -@Override public IgfsFile info(final IgfsPath path) { +@Override @Nullable public IgfsFile info(final IgfsPath path) { A.notNull(path, "path"); return safeOp(new Callable() { @@ -692,64 +691,12 @@ public final class IgfsImpl implements IgfsEx { return null; } -IgfsPath destParent = dest.parent(); +IgfsFileInfo info = meta.move(src, dest); -// Resolve source file info. -FileDescriptor srcDesc = getFileDescriptor(sr
[15/41] ignite git commit: ignite-1540 Handle error in GridDhtAtomicUpdateFuture.onDone
ignite-1540 Handle error in GridDhtAtomicUpdateFuture.onDone Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1056a31f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1056a31f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1056a31f Branch: refs/heads/ignite-1168 Commit: 1056a31fc72ea25c8790e37f2621f3d6e1908c89 Parents: ece3400 Author: sboikov Authored: Thu Sep 24 15:52:17 2015 +0300 Committer: sboikov Committed: Thu Sep 24 15:52:17 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1056a31f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index 0cbad48..35b8e27 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -311,6 +311,11 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter if (super.onDone(res, err)) { cctx.mvcc().removeAtomicFuture(version()); +if (err != null) { +for (KeyCacheObject key : keys) +updateRes.addFailedKey(key, err); +} + if (updateReq.writeSynchronizationMode() == FULL_SYNC) completionCb.apply(updateReq, updateRes);
[09/41] ignite git commit: Fixed test.
Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6ba3c3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6ba3c3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6ba3c3b Branch: refs/heads/ignite-1168 Commit: f6ba3c3b4575c60f94ae4742b5d2d7bd2183f938 Parents: 4b0c029 Author: sboikov Authored: Thu Sep 24 12:56:19 2015 +0300 Committer: sboikov Committed: Thu Sep 24 12:56:19 2015 +0300 -- .../processors/cache/GridCacheVariableTopologySelfTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f6ba3c3b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index 7078843..80103c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; +import javax.cache.CacheException; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -146,7 +147,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { catch (TransactionRollbackException | ClusterTopologyException e) { info("Caught exception: " + e); } -catch (IgniteException e) { +catch (CacheException | IgniteException e) { if (X.hasCause(e, ClusterTopologyCheckedException.class)) info("Caught cache exception: " + e); else
[37/41] ignite git commit: Added test.
Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c517fcf5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c517fcf5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c517fcf5 Branch: refs/heads/ignite-1168 Commit: c517fcf5a7c9444e27e5f4d261702aaa2dfe726d Parents: ce3f20b Author: sboikov Authored: Tue Sep 29 12:15:37 2015 +0300 Committer: sboikov Committed: Tue Sep 29 12:15:37 2015 +0300 -- .../IgniteCacheCreatePutMultiNodeSelfTest.java | 151 +++ .../testsuites/IgniteCacheTestSuite4.java | 2 + 2 files changed, 153 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c517fcf5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java new file mode 100644 index 000..cf0e0d3 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java @@ -0,0 +1,151 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.distributed; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.concurrent.Callable; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.atomic.AtomicReferenceArray; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +/** + * + */ +public class IgniteCacheCreatePutMultiNodeSelfTest extends GridCommonAbstractTest { +/** Grid count. */ +private static final int GRID_CNT = 4; + +/** */ +private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); +discoSpi.setIpFinder(ipFinder); + +cfg.setDiscoverySpi(discoSpi); + +OptimizedMarshaller marsh = new OptimizedMarshaller(); +marsh.setRequireSerializable(false); + +cfg.setMarshaller(marsh); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected long getTestTimeout() { +return 6 * 60 * 1000L; +} + +/** + * @throws Exception If failed. + */ +public void testStartNodes() throws Exception { +try { +Collection> futs = new ArrayList<>(GRID_CNT); +int scale = 3; + +final CyclicBarrier barrier = new CyclicBarrier(GRID_CNT * scale); +final AtomicReferenceArray err = new AtomicReferenceArray<>(GRID_CNT * scale); + +for (int i = 0; i < GRID_CNT * scale; i++) { +if (i < GRID_CNT) +startGrid(i); + +final int idx = i; + +IgniteInternalFuture fut = GridTestUtils.runAsync(new Callable() { +@Override public Void call() throw
[25/41] ignite git commit: IGNITE-1554 Fix igniterouter scripts.
IGNITE-1554 Fix igniterouter scripts. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc379fe1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc379fe1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc379fe1 Branch: refs/heads/ignite-1168 Commit: dc379fe14179a819818e31b190a68982f4dd24a7 Parents: cdc5b49 Author: Raul Kripalani Authored: Sat Sep 26 11:31:11 2015 +0100 Committer: Raul Kripalani Committed: Sat Sep 26 11:34:55 2015 +0100 -- bin/igniterouter.bat | 2 +- bin/igniterouter.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dc379fe1/bin/igniterouter.bat -- diff --git a/bin/igniterouter.bat b/bin/igniterouter.bat index b1f9148..0a9775e 100644 --- a/bin/igniterouter.bat +++ b/bin/igniterouter.bat @@ -27,7 +27,7 @@ if "%OS%" == "Windows_NT" setlocal :: Set router service environment. :: set "DEFAULT_CONFIG=config\router\default-router.xml" -set MAIN_CLASS=org.apache.ignite.client.router.impl.GridRouterCommandLineStartup +set MAIN_CLASS=org.apache.ignite.internal.client.router.impl.GridRouterCommandLineStartup :: :: Start router service. http://git-wip-us.apache.org/repos/asf/ignite/blob/dc379fe1/bin/igniterouter.sh -- diff --git a/bin/igniterouter.sh b/bin/igniterouter.sh index 9ab848e..af27f8b 100755 --- a/bin/igniterouter.sh +++ b/bin/igniterouter.sh @@ -45,7 +45,7 @@ setIgniteHome # Set router service environment. # export DEFAULT_CONFIG=config/router/default-router.xml -export MAIN_CLASS=org.apache.ignite.client.router.impl.GridRouterCommandLineStartup +export MAIN_CLASS=org.apache.ignite.internal.client.router.impl.GridRouterCommandLineStartup # # Start router service.
[23/41] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/343191bc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/343191bc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/343191bc Branch: refs/heads/ignite-1168 Commit: 343191bce46f9d745c1c0151ba86ac6032e76f16 Parents: a6306a5 a42750a Author: Anton Vinogradov Authored: Fri Sep 25 16:21:42 2015 +0300 Committer: Anton Vinogradov Committed: Fri Sep 25 16:21:42 2015 +0300 -- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + .../internal/GridUpdateNotifierSelfTest.java| 1 + ...nedQueueFailoverDataConsistencySelfTest.java | 5 - .../GridCacheReplicatedInvalidateSelfTest.java | 249 --- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 5 +- .../multijvm/IgniteCacheProcessProxy.java | 3 +- .../testsuites/IgniteCacheTestSuite3.java | 2 - 7 files changed, 12 insertions(+), 258 deletions(-) --
[27/41] ignite git commit: Added test.
Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2575cf33 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2575cf33 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2575cf33 Branch: refs/heads/ignite-1168 Commit: 2575cf33a4b8389aa84e9cf0ee68d48c3a48bfa7 Parents: 8fea96e Author: sboikov Authored: Mon Sep 28 13:07:59 2015 +0300 Committer: sboikov Committed: Mon Sep 28 13:07:59 2015 +0300 -- .../cache/IgniteDynamicCacheFilterTest.java | 150 +++ .../testsuites/IgniteCacheTestSuite4.java | 3 + 2 files changed, 153 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2575cf33/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheFilterTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheFilterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheFilterTest.java new file mode 100644 index 000..4d543e0 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheFilterTest.java @@ -0,0 +1,150 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache; + +import java.util.HashMap; +import java.util.Map; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.cache.CacheMode.REPLICATED; +import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; + +/** + * + */ +public class IgniteDynamicCacheFilterTest extends GridCommonAbstractTest { +/** */ +private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + +/** */ +private static final String ATTR_NAME = "cacheAttr"; + +/** */ +private String attrVal; + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER); + +CacheConfiguration ccfg = new CacheConfiguration(); + +ccfg.setWriteSynchronizationMode(FULL_SYNC); +ccfg.setCacheMode(REPLICATED); +ccfg.setRebalanceMode(SYNC); + +ccfg.setNodeFilter(new TestNodeFilter("A")); + +if (attrVal != null) { +Map attrs = new HashMap<>(); + +attrs.put(ATTR_NAME, attrVal); + +cfg.setUserAttributes(attrs); +} + +cfg.setCacheConfiguration(ccfg); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected void afterTest() throws Exception { +super.afterTest(); + +stopAllGrids(); +} + +/** + * @throws Exception If failed. + */ +public void testCofiguredCacheFilter() throws Exception { +attrVal = "A"; + +Ignite ignite0 = startGrid(0); + +IgniteCache cache0 = ignite0.cache(null); + +assertNotNull(cache0); + +cache0.put(1, 1); + +attrVal = null; + +Ignite ignite1 = startGrid(1); + +IgniteCache cache1 = ignite1.cache(null); + +assertNotNull(cache1); + +attrVal = "B"; + +Ignite ignite2 = startGrid(2); + +IgniteCache cache2 = ignite2.cache(null); + +
[19/41] ignite git commit: Enabled test.
Enabled test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/27cf5016 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/27cf5016 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/27cf5016 Branch: refs/heads/ignite-1168 Commit: 27cf5016a5c859c877a95d793c622926bafb2f9f Parents: 03a8fe5 Author: sboikov Authored: Fri Sep 25 13:33:27 2015 +0300 Committer: sboikov Committed: Fri Sep 25 13:33:27 2015 +0300 -- .../org/apache/ignite/internal/GridUpdateNotifierSelfTest.java | 1 + ...ridCachePartitionedQueueFailoverDataConsistencySelfTest.java | 5 - 2 files changed, 1 insertion(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/27cf5016/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java index 61c2085..93fd916 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java @@ -32,6 +32,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonTest; */ @GridCommonTest(group = "Kernal Self") public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest { +/** */ private String updateStatusParams; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/27cf5016/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java index 0d3634f..bef2b22 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java @@ -30,11 +30,6 @@ import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED; public class GridCachePartitionedQueueFailoverDataConsistencySelfTest extends GridCacheAbstractQueueFailoverDataConsistencySelfTest { /** {@inheritDoc} */ -@Override protected void beforeTest() throws Exception { -fail("https://issues.apache.org/jira/browse/IGNITE-264";); -} - -/** {@inheritDoc} */ @Override protected CacheMemoryMode collectionMemoryMode() { return ONHEAP_TIERED; }
[33/41] ignite git commit: Disabled SSL test for old JDKs.
Disabled SSL test for old JDKs. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5c3ca3a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5c3ca3a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5c3ca3a Branch: refs/heads/ignite-1168 Commit: e5c3ca3a952c3595bf240bf0adea8117dd4db116 Parents: 04930ca Author: sboikov Authored: Mon Sep 28 16:35:59 2015 +0300 Committer: sboikov Committed: Mon Sep 28 16:35:59 2015 +0300 -- .../apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c3ca3a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java index 0bde89a..1f94f9e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java @@ -21,6 +21,7 @@ import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest; +import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest; /** @@ -38,7 +39,9 @@ public class IgniteCacheFailoverTestSuite3 extends TestSuite { suite.addTestSuite(IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.class); suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class); -suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class); +// Disable SSL test with old JDK because of https://bugs.openjdk.java.net/browse/JDK-8013809. +if (!IgniteUtils.isHotSpot() || IgniteUtils.isJavaVersionAtLeast("1.7.0_65")) +suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class); return suite; }
[38/41] ignite git commit: minor (style)
minor (style) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2cedb0e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2cedb0e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2cedb0e Branch: refs/heads/ignite-1168 Commit: c2cedb0ed5f54cdbdc60635043555c7c47c04bea Parents: c517fcf Author: Yakov Zhdanov Authored: Tue Sep 29 16:20:26 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Sep 29 16:20:26 2015 +0300 -- .../java/org/apache/ignite/internal/util/GridArgumentCheck.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c2cedb0e/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java index 8be3610..f96773e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java @@ -157,8 +157,7 @@ public class GridArgumentCheck { public static void notNullOrEmpty(String value, String name) { notNull(value, name); -if (value.trim().length() == 0) { +if (value.trim().length() == 0) throw new IllegalArgumentException(INVALID_ARG_MSG_PREFIX + name + NOT_NULL_OR_EMPTY_SUFFIX); -} } -} \ No newline at end of file +}
[06/41] ignite git commit: IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache
IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7db44f11 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7db44f11 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7db44f11 Branch: refs/heads/ignite-1168 Commit: 7db44f11f7925b5a29a0a3e017baa93b52fb2982 Parents: 70a8a92 Author: Valentin Kulichenko Authored: Wed Sep 23 18:53:06 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 18:53:06 2015 -0700 -- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 58 +++-- .../continuous/GridContinuousProcessor.java | 3 +- ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 +++ .../IgniteCacheQuerySelfTestSuite.java | 4 +- 5 files changed, 144 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index cc6c19a..ae96f23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -556,7 +556,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter> cur = qry.getInitialQuery() != null ? query(qry.getInitialQuery()) : null; @@ -1896,4 +1896,4 @@ public class IgniteCacheProxy extends AsyncSupportAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index c719f1e..6a151a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -43,10 +43,9 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; +import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.ContinuousQuery; -import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.cluster.ClusterTopologyException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; @@ -55,6 +54,7 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.continuous.GridContinuousHandler; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.security.SecurityPermission; import org.apache.ignite.resources.LoggerResource; import org.jsr166.ConcurrentHashMap8; @@ -271,7 +271,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @param bufSize Buffer size. * @param timeInterval Time interval. * @param autoUnsubscribe Auto unsubscribe flag. - * @param grp Cluster group. + * @param loc Local flag. * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ @@ -280,7 +280,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { int bufSize, long timeInterval, boolean autoUnsubscribe, -ClusterGroup grp) throws IgniteCheckedException +boolean loc) throws IgniteCheckedException { return executeQuery0( locLsnr, @@ -293,7 +293,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { true, false, true, -grp); +loc); } /** @@ -321,7 +321,7 @@ public class CacheContinuousQueryManager exte
[21/41] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a42750ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a42750ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a42750ae Branch: refs/heads/ignite-1168 Commit: a42750ae0465cb79c39d9e8875c11cafd91fd8a3 Parents: d7b36d8 27cf501 Author: sboikov Authored: Fri Sep 25 14:08:41 2015 +0300 Committer: sboikov Committed: Fri Sep 25 14:08:41 2015 +0300 -- .../org/apache/ignite/internal/GridUpdateNotifierSelfTest.java | 1 + ...ridCachePartitionedQueueFailoverDataConsistencySelfTest.java | 5 - .../expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java| 5 - 3 files changed, 5 insertions(+), 6 deletions(-) --
[13/41] ignite git commit: schema-import examples fix (cherry picked from commit b054fdc)
schema-import examples fix (cherry picked from commit b054fdc) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd7d4fac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd7d4fac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd7d4fac Branch: refs/heads/ignite-1168 Commit: dd7d4fac3a5f391b23c196a5d9951de9d3a762fa Parents: 94f5248 Author: Anton Vinogradov Authored: Thu Sep 24 15:17:15 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:17:15 2015 +0300 -- examples/schema-import/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dd7d4fac/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fce6f47..32ce869 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -38,7 +38,7 @@ ignite-schema-import-demo -1.3.3-p7-SNAPSHOT +1.5.0-SNAPSHOT
[10/41] ignite git commit: Fixed imports.
Fixed imports. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ece34004 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ece34004 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ece34004 Branch: refs/heads/ignite-1168 Commit: ece3400438709b2bac2ad9d206028b4bdb897073 Parents: f6ba3c3 Author: sboikov Authored: Thu Sep 24 13:09:15 2015 +0300 Committer: sboikov Committed: Thu Sep 24 13:09:15 2015 +0300 -- .../IgniteCacheFailoverTestSuite.java | 4 .../IgniteCacheFailoverTestSuite3.java | 23 +++- 2 files changed, 3 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ece34004/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java index abc8765..c9e507d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java @@ -33,18 +33,14 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtR import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheTxNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridNearCacheTxNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteAtomicLongChangingTopologySelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientInvalidPartitionHandlingSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicInvalidPartitionHandlingSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicPrimaryWriteOrderRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearRemoveFailureTest; -import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest; import org.apache.ignite.testframework.GridTestUtils; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ece34004/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java index 318db9e..0bde89a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java @@ -18,18 +18,10 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.processors.cache.GridCacheIncrementTransformTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheTopologySafeGetSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearRemoveFailureTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelf
[17/41] ignite git commit: Changed IgniteCacheProcessProxy.localEntries to avoid issues with Cache.Entry serialization.
Changed IgniteCacheProcessProxy.localEntries to avoid issues with Cache.Entry serialization. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bf7591b5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bf7591b5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bf7591b5 Branch: refs/heads/ignite-1168 Commit: bf7591b5eb6323011a03c424362ab68f994cffc9 Parents: 31c4405 Author: sboikov Authored: Thu Sep 24 16:33:05 2015 +0300 Committer: sboikov Committed: Thu Sep 24 16:33:05 2015 +0300 -- .../testframework/junits/multijvm/IgniteCacheProcessProxy.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/bf7591b5/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index dfbb0ae..ac8c5af 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -43,6 +43,7 @@ import org.apache.ignite.cache.query.Query; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.QueryMetrics; import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.internal.processors.cache.CacheEntryImpl; import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteCallable; @@ -209,7 +210,7 @@ public class IgniteCacheProcessProxy implements IgniteCache { Collection res = new ArrayList<>(); for (Entry e : cache().localEntries(peekModes)) -res.add(e); +res.add(new CacheEntryImpl(e.getKey(), e.getValue())); return res; }
[30/41] ignite git commit: ignite-80 Fixed dynamic cache start future completion
ignite-80 Fixed dynamic cache start future completion Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13629ce8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13629ce8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13629ce8 Branch: refs/heads/ignite-1168 Commit: 13629ce89c71e5a1e1c447885ce0be9d3efb5a6c Parents: c001d47 Author: sboikov Authored: Mon Sep 28 15:17:15 2015 +0300 Committer: sboikov Committed: Mon Sep 28 15:17:15 2015 +0300 -- .../managers/discovery/CustomEventListener.java | 4 +++- .../discovery/GridDiscoveryManager.java | 2 +- .../cache/DynamicCacheChangeRequest.java| 19 +++ .../cache/DynamicCacheDescriptor.java | 19 +++ .../GridCachePartitionExchangeManager.java | 20 +--- .../processors/cache/GridCacheProcessor.java| 15 +++ .../continuous/CacheContinuousQueryHandler.java | 10 +++--- .../continuous/GridContinuousProcessor.java | 17 + .../datastructures/DataStructuresProcessor.java | 6 +- ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 - ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 - ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 ++-- 12 files changed, 101 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/13629ce8/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java index ab143fb..8db4e67 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.managers.discovery; import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; /** * Listener interface. @@ -26,6 +27,7 @@ public interface CustomEventListener { /** * @param snd Sender. * @param msg Message. + * @param topVer Current topology version. */ -public void onCustomEvent(ClusterNode snd, T msg); +public void onCustomEvent(ClusterNode snd, T msg, AffinityTopologyVersion topVer); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/13629ce8/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 3a09b2c..785613d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -527,7 +527,7 @@ public class GridDiscoveryManager extends GridManagerAdapter { if (list != null) { for (CustomEventListener lsnr : list) { try { -lsnr.onCustomEvent(node, customMsg); +lsnr.onCustomEvent(node, customMsg, nextTopVer); } catch (Exception e) { U.error(log, "Failed to notify direct custom event listener: " + customMsg, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/13629ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java index 583e346..b23be41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java @@ -21,9 +21,11 @@ import java.io.Serializable; import java.util.UUID; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration;
[14/41] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c5758ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c5758ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c5758ba Branch: refs/heads/ignite-1168 Commit: 3c5758bab14b30b1dad7eb39d1c388e5f6956e0f Parents: dd7d4fa ece3400 Author: Anton Vinogradov Authored: Thu Sep 24 15:17:46 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:17:46 2015 +0300 -- .../socket/WordsSocketStreamerServer.java | 5 +- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +- .../configuration/CacheConfiguration.java | 17 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 51 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 28 +- .../cache/GridCacheSwapEntryImpl.java | 31 +- .../processors/cache/GridCacheSwapManager.java | 80 ++- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 66 +- .../continuous/GridContinuousProcessor.java | 3 +- .../datastreamer/DataStreamerImpl.java | 2 - .../internal/processors/igfs/IgfsImpl.java | 87 +-- .../processors/igfs/IgfsMetaManager.java| 193 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 410 + .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 +-- .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../org/apache/ignite/stream/StreamAdapter.java | 104 +++- .../stream/StreamMultipleTupleExtractor.java| 38 ++ .../stream/StreamSingleTupleExtractor.java | 40 ++ .../ignite/stream/StreamTupleExtractor.java | 20 +- .../ignite/stream/socket/SocketStreamer.java| 3 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheVariableTopologySelfTest.java | 3 +- .../IgniteCacheEntryListenerAbstractTest.java | 65 +- .../distributed/CacheAffEarlySelfTest.java | 245 .../distributed/CacheAffinityEarlyTest.java | 168 + .../IgniteCachePutRetryAbstractSelfTest.java| 33 + ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 .../processors/igfs/IgfsAbstractSelfTest.java | 201 -- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 ++-- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 139 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 +- .../stream/socket/SocketStreamerSelfTest.java | 112 +++- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 23 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteHadoopTestSuite.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 19 +- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 54 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java| 10 +- .../cache/CacheIndexStreamerTest.java | 37 +- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + modules/mqtt/pom.xml| 114 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++ .../stream/mqtt/IgniteMqttStreamerTest.java | 553 + .../mqtt/IgniteMqttStreamerTestSuite.java | 34 ++ .../Apache.Ignite.Core/Impl/IgniteManager.cs| 2 - modules/yardstick/config/ignite-base-config.xml | 2 +- pom.xml | 1 + 71 files changed, 3762 insertions(+), 958 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/b
[05/41] ignite git commit: Exposed IgniteKernal.dumpDebugInfo() to MX bean
Exposed IgniteKernal.dumpDebugInfo() to MX bean Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70a8a92d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70a8a92d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70a8a92d Branch: refs/heads/ignite-1168 Commit: 70a8a92da3cf39b0ed1cf18effd8fae1478cb2bd Parents: 6f3ef6a Author: Valentin Kulichenko Authored: Wed Sep 23 17:23:31 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 17:23:31 2015 -0700 -- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 4 +--- .../src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java | 8 +++- 2 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 82db059..60725e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -3153,9 +3153,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { return ctx.isDaemon() && U.hasAnnotation(comp.getClass(), SkipDaemon.class); } -/** - * - */ +/** {@inheritDoc} */ public void dumpDebugInfo() { U.warn(log, "Dumping debug info for node [id=" + ctx.localNodeId() + ", name=" + ctx.gridName() + http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java index 4755bf2..c30e0e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java @@ -366,4 +366,10 @@ public interface IgniteMXBean { */ @MXBeanDescription("Prints last suppressed errors.") public void printLastErrors(); -} \ No newline at end of file + +/** + * Dumps debug information for the current node. + */ +@MXBeanDescription("Dumps debug information for the current node.") +public void dumpDebugInfo(); +}
[07/41] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.4'
Merge remote-tracking branch 'remotes/origin/ignite-1.4' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b56b15cd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b56b15cd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b56b15cd Branch: refs/heads/ignite-1168 Commit: b56b15cda7fc94b25400b1334b365053f0017f7f Parents: b3bcf4a 7db44f1 Author: sboikov Authored: Thu Sep 24 09:09:46 2015 +0300 Committer: sboikov Committed: Thu Sep 24 09:09:46 2015 +0300 -- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 18 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 66 ++- .../continuous/GridContinuousProcessor.java | 3 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 398 +-- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++--- .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../distributed/CacheAffEarlySelfTest.java | 245 .../distributed/CacheAffinityEarlyTest.java | 168 ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 ++ ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../IgniteCacheQuerySelfTestSuite.java | 4 +- 28 files changed, 1099 insertions(+), 525 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b56b15cd/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java --
[16/41] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31c44054 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31c44054 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31c44054 Branch: refs/heads/ignite-1168 Commit: 31c44054c25e03e95fb4a3e237bfa6bf273c59dd Parents: 1056a31 3c5758b Author: sboikov Authored: Thu Sep 24 15:52:40 2015 +0300 Committer: sboikov Committed: Thu Sep 24 15:52:40 2015 +0300 -- examples/schema-import/pom.xml | 10 -- pom.xml| 1 + 2 files changed, 9 insertions(+), 2 deletions(-) --
[18/41] ignite git commit: Enabled test for atomic cache.
Enabled test for atomic cache. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/03a8fe58 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/03a8fe58 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/03a8fe58 Branch: refs/heads/ignite-1168 Commit: 03a8fe587e46404461bff6f118ccbb8539f3f39a Parents: bf7591b Author: sboikov Authored: Fri Sep 25 13:12:11 2015 +0300 Committer: sboikov Committed: Fri Sep 25 13:12:11 2015 +0300 -- .../expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java| 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/03a8fe58/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java index 99af872..78c59ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.java @@ -25,6 +25,7 @@ import javax.cache.integration.CompletionListenerFuture; import javax.cache.processor.EntryProcessor; import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.configuration.CacheConfiguration; @@ -141,7 +142,8 @@ public abstract class IgniteCacheExpiryPolicyWithStoreAbstractTest extends Ignit * @throws Exception If failed. */ public void testReadThrough() throws Exception { -fail("https://issues.apache.org/jira/browse/IGNITE-821";); +if (atomicityMode() == CacheAtomicityMode.TRANSACTIONAL) +fail("https://issues.apache.org/jira/browse/IGNITE-821";); IgniteCache cache = jcache(0); @@ -185,6 +187,7 @@ public abstract class IgniteCacheExpiryPolicyWithStoreAbstractTest extends Ignit /** * @param key Key. * @param ttl TTL. + * @param primaryOnly If {@code true} expect entries only on primary node. * @throws Exception If failed. */ private void checkTtl(Object key, final long ttl, boolean primaryOnly) throws Exception {
[03/41] ignite git commit: Fixed test.
Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/517d0f58 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/517d0f58 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/517d0f58 Branch: refs/heads/ignite-1168 Commit: 517d0f584f67e9291b7f6f2efe3f42b7131f6a25 Parents: 04f4f54 Author: sboikov Authored: Wed Sep 23 15:43:13 2015 +0300 Committer: sboikov Committed: Wed Sep 23 15:43:13 2015 +0300 -- .../processors/cache/GridCacheAbstractRemoveFailureTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/517d0f58/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 647746e..a3d9948 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -365,13 +365,13 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr U.sleep(random(START_DELAY.get1(), START_DELAY.get2())); -if (stop.get()) -return; - log.info("Restarting node " + idx); startGrid(idx); +if (stop.get()) +return; + U.sleep(1000); }
[32/41] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04930caa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04930caa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04930caa Branch: refs/heads/ignite-1168 Commit: 04930caa238ae974e037d9705e7b329fbde9ae52 Parents: 040f0f3 13629ce Author: Yakov Zhdanov Authored: Mon Sep 28 15:31:03 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Sep 28 15:31:03 2015 +0300 -- .../managers/discovery/CustomEventListener.java | 4 +++- .../discovery/GridDiscoveryManager.java | 2 +- .../cache/DynamicCacheChangeRequest.java| 19 +++ .../cache/DynamicCacheDescriptor.java | 19 +++ .../GridCachePartitionExchangeManager.java | 20 +--- .../processors/cache/GridCacheProcessor.java| 15 +++ .../continuous/CacheContinuousQueryHandler.java | 10 +++--- .../continuous/GridContinuousProcessor.java | 17 + .../datastructures/DataStructuresProcessor.java | 6 +- ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 - ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 - ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 ++-- 12 files changed, 101 insertions(+), 37 deletions(-) --
[36/41] ignite git commit: Added tests.
Added tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce3f20be Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce3f20be Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce3f20be Branch: refs/heads/ignite-1168 Commit: ce3f20be6d1950fa182f1622b92984b465ae27cd Parents: c6bb01b Author: sboikov Authored: Tue Sep 29 09:52:46 2015 +0300 Committer: sboikov Committed: Tue Sep 29 09:52:46 2015 +0300 -- .../IgniteCrossCacheTxNearEnabledSelfTest.java | 28 +++ .../dht/IgniteCrossCacheTxSelfTest.java | 213 +++ .../testsuites/IgniteCacheTestSuite4.java | 2 + 3 files changed, 243 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ce3f20be/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java new file mode 100644 index 000..f70cedf --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.distributed.dht; + +/** + * + */ +public class IgniteCrossCacheTxNearEnabledSelfTest extends IgniteCrossCacheTxSelfTest { +/** {@inheritDoc} */ +@Override protected boolean nearEnabled() { +return true; +} +} http://git-wip-us.apache.org/repos/asf/ignite/blob/ce3f20be/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java new file mode 100644 index 000..bf9b1c6 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java @@ -0,0 +1,213 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.distributed.dht; + +import java.util.HashMap; +import java.util.Map; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.apa
[29/41] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c001d472 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c001d472 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c001d472 Branch: refs/heads/ignite-1168 Commit: c001d47206ec4c63d757925742b7083854bd9c2f Parents: 00e61e5 2575cf3 Author: Anton Vinogradov Authored: Mon Sep 28 14:00:45 2015 +0300 Committer: Anton Vinogradov Committed: Mon Sep 28 14:00:45 2015 +0300 -- .../cache/IgniteDynamicCacheFilterTest.java | 150 +++ .../testsuites/IgniteCacheTestSuite4.java | 3 + 2 files changed, 153 insertions(+) --
[41/41] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a322c05 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a322c05 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a322c05 Branch: refs/heads/ignite-1168 Commit: 3a322c0556c054a291ee5c28e6e853e700587f3a Parents: 6acba08 7402918 Author: Andrey Authored: Wed Sep 30 10:01:28 2015 +0700 Committer: Andrey Committed: Wed Sep 30 10:01:28 2015 +0700 -- .../cache/GridCacheExplicitLockSpan.java| 13 +- .../cache/GridCacheMvccCandidate.java | 5 +- .../processors/cache/GridCacheMvccManager.java | 47 ++-- .../distributed/GridDistributedCacheEntry.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java| 12 +- .../colocated/GridDhtColocatedLockFuture.java | 16 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../cache/local/GridLocalCacheEntry.java| 2 +- .../ignite/internal/util/GridArgumentCheck.java | 5 +- .../processors/cache/CrossCacheLockTest.java| 142 + .../GridCacheFinishPartitionsSelfTest.java | 5 +- .../IgniteCacheCreatePutMultiNodeSelfTest.java | 151 + .../IgniteCrossCacheTxNearEnabledSelfTest.java | 28 +++ .../dht/IgniteCrossCacheTxSelfTest.java | 213 +++ .../testsuites/IgniteCacheTestSuite4.java | 7 + .../processors/query/h2/sql/GridSqlArray.java | 52 + .../processors/query/h2/sql/GridSqlElement.java | 2 +- .../query/h2/sql/GridSqlFunction.java | 60 -- .../query/h2/sql/GridSqlFunctionType.java | 3 + .../query/h2/sql/GridSqlPlaceholder.java| 7 +- .../query/h2/sql/GridSqlQueryParser.java| 84 +--- .../processors/query/h2/sql/GridSqlType.java| 29 ++- .../query/h2/sql/GridQueryParsingTest.java | 27 +++ 24 files changed, 798 insertions(+), 118 deletions(-) --
[34/41] ignite git commit: Merge branches 'ignite-1168' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168
Merge branches 'ignite-1168' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/66b91b9a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/66b91b9a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/66b91b9a Branch: refs/heads/ignite-1168 Commit: 66b91b9af6fcfe04a6de2874b375d8f7c51ec693 Parents: 124c492 e5c3ca3 Author: Andrey Authored: Tue Sep 29 09:23:49 2015 +0700 Committer: Andrey Committed: Tue Sep 29 09:23:49 2015 +0700 -- bin/igniterouter.bat| 2 +- bin/igniterouter.sh | 2 +- examples/schema-import/pom.xml | 10 +- .../computegrid/ComputeClosureExample.java | 2 +- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/GridDiscoveryManager.java | 2 +- .../cache/DynamicCacheChangeRequest.java| 19 + .../cache/DynamicCacheDescriptor.java | 29 +- .../GridCachePartitionExchangeManager.java | 26 +- .../processors/cache/GridCacheProcessor.java| 33 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + .../near/GridNearTxFinishFuture.java| 4 +- .../cache/distributed/near/GridNearTxLocal.java | 19 +- .../continuous/CacheContinuousQueryHandler.java | 10 +- .../continuous/CacheContinuousQueryManager.java | 66 ++- .../transactions/IgniteTxLocalAdapter.java | 35 +- .../continuous/GridContinuousProcessor.java | 20 +- .../datastructures/DataStructuresProcessor.java | 6 +- .../internal/processors/igfs/IgfsImpl.java | 87 +--- .../processors/igfs/IgfsMetaManager.java| 193 - .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 398 +-- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++--- .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../internal/GridUpdateNotifierSelfTest.java| 1 + .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheVariableTopologySelfTest.java | 3 +- .../cache/IgniteDynamicCacheFilterTest.java | 150 +++ .../IgniteTxExceptionAbstractSelfTest.java | 3 + ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 - ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 - ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 +- ...nedQueueFailoverDataConsistencySelfTest.java | 5 - .../distributed/CacheAffEarlySelfTest.java | 245 .../distributed/CacheAffinityEarlyTest.java | 168 .../IgniteTxPreloadAbstractTest.java| 43 +- .../GridCacheColocatedTxExceptionSelfTest.java | 5 - ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/GridCacheNearTxExceptionSelfTest.java | 5 - .../near/NearCacheMultithreadedUpdateTest.java | 217 ++ .../GridCacheReplicatedInvalidateSelfTest.java | 249 .../GridCacheReplicatedTxExceptionSelfTest.java | 5 - .../replicated/GridReplicatedTxPreloadTest.java | 2 - ...eCacheExpiryPolicyWithStoreAbstractTest.java | 5 +- .../GridCacheLocalTxExceptionSelfTest.java | 5 - ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 ++ .../processors/igfs/IgfsAbstractSelfTest.java | 201 +++--- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 ++--- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++- .../multijvm/IgniteCacheProcessProxy.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 28 +- .../testsuites/IgniteCacheTestSuite3.java | 2 - .../testsuites/IgniteCacheTestSuite4.java | 12 + .../testsuites/IgniteHadoopTestSuite.java | 19 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- pom.xml | 27 +- 72 files changed, 2121 insertions(+), 1123 deletions(-) -
[40/41] ignite git commit: ignite-1168 Fixed after review.
ignite-1168 Fixed after review. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6acba08e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6acba08e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6acba08e Branch: refs/heads/ignite-1168 Commit: 6acba08e07b581eb5066f0a03c31ef29e4723773 Parents: 66b91b9 Author: Andrey Authored: Wed Sep 30 10:01:15 2015 +0700 Committer: Andrey Committed: Wed Sep 30 10:01:15 2015 +0700 -- .../JettyRestProcessorAbstractSelfTest.java | 160 ++- .../discovery/GridDiscoveryManager.java | 29 ++-- .../processors/cache/GridCacheProcessor.java| 8 +- .../handlers/cache/GridCacheCommandHandler.java | 40 - .../top/GridTopologyCommandHandler.java | 22 ++- 5 files changed, 223 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6acba08e/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index cc28536..9aa10b7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -24,6 +24,7 @@ import java.io.Serializable; import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -31,15 +32,24 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; +import net.sf.json.JSONNull; import net.sf.json.JSONObject; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; +import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.internal.processors.cache.GridCacheProcessor; +import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; +import org.apache.ignite.internal.processors.cache.IgniteInternalCache; +import org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetadata; +import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata; import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.lang.IgniteBiPredicate; +import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.testframework.GridTestUtils; import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; @@ -901,10 +911,16 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro } /** + * @param meta Metadata for Ignite cache. * @throws Exception If failed. */ -public void testMetadata() throws Exception { -String ret = content(F.asMap("cmd", GridRestCommand.CACHE_METADATA.key())); +private void testMetadata(GridCacheSqlMetadata meta) throws Exception { +Map params = F.asMap("cmd", GridRestCommand.CACHE_METADATA.key()); + +if (meta.cacheName() != null) +params.put("cacheName", meta.cacheName()); + +String ret = content(params); assertNotNull(ret); assertTrue(!ret.isEmpty()); @@ -912,6 +928,86 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro info("Cache metadata result: " + ret); jsonEquals(ret, pattern("\\{.+\\}", true)); + +Map res = (Map)JSONObject.fromObject(ret).get("response"); + +Collection types = (Collection)res.get("types"); + +assertNotNull(types); +assertEqualsCollections(meta.types(), types); + +Map keyClasses = (Map)res.get("keyClasses"); + +assertNotNull(keyClasses); +assertTrue(meta.keyClasses().equals(keyClasses)); + +Map valClasses = (Map)res.get("valClasses"); + +assertNotNull(valClasses); +assertTrue(meta.valClasses().equals(valClasses)); + +Map fields = (Map)res.get("fields"); + +assertNotNull(fields); +assertTrue(meta.fields().equals(fields)); + +Map indexesByType = (Map)res.get("indexes"); + +assertNotNull(
[28/41] ignite git commit: IGNITE-1557
IGNITE-1557 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00e61e52 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00e61e52 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00e61e52 Branch: refs/heads/ignite-1168 Commit: 00e61e52678aefc2fcad0179fb3e05b46265b102 Parents: 8fea96e Author: Anton Vinogradov Authored: Mon Sep 28 14:00:23 2015 +0300 Committer: Anton Vinogradov Committed: Mon Sep 28 14:00:23 2015 +0300 -- pom.xml | 16 1 file changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/00e61e52/pom.xml -- diff --git a/pom.xml b/pom.xml index fad8807..5194a72 100644 --- a/pom.xml +++ b/pom.xml @@ -897,6 +897,22 @@ + + +org.apache.maven.plugins +maven-remote-resources-plugin + + +ignite-dependencies + +process + + + true + + + +
[35/41] ignite git commit: ignite-1279 Fixed mvcc code to use IgniteTxKey instead of KeyCacheObject
ignite-1279 Fixed mvcc code to use IgniteTxKey instead of KeyCacheObject Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c6bb01b4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c6bb01b4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c6bb01b4 Branch: refs/heads/ignite-1168 Commit: c6bb01b49cfef14310355148c4937aab8489da13 Parents: e5c3ca3 Author: sboikov Authored: Tue Sep 29 09:20:25 2015 +0300 Committer: sboikov Committed: Tue Sep 29 09:20:25 2015 +0300 -- .../cache/GridCacheExplicitLockSpan.java| 13 +- .../cache/GridCacheMvccCandidate.java | 5 +- .../processors/cache/GridCacheMvccManager.java | 47 +++--- .../distributed/GridDistributedCacheEntry.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java| 12 +- .../colocated/GridDhtColocatedLockFuture.java | 16 ++- .../dht/preloader/GridDhtPreloader.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../cache/local/GridLocalCacheEntry.java| 2 +- .../processors/cache/CrossCacheLockTest.java| 142 +++ .../GridCacheFinishPartitionsSelfTest.java | 5 +- .../testsuites/IgniteCacheTestSuite4.java | 3 + 12 files changed, 201 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c6bb01b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java index 2261c7d..df32e77 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.concurrent.locks.ReentrantLock; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.tostring.GridToStringExclude; @@ -46,7 +47,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock { /** Pending candidates. */ @GridToStringInclude -private final Map> cands = new HashMap<>(); +private final Map> cands = new HashMap<>(); /** Span lock release future. */ @GridToStringExclude @@ -77,7 +78,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock { if (cands.isEmpty()) return false; -assert this.topVer.equals(this.topVer); +assert this.topVer.equals(topVer); Deque deque = ensureDeque(cand.key()); @@ -137,7 +138,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock { * @param ver Version (or {@code null} if any candidate should be removed.) * @return Removed candidate if matches given parameters. */ -public GridCacheMvccCandidate removeCandidate(KeyCacheObject key, @Nullable GridCacheVersion ver) { +public GridCacheMvccCandidate removeCandidate(IgniteTxKey key, @Nullable GridCacheVersion ver) { lock(); try { @@ -187,7 +188,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock { * * @param key Key. */ -public void markOwned(KeyCacheObject key) { +public void markOwned(IgniteTxKey key) { lock(); try { @@ -210,7 +211,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock { * @param ver Version to lookup (if {@code null} - return any). * @return Last added explicit lock candidate, if any, or {@code null}. */ -@Nullable public GridCacheMvccCandidate candidate(KeyCacheObject key, @Nullable final GridCacheVersion ver) { +@Nullable public GridCacheMvccCandidate candidate(IgniteTxKey key, @Nullable final GridCacheVersion ver) { lock(); try { @@ -257,7 +258,7 @@ public class GridCacheExplicitLockSpan extends ReentrantLock { * @param key Key to look up. * @return Deque. */ -private Deque ensureDeque(KeyCacheObject key) { +private Deque ensureDeque(IgniteTxKey key) { Deque deque = cands.get(key); if (deque == null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/c6bb01b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/G
[24/41] ignite git commit: IGNITE-257 - Fixed and uncommented tests.
IGNITE-257 - Fixed and uncommented tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cdc5b49f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cdc5b49f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cdc5b49f Branch: refs/heads/ignite-1168 Commit: cdc5b49f31973d4c973dc465f7c01ce2eb4c8c89 Parents: 343191b Author: Alexey Goncharuk Authored: Fri Sep 25 17:58:51 2015 -0700 Committer: Alexey Goncharuk Committed: Fri Sep 25 17:58:51 2015 -0700 -- .../near/GridNearTxFinishFuture.java| 4 +-- .../cache/distributed/near/GridNearTxLocal.java | 19 +-- .../transactions/IgniteTxLocalAdapter.java | 35 ++-- .../IgniteTxExceptionAbstractSelfTest.java | 3 ++ .../GridCacheColocatedTxExceptionSelfTest.java | 5 --- .../near/GridCacheNearTxExceptionSelfTest.java | 5 --- .../GridCacheReplicatedTxExceptionSelfTest.java | 5 --- .../GridCacheLocalTxExceptionSelfTest.java | 5 --- 8 files changed, 47 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/cdc5b49f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index ab6dc3c..85311cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -268,7 +268,7 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu if (tx.onePhaseCommit()) { finishOnePhase(); -tx.tmFinish(err == null); +tx.tmFinish(commit && err == null); } Throwable th = this.err.get(); @@ -333,7 +333,7 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu * Initializes future. */ void finish() { -if (tx.needCheckBackup()) { +if (tx.onNeedCheckBackup()) { assert tx.onePhaseCommit(); checkBackup(); http://git-wip-us.apache.org/repos/asf/ignite/blob/cdc5b49f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java index a4e06c3..8975b4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java @@ -114,7 +114,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { private Map accessMap; /** */ -private boolean needCheckBackup; +private Boolean needCheckBackup; /** */ private boolean hasRemoteLocks; @@ -255,8 +255,23 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { /** * @return If need to check tx commit on backup. */ +public boolean onNeedCheckBackup() { +Boolean check = needCheckBackup; + +if (check != null && check) { +needCheckBackup = false; + +return true; +} + +return false; +} + +/** + * @return If backup check was requested. + */ public boolean needCheckBackup() { -return needCheckBackup; +return needCheckBackup != null; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/cdc5b49f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 6ca1f72..aa0ffe8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -1120,11 +1120,13 @@ public abstract class I
[39/41] ignite git commit: IGNITE-1552 - Fixed parsing for SQL table function
IGNITE-1552 - Fixed parsing for SQL table function Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74029187 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74029187 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74029187 Branch: refs/heads/ignite-1168 Commit: 740291871013bef818edf3faf19c8d4c6eab1ba5 Parents: c2cedb0 Author: S.Vladykin Authored: Tue Sep 29 17:04:52 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Sep 29 17:04:52 2015 -0700 -- .../processors/query/h2/sql/GridSqlArray.java | 52 .../processors/query/h2/sql/GridSqlElement.java | 2 +- .../query/h2/sql/GridSqlFunction.java | 60 -- .../query/h2/sql/GridSqlFunctionType.java | 3 + .../query/h2/sql/GridSqlPlaceholder.java| 7 +- .../query/h2/sql/GridSqlQueryParser.java| 84 .../processors/query/h2/sql/GridSqlType.java| 29 ++- .../query/h2/sql/GridQueryParsingTest.java | 27 +++ 8 files changed, 199 insertions(+), 65 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java new file mode 100644 index 000..69e98bf --- /dev/null +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlArray.java @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.query.h2.sql; + +import java.util.ArrayList; +import java.util.Collections; +import org.h2.util.StatementBuilder; + +/** + * SQL Array: (1, 2, ?, 'abc') + */ +public class GridSqlArray extends GridSqlElement { +/** + * @param size Array size. + */ +public GridSqlArray(int size) { +super(size == 0 ? Collections.emptyList() : new ArrayList(size)); +} + +/** {@inheritDoc} */ +@Override public String getSQL() { +if (size() == 0) +return "()"; + +StatementBuilder buff = new StatementBuilder("("); + +for (GridSqlElement e : children) { +buff.appendExceptFirst(", "); +buff.append(e.getSQL()); +} + +if (size() == 1) +buff.append(','); + +return buff.append(')').toString(); +} +} http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java index 41b7ba4..57d3c57 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.java @@ -25,7 +25,7 @@ import java.util.List; */ public abstract class GridSqlElement implements Iterable { /** */ -protected List children; +protected final List children; /** */ private GridSqlType resultType; http://git-wip-us.apache.org/repos/asf/ignite/blob/74029187/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java index 51433c0..7cd7a6b 100644 ---
ignite git commit: ignite-843 Fixed popover hide on validation.
Repository: ignite Updated Branches: refs/heads/ignite-843 2783ec70a -> dbb629304 ignite-843 Fixed popover hide on validation. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dbb62930 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dbb62930 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dbb62930 Branch: refs/heads/ignite-843 Commit: dbb629304a0934761d75735bfd5aed6b3b30c791 Parents: 2783ec7 Author: Andrey Authored: Wed Sep 30 13:01:01 2015 +0700 Committer: Andrey Committed: Wed Sep 30 13:01:01 2015 +0700 -- .../control-center-web/src/main/js/controllers/common-module.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dbb62930/modules/control-center-web/src/main/js/controllers/common-module.js -- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index b88f2e4..3024f36 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -505,9 +505,9 @@ consoleModule.service('$common', [ popover = newPopover; -newPopover.$promise.then(newPopover.show); +$timeout(function () { newPopover.$promise.then(newPopover.show); }); -$timeout(function () { newPopover.hide() }, 5000); +$timeout(function () { newPopover.hide(); }, 5000); return false; }
ignite git commit: Disable shmem in failover tests to avoid ignite-1578.
Repository: ignite Updated Branches: refs/heads/master 740291871 -> bfabab2d0 Disable shmem in failover tests to avoid ignite-1578. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bfabab2d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bfabab2d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bfabab2d Branch: refs/heads/master Commit: bfabab2d0ee22808eef8a597b4b82dd84e5a2c87 Parents: 7402918 Author: sboikov Authored: Wed Sep 30 09:19:28 2015 +0300 Committer: sboikov Committed: Wed Sep 30 09:26:21 2015 +0300 -- .../GridCacheAbstractFailoverSelfTest.java | 3 ++ .../GridCacheAbstractRemoveFailureTest.java | 3 ++ .../cache/IgniteCacheCreateRestartSelfTest.java | 3 ++ ...acheAsyncOperationsFailoverAbstractTest.java | 11 .../CachePutAllFailoverAbstractTest.java| 11 .../IgniteCachePutGetRestartAbstractTest.java | 3 ++ .../IgniteCacheSizeFailoverTest.java| 3 ++ ...gniteAtomicLongChangingTopologySelfTest.java | 29 +++- .../IgniteCacheCrossCacheTxFailoverTest.java| 3 ++ 9 files changed, 50 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/bfabab2d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java index e55803a..f4813ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java @@ -33,6 +33,7 @@ import org.apache.ignite.internal.util.typedef.CIX1; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.TransactionConcurrency; @@ -86,6 +87,8 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac discoSpi.setHeartbeatFrequency(30_000); discoSpi.setReconnectCount(2); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/bfabab2d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index a3d9948..122910e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -41,6 +41,7 @@ import org.apache.ignite.internal.util.lang.GridTuple; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -92,6 +93,8 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/bfabab2d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCreateRestartSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCreateRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCreateRestartSelfTest.java index 0a2d778..6f32d36 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/pr
ignite git commit: More info in assert.
Repository: ignite Updated Branches: refs/heads/master bfabab2d0 -> be906e32f More info in assert. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/be906e32 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be906e32 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be906e32 Branch: refs/heads/master Commit: be906e32f68d35e01f0b0e5f610937a27277f71a Parents: bfabab2 Author: sboikov Authored: Wed Sep 30 09:29:38 2015 +0300 Committer: sboikov Committed: Wed Sep 30 09:29:38 2015 +0300 -- .../ignite/internal/util/nio/GridNioRecoveryDescriptor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/be906e32/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java index 42656c4..88837de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java @@ -259,8 +259,8 @@ public class GridNioRecoveryDescriptor { */ public void connected() { synchronized (this) { -assert reserved; -assert !connected; +assert reserved : this; +assert !connected : this; connected = true;