Merge gg-9655 changes into ignite sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c4ffc84d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4ffc84d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4ffc84d Branch: refs/heads/sprint-1-start-nodes Commit: c4ffc84d6b223daef100d54b795fbd69ebb3e7d6 Parents: a8573b4 90e38c1 Author: Alexey Goncharuk <[email protected]> Authored: Sun Feb 15 00:08:54 2015 -0800 Committer: Alexey Goncharuk <[email protected]> Committed: Sun Feb 15 00:08:54 2015 -0800 ---------------------------------------------------------------------- .../datagrid/CacheDataLoaderExample.java | 1 - .../CommunicationMessageCodeGenerator.java | 24 + .../org/apache/ignite/IgniteDataLoader.java | 22 +- .../communication/GridIoMessageFactory.java | 10 - .../affinity/GridAffinityProcessor.java | 36 +- .../processors/cache/CacheMetricsImpl.java | 8 +- .../processors/cache/GridCacheAdapter.java | 35 +- .../processors/cache/GridCacheContext.java | 30 +- .../processors/cache/GridCacheEntryInfo.java | 9 + .../processors/cache/GridCacheMapEntry.java | 159 ++--- .../processors/cache/GridCacheMvcc.java | 8 +- .../cache/GridCacheMvccCandidate.java | 18 - .../processors/cache/GridCacheReturn.java | 57 ++ .../cache/GridCacheSharedContext.java | 2 + .../processors/cache/GridCacheUtils.java | 15 - .../distributed/GridCacheCommittedTxInfo.java | 2 - .../GridCachePerThreadTxCommitBuffer.java | 186 ----- ...dCachePessimisticCheckCommittedTxFuture.java | 383 ----------- ...CachePessimisticCheckCommittedTxRequest.java | 309 --------- ...achePessimisticCheckCommittedTxResponse.java | 253 ------- .../distributed/GridCacheTxCommitBuffer.java | 60 -- .../distributed/GridDistributedLockRequest.java | 163 +---- .../GridDistributedTxFinishRequest.java | 148 +--- .../distributed/GridDistributedTxMapping.java | 6 +- .../GridDistributedTxPrepareRequest.java | 62 +- .../GridDistributedTxRemoteAdapter.java | 58 +- .../distributed/dht/GridDhtCacheEntry.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 156 +---- .../distributed/dht/GridDhtLockRequest.java | 42 +- .../dht/GridDhtTransactionalCacheAdapter.java | 20 +- .../distributed/dht/GridDhtTxFinishFuture.java | 44 +- .../distributed/dht/GridDhtTxFinishRequest.java | 227 +----- .../cache/distributed/dht/GridDhtTxLocal.java | 56 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 109 +-- .../distributed/dht/GridDhtTxPrepareFuture.java | 654 ++++++++++++------ .../dht/GridDhtTxPrepareRequest.java | 52 +- .../dht/GridDhtTxPrepareResponse.java | 2 + .../cache/distributed/dht/GridDhtTxRemote.java | 12 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 41 -- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearLockFuture.java | 8 - .../distributed/near/GridNearLockRequest.java | 59 +- .../near/GridNearTransactionalCache.java | 3 +- .../near/GridNearTxFinishFuture.java | 2 - .../near/GridNearTxFinishRequest.java | 30 +- .../cache/distributed/near/GridNearTxLocal.java | 68 +- .../near/GridNearTxPrepareFuture.java | 421 ++++++++---- .../near/GridNearTxPrepareRequest.java | 92 ++- .../near/GridNearTxPrepareResponse.java | 111 ++- .../cache/transactions/IgniteInternalTx.java | 7 - .../cache/transactions/IgniteTxAdapter.java | 60 +- .../cache/transactions/IgniteTxEntry.java | 17 - .../cache/transactions/IgniteTxHandler.java | 688 ++++--------------- .../transactions/IgniteTxLocalAdapter.java | 260 +++---- .../cache/transactions/IgniteTxLocalEx.java | 5 + .../cache/transactions/IgniteTxManager.java | 210 ++---- .../cache/transactions/IgniteTxProxyImpl.java | 14 +- .../dataload/IgniteDataLoaderImpl.java | 101 ++- .../util/GridBoundedConcurrentOrderedMap.java | 20 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 171 +++-- .../cache/GridCacheAbstractMetricsSelfTest.java | 4 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheBasicStoreAbstractTest.java | 3 +- .../processors/cache/GridCacheTestStore.java | 16 +- .../cache/IgniteCacheInvokeAbstractTest.java | 6 +- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +- .../IgniteClientAffinityAssignmentSelfTest.java | 164 +++++ .../cache/IgnitePutAllLargeBatchSelfTest.java | 301 ++++++++ ...tAllUpdateNonPreloadedPartitionSelfTest.java | 129 ++++ .../IgniteTxExceptionAbstractSelfTest.java | 37 +- .../GridCacheAbstractJobExecutionTest.java | 13 +- .../distributed/GridCacheEventAbstractTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 29 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 2 +- .../near/GridCacheNearMetricsSelfTest.java | 8 +- .../near/GridCacheNearReadersSelfTest.java | 2 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 2 +- ...eReplicatedGetAndTransformStoreSelfTest.java | 8 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 5 +- ...heConcurrentEvictionConsistencySelfTest.java | 8 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 6 +- ...iteCacheNoLoadPreviousValueAbstractTest.java | 5 +- .../GridDataLoaderProcessorSelfTest.java | 95 ++- .../testsuites/IgniteCacheRestartTestSuite.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 17 +- 86 files changed, 2908 insertions(+), 3808 deletions(-) ----------------------------------------------------------------------
