Merge branch 'ignite-1282' into ignite-gg-10760
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c8fd44d4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c8fd44d4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c8fd44d4 Branch: refs/heads/ignite-gg-10760 Commit: c8fd44d43062aadd79c3989dbfec91c45a2f4863 Parents: 4b84f73 d6f69c9 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Sep 15 15:50:53 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Sep 15 15:50:53 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 1 + examples/config/filesystem/README.txt | 2 +- examples/config/filesystem/example-igfs.xml | 7 - .../java/org/apache/ignite/IgnitePortables.java | 2 +- .../processors/cache/GridCacheAdapter.java | 21 +- .../processors/cache/GridCacheMapEntry.java | 15 +- .../processors/cache/GridCacheProcessor.java | 19 +- .../processors/cache/GridCacheSwapManager.java | 46 +++-- .../GridDistributedTxRemoteAdapter.java | 8 +- .../dht/GridDhtPartitionTopologyImpl.java | 9 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../near/GridNearOptimisticTxPrepareFuture.java | 3 + .../near/GridNearTxFinishFuture.java | 32 ++- .../cache/transactions/IgniteTxHandler.java | 9 +- .../processors/igfs/IgfsFileWorkerBatch.java | 15 +- .../util/offheap/GridOffHeapEvictListener.java | 2 +- .../util/offheap/GridOffHeapPartitionedMap.java | 1 + .../util/offheap/unsafe/GridUnsafeMap.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 7 +- .../GridCacheAbstractRemoveFailureTest.java | 199 +++++++++++++------ .../cache/GridCacheMemoryModeSelfTest.java | 9 +- .../cache/GridCachePutAllFailoverSelfTest.java | 60 ++++++ .../cache/IgniteCacheCreateRestartSelfTest.java | 106 ++++++++++ .../IgniteCacheEntryProcessorNodeJoinTest.java | 73 +++++++ .../GridCacheAbstractNodeRestartSelfTest.java | 149 ++++++++++++-- .../GridCacheDhtAtomicRemoveFailureTest.java | 16 +- .../dht/GridCacheDhtRemoveFailureTest.java | 16 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 2 +- .../IgniteCacheCrossCacheTxFailoverTest.java | 53 +++-- .../IgniteCachePutRetryAbstractSelfTest.java | 166 ++++++++++++++-- .../dht/IgniteCachePutRetryAtomicSelfTest.java | 2 + ...gniteCachePutRetryTransactionalSelfTest.java | 50 +++-- ...eAtomicInvalidPartitionHandlingSelfTest.java | 98 +++++++-- ...tomicPrimaryWriteOrderRemoveFailureTest.java | 15 +- .../GridCacheAtomicRemoveFailureTest.java | 15 +- .../GridCacheAtomicNearRemoveFailureTest.java | 15 +- ...cPrimaryWriteOrderNearRemoveFailureTest.java | 15 +- .../near/GridCacheNearRemoveFailureTest.java | 15 +- .../GridCachePartitionedNodeRestartTest.java | 9 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 9 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 8 +- .../processors/igfs/IgfsAbstractSelfTest.java | 60 +++--- .../igfs/IgfsDualAbstractSelfTest.java | 10 +- .../offheap/GridOffHeapMapAbstractSelfTest.java | 6 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 10 +- .../ignite/testframework/GridTestUtils.java | 117 +++++++++++ .../IgniteCacheFailoverTestSuite.java | 6 - .../IgniteCacheFailoverTestSuite3.java | 62 ++++++ .../testsuites/IgniteCacheRestartTestSuite.java | 15 +- .../IgniteCacheRestartTestSuite2.java | 47 +++++ .../hadoop/igfs/HadoopIgfsWrapper.java | 100 ++++++---- .../testsuites/IgniteHadoopTestSuite.java | 6 +- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 31 ++- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 - ...lientQueryReplicatedNodeRestartSelfTest.java | 8 +- .../IgniteCacheQueryNodeRestartSelfTest.java | 4 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 8 +- 57 files changed, 1400 insertions(+), 400 deletions(-) ----------------------------------------------------------------------
