Merge branch 'ignite-2.0' into ignite-4565-ddl
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70a11912 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70a11912 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70a11912 Branch: refs/heads/ignite-4565-ddl Commit: 70a11912b34157a5e1b3275d3087052d133394b4 Parents: 636048f 9020d12 Author: devozerov <[email protected]> Authored: Fri Mar 17 17:49:40 2017 +0300 Committer: devozerov <[email protected]> Committed: Fri Mar 17 17:49:40 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 +- .../platform/PlatformAbstractTarget.java | 8 + .../platform/PlatformAsyncResult.java | 41 + .../platform/PlatformContextImpl.java | 10 +- .../processors/platform/PlatformTarget.java | 10 + .../platform/PlatformTargetProxy.java | 9 + .../platform/PlatformTargetProxyImpl.java | 39 + .../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 +- .../platform/PlatformComputeEchoTask.java | 6 + .../plugin/PlatformTestPluginTarget.java | 89 +- .../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 +- .../cpp/jni/include/ignite/jni/exports.h | 1 + .../platforms/cpp/jni/include/ignite/jni/java.h | 2 + modules/platforms/cpp/jni/project/vs/module.def | 1 + modules/platforms/cpp/jni/src/exports.cpp | 4 + modules/platforms/cpp/jni/src/java.cpp | 10 + .../Binary/BinaryReaderWriterTest.cs | 8 + .../Compute/ComputeApiTest.cs | 19 + .../ConsoleRedirectTest.cs | 2 +- .../Plugin/PluginTest.cs | 41 + .../Apache.Ignite.Core/Common/IgniteGuid.cs | 47 +- .../Apache.Ignite.Core/Events/CacheEvent.cs | 2 +- .../Apache.Ignite.Core/Events/EventBase.cs | 4 +- .../Apache.Ignite.Core/Events/JobEvent.cs | 4 +- .../Apache.Ignite.Core/Events/TaskEvent.cs | 2 +- .../Impl/Binary/BinaryReader.cs | 4 +- .../Impl/Binary/BinarySystemHandlers.cs | 2 +- .../Impl/Binary/BinaryUtils.cs | 11 +- .../Impl/Binary/Marshaller.cs | 4 +- .../Apache.Ignite.Core/Impl/PlatformTarget.cs | 29 + .../Impl/Plugin/PluginContext.cs | 9 + .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 3 + .../Impl/Unmanaged/UnmanagedUtils.cs | 5 + .../Interop/IPlatformTarget.cs | 13 + .../Apache.Ignite.Core/Plugin/IPluginContext.cs | 8 + 102 files changed, 4557 insertions(+), 4113 deletions(-) ----------------------------------------------------------------------
