Merge branches 'ignite-855' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-855
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/91b2764c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/91b2764c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/91b2764c Branch: refs/heads/ignite-478 Commit: 91b2764c781fadf5ef1f1cff9877b9d6b3d6ea8b Parents: 733f30e a452dac Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed May 6 14:31:20 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed May 6 14:31:20 2015 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 4 +- .../communication/GridIoMessageFactory.java | 4 +- .../cache/DynamicCacheDescriptor.java | 16 +- .../processors/cache/GridCacheAdapter.java | 511 +++++++++--------- .../processors/cache/GridCacheProcessor.java | 189 ++++--- ...ridCacheOptimisticCheckPreparedTxFuture.java | 434 --------------- ...idCacheOptimisticCheckPreparedTxRequest.java | 232 -------- ...dCacheOptimisticCheckPreparedTxResponse.java | 179 ------- .../distributed/GridCacheTxRecoveryFuture.java | 506 ++++++++++++++++++ .../distributed/GridCacheTxRecoveryRequest.java | 261 +++++++++ .../GridCacheTxRecoveryResponse.java | 182 +++++++ .../GridDistributedTxRemoteAdapter.java | 2 +- .../cache/transactions/IgniteInternalTx.java | 5 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 38 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 173 ++---- .../processors/igfs/IgfsDataManager.java | 3 + .../processors/igfs/IgfsMetaManager.java | 2 +- .../resources/META-INF/classnames.properties | 12 +- .../processors/cache/CacheGetFromJobTest.java | 110 ++++ .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../GridCacheAbstractNodeRestartSelfTest.java | 94 ++-- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 ++ ...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 ++ ...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 ++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 +++++++++++++++++++ .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + .../igfs/IgfsClientCacheSelfTest.java | 132 +++++ .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../testsuites/IgniteCacheRestartTestSuite.java | 5 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 - .../IgniteCacheTxRecoverySelfTestSuite.java | 4 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 + 37 files changed, 2364 insertions(+), 1393 deletions(-) ----------------------------------------------------------------------
