Merge remote-tracking branch 'remotes/origin/master' into ignite-1124
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43542dfe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43542dfe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43542dfe Branch: refs/heads/ignite-1124 Commit: 43542dfe035a192267376feae02defbebaef91af Parents: 336d192 3e30c86 Author: sboikov <[email protected]> Authored: Thu Aug 27 15:19:06 2015 +0300 Committer: sboikov <[email protected]> Committed: Thu Aug 27 15:19:06 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/IgniteInternalFuture.java | 10 + .../org/apache/ignite/internal/IgnitionEx.java | 23 +- .../internal/portable/PortableContext.java | 127 +-- .../processors/cache/GridCacheAdapter.java | 10 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../dht/atomic/GridDhtAtomicCache.java | 10 +- .../query/GridCacheQueryFutureAdapter.java | 7 + .../processors/igfs/IgfsMetaManager.java | 43 +- .../internal/processors/igfs/IgfsUtils.java | 52 ++ .../processors/platform/PlatformContext.java | 138 +++ .../platform/PlatformNoopProcessor.java | 5 + .../processors/platform/PlatformProcessor.java | 7 + .../callback/PlatformCallbackGateway.java | 869 +++++++++++++++++++ .../callback/PlatformCallbackUtils.java | 468 ++++++++++ .../platform/memory/PlatformInputStream.java | 30 + .../platform/memory/PlatformMemory.java | 77 ++ .../platform/memory/PlatformMemoryManager.java | 46 + .../platform/memory/PlatformOutputStream.java | 30 + .../util/future/GridEmbeddedFuture.java | 55 +- .../util/future/GridFinishedFuture.java | 5 + .../internal/util/future/GridFutureAdapter.java | 58 +- ...acheAsyncOperationsFailoverAbstractTest.java | 329 +++++++ .../CacheAsyncOperationsFailoverAtomicTest.java | 32 + .../CacheAsyncOperationsFailoverTxTest.java | 32 + .../distributed/CacheAsyncOperationsTest.java | 280 ++++++ .../testframework/junits/GridAbstractTest.java | 2 +- .../IgniteCacheFailoverTestSuite2.java | 4 + .../testsuites/IgniteCacheTestSuite3.java | 2 + .../platform/PlatformAbstractPredicate.java | 64 ++ .../processors/platform/PlatformBootstrap.java | 1 - .../processors/platform/PlatformContext.java | 114 --- .../callback/PlatformCallbackGateway.java | 869 ------------------- .../callback/PlatformCallbackUtils.java | 468 ---------- .../platform/cluster/PlatformClusterGroup.java | 330 +++++++ .../cluster/PlatformClusterNodeFilter.java | 77 ++ .../platform/memory/PlatformInputStream.java | 30 - .../platform/memory/PlatformMemory.java | 77 -- .../platform/memory/PlatformMemoryManager.java | 46 - .../platform/memory/PlatformOutputStream.java | 30 - .../platform/utils/PlatformUtils.java | 78 ++ scripts/apply-pull-request.sh | 2 + 41 files changed, 3199 insertions(+), 1744 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/43542dfe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ----------------------------------------------------------------------
