Merge remote-tracking branch 'origin/ignite-gg-8.0.3.ea4' into GG-11860-2 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotOperation.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8893337a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8893337a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8893337a Branch: refs/heads/ignite-gg-8.0.3.ea6-clients-test Commit: 8893337a67269ee4b7cf37737bcf21f0938dc020 Parents: 1229d2f 3a7e801 Author: EdShangGG <[email protected]> Authored: Mon Apr 3 15:03:12 2017 +0300 Committer: EdShangGG <[email protected]> Committed: Mon Apr 3 15:03:12 2017 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 2 +- .../internal/managers/discovery/DiscoCache.java | 310 +++++++++ .../discovery/GridDiscoveryManager.java | 680 +++++-------------- .../eventstorage/DiscoveryEventListener.java | 33 + .../eventstorage/GridEventStorageManager.java | 162 ++++- .../pagemem/snapshot/SnapshotOperation.java | 12 +- .../pagemem/wal/IgniteWriteAheadLogManager.java | 27 +- .../internal/pagemem/wal/record/WALRecord.java | 5 +- .../delta/MetaPageUpdateLastAllocatedIndex.java | 2 +- .../MetaPageUpdatePartitionDataRecord.java | 17 +- .../record/delta/PartitionDestroyRecord.java | 73 ++ .../record/delta/PartitionMetaStateRecord.java | 2 +- .../affinity/GridAffinityAssignmentCache.java | 7 +- .../cache/CacheAffinitySharedManager.java | 35 +- .../cache/GridCacheAffinityManager.java | 3 +- .../GridCachePartitionExchangeManager.java | 100 ++- .../cache/IgniteCacheOffheapManager.java | 3 +- .../cache/IgniteCacheOffheapManagerImpl.java | 57 +- .../IgniteCacheDatabaseSharedManager.java | 40 +- .../cache/database/freelist/PagesList.java | 221 ++++-- .../cache/database/tree/io/PageMetaIO.java | 34 +- .../dht/GridClientPartitionTopology.java | 53 +- .../dht/GridDhtAssignmentFetchFuture.java | 7 +- .../distributed/dht/GridDhtCacheEntry.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 60 +- .../distributed/dht/GridDhtLockFuture.java | 29 +- .../dht/GridDhtPartitionTopology.java | 22 +- .../dht/GridDhtPartitionTopologyImpl.java | 255 ++++--- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../GridDhtPartitionDemandMessage.java | 73 +- .../dht/preloader/GridDhtPartitionDemander.java | 81 +-- .../dht/preloader/GridDhtPartitionSupplier.java | 10 +- .../GridDhtPartitionSupplyMessageV2.java | 1 - .../GridDhtPartitionsExchangeFuture.java | 183 ++++- .../preloader/GridDhtPartitionsFullMessage.java | 120 +++- .../GridDhtPartitionsSingleMessage.java | 77 ++- .../dht/preloader/GridDhtPreloader.java | 106 ++- .../IgniteDhtPartitionCountersMap.java | 64 ++ .../IgniteDhtPartitionHistorySuppliersMap.java | 107 +++ .../IgniteDhtPartitionsToReloadMap.java | 88 +++ .../cache/transactions/IgniteTxStateImpl.java | 4 +- .../service/GridServiceProcessor.java | 21 +- .../ignite/internal/util/IgniteUtils.java | 26 + .../ignite/internal/util/lang/GridFunc.java | 39 ++ .../resources/META-INF/classnames.properties | 27 +- modules/core/src/test/config/log4j-test.xml | 8 +- .../ignite/cache/LargeEntryUpdateTest.java | 177 +++++ .../GridDiscoveryManagerAliveCacheSelfTest.java | 14 - .../database/IgniteDbAbstractTest.java | 391 +++++++++++ .../IgniteDbMemoryLeakAbstractTest.java | 265 ++++++++ .../IgniteDbMemoryLeakLargeObjectsTest.java | 56 ++ .../IgniteDbMemoryLeakLargePagesTest.java | 33 + .../IgniteDbMemoryLeakNonTransactionalTest.java | 31 + .../database/IgniteDbMemoryLeakTest.java | 46 ++ .../IgniteDbMemoryLeakWithExpirationTest.java | 44 ++ .../database/IgniteDbPutGetAbstractTest.java | 357 +--------- .../junits/common/GridCommonAbstractTest.java | 4 +- .../testsuites/IgniteDbMemoryLeakTestSuite.java | 49 ++ .../database/IgniteDbMemoryLeakIndexedTest.java | 33 + .../IgniteDbMemoryLeakSqlQueryTest.java | 76 +++ ...IgniteDbMemoryLeakWithIndexingTestSuite.java | 40 ++ 61 files changed, 3489 insertions(+), 1417 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8893337a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java index 3380e16,743cd77..6220c43 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java @@@ -19,7 -19,8 +19,9 @@@ package org.apache.ignite.internal.proc import java.io.File; import java.util.Collection; +import java.util.UUID; + import java.util.Collections; + import java.util.Map; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.configuration.MemoryConfiguration; http://git-wip-us.apache.org/repos/asf/ignite/blob/8893337a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ----------------------------------------------------------------------
