Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c87dcaef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c87dcaef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c87dcaef Branch: refs/heads/ignite-gg-14206 Commit: c87dcaef08501fd7086e2a008d407eb40ed71657 Parents: 99b1e2a 9f546f8 Author: devozerov <voze...@gridgain.com> Authored: Wed Sep 26 18:26:09 2018 +0300 Committer: devozerov <voze...@gridgain.com> Committed: Wed Sep 26 18:26:09 2018 +0300 ---------------------------------------------------------------------- .../GridDeploymentPerVersionStore.java | 6 + .../record/delta/PartitionMetaStateRecord.java | 2 +- .../cache/CacheAffinitySharedManager.java | 57 +- .../cache/CacheClassLoaderMarker.java | 24 + .../processors/cache/CacheGroupContext.java | 4 +- .../cache/CacheGroupMetricsMXBeanImpl.java | 4 +- .../processors/cache/CacheMetricsImpl.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheContext.java | 6 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../GridCachePartitionExchangeManager.java | 70 +- .../processors/cache/GridCacheProcessor.java | 11 +- .../cache/GridCacheSharedContext.java | 9 +- .../processors/cache/GridCacheUtils.java | 3 +- .../cache/IgniteCacheOffheapManager.java | 2 +- .../cache/IgniteCacheOffheapManagerImpl.java | 6 +- .../processors/cache/WalStateManager.java | 6 +- .../GridDistributedCacheAdapter.java | 4 +- .../GridDistributedTxRemoteAdapter.java | 4 +- .../dht/CacheDistributedGetFutureAdapter.java | 4 +- .../cache/distributed/dht/EvictionContext.java | 28 - .../dht/GridCachePartitionedConcurrentMap.java | 1 + .../dht/GridClientPartitionTopology.java | 1367 -------- .../distributed/dht/GridDhtCacheAdapter.java | 3 + .../distributed/dht/GridDhtCacheEntry.java | 1 + .../cache/distributed/dht/GridDhtGetFuture.java | 2 + .../distributed/dht/GridDhtGetSingleFuture.java | 2 + .../dht/GridDhtInvalidPartitionException.java | 51 - .../distributed/dht/GridDhtLocalPartition.java | 1560 --------- .../distributed/dht/GridDhtLockFuture.java | 1 + .../distributed/dht/GridDhtPartitionState.java | 58 - .../dht/GridDhtPartitionTopology.java | 428 --- .../dht/GridDhtPartitionTopologyImpl.java | 2962 ----------------- .../dht/GridDhtPartitionsReservation.java | 293 -- .../dht/GridDhtPartitionsStateValidator.java | 310 -- .../dht/GridDhtTransactionalCacheAdapter.java | 3 + .../dht/GridDhtTxAbstractEnlistFuture.java | 3 + .../distributed/dht/GridDhtTxLocalAdapter.java | 1 + .../cache/distributed/dht/GridDhtTxRemote.java | 2 + .../dht/GridPartitionedGetFuture.java | 3 +- .../dht/GridPartitionedSingleGetFuture.java | 3 +- .../distributed/dht/PartitionsEvictManager.java | 569 ---- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../dht/preloader/GridDhtForceKeysFuture.java | 8 +- .../dht/preloader/GridDhtPartitionDemander.java | 169 +- .../dht/preloader/GridDhtPartitionMap.java | 4 +- .../dht/preloader/GridDhtPartitionSupplier.java | 218 +- .../GridDhtPartitionsExchangeFuture.java | 94 +- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 2 +- .../dht/preloader/GridDhtPreloader.java | 30 +- .../preloader/GridDhtPreloaderAssignments.java | 2 +- .../IgniteDhtDemandedPartitionsMap.java | 67 +- .../dht/topology/EvictionContext.java | 28 + .../topology/GridClientPartitionTopology.java | 1369 ++++++++ .../GridDhtInvalidPartitionException.java | 51 + .../dht/topology/GridDhtLocalPartition.java | 1576 +++++++++ .../dht/topology/GridDhtPartitionState.java | 58 + .../dht/topology/GridDhtPartitionTopology.java | 430 +++ .../topology/GridDhtPartitionTopologyImpl.java | 2999 ++++++++++++++++++ .../topology/GridDhtPartitionsReservation.java | 294 ++ .../GridDhtPartitionsStateValidator.java | 314 ++ .../dht/topology/PartitionsEvictManager.java | 572 ++++ .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../cache/mvcc/MvccProcessorImpl.java | 4 +- .../processors/cache/mvcc/VacuumTask.java | 2 +- .../GridCacheDatabaseSharedManager.java | 47 +- .../persistence/GridCacheOffheapManager.java | 10 +- .../persistence/checkpoint/CheckpointEntry.java | 2 +- .../tree/io/PagePartitionMetaIO.java | 2 +- .../tree/io/PagePartitionMetaIOV2.java | 2 +- .../wal/serializer/RecordDataV1Serializer.java | 2 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../continuous/CacheContinuousQueryHandler.java | 2 +- .../cache/transactions/IgniteTxAdapter.java | 4 +- .../cache/transactions/IgniteTxHandler.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../CollectConflictPartitionKeysTask.java | 4 +- .../RetrieveConflictPartitionValuesTask.java | 4 +- .../verify/VerifyBackupPartitionsTask.java | 4 +- .../verify/VerifyBackupPartitionsTaskV2.java | 4 +- .../datastreamer/DataStreamerImpl.java | 6 +- .../processors/job/GridJobProcessor.java | 4 +- .../schema/SchemaIndexCacheVisitorImpl.java | 10 +- .../internal/util/GridPartitionStateMap.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 22 +- .../cache/VisorCacheLostPartitionsTask.java | 2 +- .../visor/cache/VisorCachePartitionsTask.java | 6 +- .../internal/visor/cache/VisorPartitionMap.java | 2 +- modules/core/src/test/config/log4j-test.xml | 17 +- .../cache/CacheDeferredDeleteQueueTest.java | 4 +- ...cheDhtLocalPartitionAfterRemoveSelfTest.java | 2 +- .../processors/cache/IgniteCacheGroupsTest.java | 3 +- .../IgniteClientCacheStartFailoverTest.java | 2 +- .../distributed/CacheBaselineTopologyTest.java | 4 +- .../CacheDataLossOnPartitionMoveTest.java | 6 +- .../CachePageWriteLockUnlockTest.java | 4 +- .../distributed/CachePartitionStateTest.java | 10 +- .../CacheRentingStateRepairTest.java | 6 +- ...teCacheClientNodePartitionsExchangeTest.java | 2 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 2 + .../GridCacheDhtPreloadDisabledSelfTest.java | 1 + .../dht/GridCacheDhtPreloadSelfTest.java | 9 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 4 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 1 + .../GridCachePartitionsStateValidationTest.java | 2 + ...idCachePartitionsStateValidatorSelfTest.java | 4 + ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- .../near/NoneRebalanceModeSelfTest.java | 4 +- ...idCacheRebalancingPartitionCountersTest.java | 4 +- .../GridCacheRebalancingSyncSelfTest.java | 6 +- ...idCacheRebalancingWithAsyncClearingTest.java | 6 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 2 +- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 3 +- .../IgnitePdsCacheRebalancingAbstractTest.java | 2 +- .../IgnitePdsCorruptedIndexTest.java | 3 +- .../IgnitePdsPartitionFilesDestroyTest.java | 6 +- ...niteAbsentEvictionNodeOutOfBaselineTest.java | 2 +- .../wal/IgniteWalHistoryReservationsTest.java | 2 +- .../db/wal/WalRecoveryTxLogicalRecordsTest.java | 4 +- ...ContinuousQueryFailoverAbstractSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 2 +- .../ignite/p2p/P2PScanQueryUndeployTest.java | 250 ++ .../ignite/testframework/GridTestUtils.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 6 +- .../testsuites/IgniteP2PSelfTestSuite.java | 2 + .../ignite/util/GridPartitionMapSelfTest.java | 2 +- .../ignite/tests/p2p/AlwaysTruePredicate.java | 30 + .../query/h2/twostep/GridMapQueryExecutor.java | 10 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../visor/verify/ValidateIndexesClosure.java | 4 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 4 +- ...eLockPartitionOnAffinityRunAbstractTest.java | 2 +- ...niteCacheLockPartitionOnAffinityRunTest.java | 2 +- .../mvcc/CacheMvccSqlUpdateCountersTest.java | 3 +- .../h2/twostep/RetryCauseMessageSelfTest.java | 2 +- .../util/GridCommandHandlerIndexingTest.java | 2 +- .../impl/cache/CacheBasedDatasetTest.java | 4 +- .../cache/WaitMapExchangeFinishCallable.java | 4 +- .../IgniteFailoverAbstractBenchmark.java | 3 +- ...IgniteTransactionalWriteInvokeBenchmark.java | 2 +- .../internal/ZkCommunicationFailureContext.java | 3 +- 148 files changed, 8703 insertions(+), 8118 deletions(-) ----------------------------------------------------------------------