Merge remote-tracking branch 'remotes/origin/master' into ignite-5075 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f2313ec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f2313ec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f2313ec Branch: refs/heads/ignite-5075 Commit: 9f2313ecb141b72adb73e3be75f02b1af9477b63 Parents: 3e4654c 6be8d97 Author: sboikov <sboi...@gridgain.com> Authored: Thu May 18 15:45:21 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu May 18 15:45:21 2017 +0300 ---------------------------------------------------------------------- .../internal/ComputeTaskInternalFuture.java | 3 - .../cache/CacheStoreBalancingWrapper.java | 3 - .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheContext.java | 22 +-- .../cache/GridCacheDeploymentManager.java | 2 +- .../cache/GridCacheFutureAdapter.java | 1 + .../processors/cache/GridCacheLogger.java | 2 +- .../cache/GridCacheMultiTxFuture.java | 3 - .../processors/cache/GridCacheMvccManager.java | 3 - .../GridCachePartitionExchangeManager.java | 3 - .../processors/cache/GridCacheUtils.java | 146 +------------------ .../distributed/dht/GridDhtCacheAdapter.java | 3 - .../distributed/dht/GridDhtEmbeddedFuture.java | 3 - .../distributed/dht/GridDhtGetSingleFuture.java | 3 - .../distributed/dht/GridDhtTxFinishFuture.java | 3 - .../dht/preloader/GridDhtForceKeysFuture.java | 7 +- .../distributed/near/GridNearGetFuture.java | 3 - .../distributed/near/GridNearLockFuture.java | 3 - .../cache/query/GridCacheQueryManager.java | 18 +-- .../store/GridCacheStoreManagerAdapter.java | 4 +- .../continuous/GridContinuousProcessor.java | 3 - .../datastreamer/DataStreamerFuture.java | 3 - .../processors/igfs/IgfsDataManager.java | 3 - .../marshaller/MarshallerMappingTransport.java | 3 - .../service/GridServiceDeploymentFuture.java | 3 - .../util/future/GridEmbeddedFuture.java | 3 - .../util/nio/GridNioEmbeddedFuture.java | 3 - .../internal/util/nio/GridNioFutureImpl.java | 3 - .../ignite/internal/util/nio/GridNioServer.java | 3 - .../internal/util/worker/GridWorkerFuture.java | 3 - .../communication/tcp/TcpCommunicationSpi.java | 3 - .../cache/GridCacheP2PUndeploySelfTest.java | 12 -- .../hadoop/impl/igfs/HadoopIgfsFuture.java | 3 - .../external/HadoopExternalTaskExecutor.java | 3 - .../query/h2/DmlStatementsProcessor.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 4 +- .../processors/schedule/ScheduleFutureImpl.java | 2 +- 38 files changed, 30 insertions(+), 274 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f2313ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f2313ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f2313ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f2313ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f2313ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f2313ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f2313ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f2313ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ----------------------------------------------------------------------
