Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4fa85a18 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4fa85a18 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4fa85a18 Branch: refs/heads/ignite-2324 Commit: 4fa85a1855e7ffe13e9a97a5f92d40c8f0ca35a4 Parents: 58c6909 7a31e4f Author: Denis Magda <[email protected]> Authored: Thu Jan 21 12:45:20 2016 +0300 Committer: Denis Magda <[email protected]> Committed: Thu Jan 21 12:45:20 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMvccManager.java | 43 ++- .../processors/cache/GridCacheProcessor.java | 18 ++ .../distributed/GridCacheTxRecoveryFuture.java | 2 +- .../dht/CacheDistributedGetFutureAdapter.java | 2 +- .../cache/distributed/dht/GridDhtGetFuture.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../distributed/near/GridNearLockFuture.java | 2 +- ...arOptimisticSerializableTxPrepareFuture.java | 47 ++- .../GridNearPessimisticTxPrepareFuture.java | 6 +- .../near/GridNearTxFinishFuture.java | 29 +- .../processors/cluster/ClusterProcessor.java | 37 ++- .../processors/query/GridQueryProcessor.java | 7 +- .../service/GridServiceProcessor.java | 17 +- .../util/future/GridCompoundFuture.java | 314 +++++-------------- .../util/future/GridCompoundIdentityFuture.java | 6 +- .../internal/util/future/GridFutureAdapter.java | 2 + .../ignite/internal/visor/cache/VisorCache.java | 63 ++-- .../visor/cache/VisorCacheConfiguration.java | 4 +- .../cache/VisorCacheQueryConfiguration.java | 31 +- .../cache/VisorCacheQueryConfigurationV2.java | 47 +++ .../cache/VisorCacheStoreConfiguration.java | 39 +-- .../cache/VisorCacheStoreConfigurationV2.java | 48 +++ .../internal/visor/cache/VisorCacheV2.java | 73 +++++ .../visor/node/VisorIgfsConfiguration.java | 32 +- .../visor/node/VisorNodeDataCollectorJob.java | 5 +- .../visor/node/VisorNodeDataCollectorTask.java | 2 +- .../resources/META-INF/classnames.properties | 15 +- .../ignite/testframework/GridTestUtils.java | 7 +- .../Cache/CacheAbstractTest.cs | 72 +++-- .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 2 +- .../Impl/Unmanaged/UnmanagedUtils.cs | 6 +- .../commands/cache/VisorCacheCommand.scala | 10 +- 34 files changed, 573 insertions(+), 423 deletions(-) ----------------------------------------------------------------------
