Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1651dd0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1651dd0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1651dd0 Branch: refs/heads/ignite-1093-2 Commit: e1651dd034855650109e7504e32960c533950a8b Parents: eeb313c c001d47 Author: Anton Vinogradov <[email protected]> Authored: Mon Sep 28 14:13:55 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Mon Sep 28 14:13:55 2015 +0300 ---------------------------------------------------------------------- bin/igniterouter.bat | 2 +- bin/igniterouter.sh | 2 +- examples/schema-import/pom.xml | 10 +- .../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 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + .../near/GridNearTxFinishFuture.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 19 +- .../continuous/CacheContinuousQueryManager.java | 66 ++- .../transactions/IgniteTxLocalAdapter.java | 35 +- .../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 | 398 +++++++++++++------ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../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 +- .../IgniteCacheEntryListenerAbstractTest.java | 65 ++- .../cache/IgniteDynamicCacheFilterTest.java | 150 +++++++ .../IgniteTxExceptionAbstractSelfTest.java | 3 + ...nedQueueFailoverDataConsistencySelfTest.java | 5 - .../distributed/CacheAffEarlySelfTest.java | 245 ------------ .../distributed/CacheAffinityEarlyTest.java | 168 ++++++++ .../IgniteTxPreloadAbstractTest.java | 43 +- .../GridCacheColocatedTxExceptionSelfTest.java | 5 - .../IgniteCachePutRetryAbstractSelfTest.java | 33 ++ ...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 | 139 ++++++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++++++++++++++- .../multijvm/IgniteCacheProcessProxy.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 23 +- .../testsuites/IgniteCacheTestSuite3.java | 2 - .../testsuites/IgniteCacheTestSuite4.java | 12 + .../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 + pom.xml | 27 +- 79 files changed, 2456 insertions(+), 1214 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e1651dd0/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e1651dd0/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e1651dd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e1651dd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e1651dd0/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java ----------------------------------------------------------------------
