You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/17 15:04:54 UTC
[09/10] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4680-tmp
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4680-tmp
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae9737b4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae9737b4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae9737b4
Branch: refs/heads/ignite-4680-sb
Commit: ae9737b4293479a976bd11fe7169a2e78f0dd1e0
Parents: 3200c2e 9020d12
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 17 17:50:18 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 17 17:50:18 2017 +0300
----------------------------------------------------------------------
.../ClientAbstractMultiNodeSelfTest.java | 13 +-
.../ignite/internal/IgniteTransactionsEx.java | 8 +-
.../processors/cache/GridCacheAdapter.java | 98 +-
.../processors/cache/GridCacheProxyImpl.java | 6 +-
.../cache/GridCacheSharedContext.java | 11 +-
.../processors/cache/GridCacheUtils.java | 6 +-
.../processors/cache/IgniteInternalCache.java | 5 +-
.../distributed/GridCacheCommittedTxInfo.java | 117 -
.../GridDistributedCacheAdapter.java | 2 +-
.../GridDistributedTxRemoteAdapter.java | 59 +-
.../dht/GridDhtPartitionTopologyImpl.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 57 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 126 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 28 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 65 +-
.../dht/colocated/GridDhtColocatedCache.java | 8 +-
.../colocated/GridDhtColocatedLockFuture.java | 7 +-
.../distributed/near/GridNearLockFuture.java | 4 +-
.../distributed/near/GridNearLockRequest.java | 200 +-
.../near/GridNearTransactionalCache.java | 6 +-
.../near/GridNearTxFinishFuture.java | 4 +-
.../cache/distributed/near/GridNearTxLocal.java | 2732 ++++++++++++++++-
.../near/GridNearTxPrepareFutureAdapter.java | 5 +-
.../near/GridNearTxPrepareRequest.java | 2 +-
.../distributed/near/GridNearTxRemote.java | 4 +-
.../store/GridCacheStoreManagerAdapter.java | 142 +-
.../cache/transactions/IgniteInternalTx.java | 80 +-
.../transactions/IgniteTransactionsImpl.java | 12 +-
.../cache/transactions/IgniteTxAdapter.java | 165 +-
.../cache/transactions/IgniteTxEntry.java | 4 +-
.../cache/transactions/IgniteTxHandler.java | 67 +-
.../IgniteTxImplicitSingleStateImpl.java | 4 +-
.../transactions/IgniteTxLocalAdapter.java | 2801 ++----------------
.../cache/transactions/IgniteTxLocalEx.java | 145 +-
.../cache/transactions/IgniteTxManager.java | 293 +-
.../cache/transactions/IgniteTxRemoteEx.java | 11 +
.../IgniteTxRemoteStateAdapter.java | 2 +-
.../cache/transactions/IgniteTxState.java | 2 +-
.../cache/transactions/IgniteTxStateImpl.java | 4 +-
.../transactions/TransactionProxyImpl.java | 13 +-
.../datastructures/DataStructuresProcessor.java | 32 +-
.../datastructures/GridCacheAtomicLongImpl.java | 18 +-
.../GridCacheAtomicReferenceImpl.java | 6 +-
.../GridCacheAtomicSequenceImpl.java | 4 +-
.../GridCacheAtomicStampedImpl.java | 6 +-
.../GridCacheCountDownLatchImpl.java | 6 +-
.../datastructures/GridCacheLockImpl.java | 11 +-
.../datastructures/GridCacheSemaphoreImpl.java | 18 +-
.../GridTransactionalCacheQueueImpl.java | 10 +-
.../processors/igfs/IgfsDataManager.java | 55 +-
.../processors/igfs/IgfsMetaManager.java | 73 +-
.../service/GridServiceProcessor.java | 6 +-
.../internal/TestRecordingCommunicationSpi.java | 29 +
.../processors/cache/GridCacheTestStore.java | 2 -
.../cache/IgniteTxConfigCacheSelfTest.java | 4 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 7 +-
.../IgniteTxCachePrimarySyncTest.java | 5 +
...xOriginatingNodeFailureAbstractSelfTest.java | 6 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 4 +-
...ePrimaryNodeFailureRecoveryAbstractTest.java | 9 +-
.../dht/IgniteCacheTxRecoveryRollbackTest.java | 501 ++++
.../GridCachePartitionedTxSalvageSelfTest.java | 7 +-
.../TxOptimisticDeadlockDetectionTest.java | 30 +-
...lockMessageSystemPoolStarvationSelfTest.java | 6 +-
.../IgniteCacheRestartTestSuite2.java | 3 +-
.../IgniteCacheTxRecoverySelfTestSuite.java | 3 +
.../apache/ignite/util/GridRandomSelfTest.java | 17 -
.../HibernateReadWriteAccessStrategy.java | 12 +-
.../processors/cache/jta/CacheJtaManager.java | 3 +-
.../processors/cache/jta/CacheJtaResource.java | 8 +-
.../Plugin/PluginTest.cs | 24 +
.../Impl/Plugin/PluginContext.cs | 9 +
.../Apache.Ignite.Core/Plugin/IPluginContext.cs | 8 +
73 files changed, 4191 insertions(+), 4073 deletions(-)
----------------------------------------------------------------------