You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/06/11 20:04:13 UTC
[47/47] ignite git commit: IGNITE-5267 - Moved ignite-ps module to
ignite-core
IGNITE-5267 - Moved ignite-ps module to ignite-core
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6bf5ce46
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6bf5ce46
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6bf5ce46
Branch: refs/heads/ignite-5267-merge-ea
Commit: 6bf5ce46c1e6c4e3dcf042ac91a5b61a726c5821
Parents: bdbba0e
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Sun Jun 11 23:02:44 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Sun Jun 11 23:02:48 2017 +0300
----------------------------------------------------------------------
.../benchmarks/jmh/tree/BPlusTreeBenchmark.java | 18 +-
modules/core/pom.xml | 14 +
.../ignite/internal/IgniteComponentType.java | 17 +-
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../pagemem/impl/PageMemoryNoStoreImpl.java | 4 +-
.../delta/DataPageInsertFragmentRecord.java | 2 +-
.../wal/record/delta/DataPageInsertRecord.java | 2 +-
.../wal/record/delta/DataPageRemoveRecord.java | 2 +-
.../delta/DataPageSetFreeListPageRecord.java | 2 +-
.../wal/record/delta/DataPageUpdateRecord.java | 2 +-
.../wal/record/delta/FixCountRecord.java | 4 +-
.../record/delta/FixLeftmostChildRecord.java | 4 +-
.../pagemem/wal/record/delta/FixRemoveId.java | 4 +-
.../wal/record/delta/InitNewPageRecord.java | 2 +-
.../pagemem/wal/record/delta/InsertRecord.java | 2 +-
.../wal/record/delta/MetaPageAddRootRecord.java | 2 +-
.../wal/record/delta/MetaPageCutRootRecord.java | 3 +-
.../wal/record/delta/MetaPageInitRecord.java | 4 +-
.../delta/MetaPageInitRootInlineRecord.java | 2 +-
.../record/delta/MetaPageInitRootRecord.java | 2 +-
.../delta/MetaPageUpdateLastAllocatedIndex.java | 4 +-
...aPageUpdateLastSuccessfulFullSnapshotId.java | 2 +-
.../MetaPageUpdateLastSuccessfulSnapshotId.java | 2 +-
.../delta/MetaPageUpdateNextSnapshotId.java | 2 +-
.../MetaPageUpdatePartitionDataRecord.java | 2 +-
.../wal/record/delta/NewRootInitRecord.java | 2 +-
.../delta/PageListMetaResetCountRecord.java | 2 +-
.../record/delta/PagesListAddPageRecord.java | 2 +-
.../delta/PagesListInitNewPageRecord.java | 4 +-
.../record/delta/PagesListRemovePageRecord.java | 2 +-
.../record/delta/PagesListSetNextRecord.java | 2 +-
.../delta/PagesListSetPreviousRecord.java | 2 +-
.../pagemem/wal/record/delta/RecycleRecord.java | 2 +-
.../pagemem/wal/record/delta/RemoveRecord.java | 4 +-
.../pagemem/wal/record/delta/ReplaceRecord.java | 2 +-
.../record/delta/SplitExistingPageRecord.java | 4 +-
.../record/delta/TrackingPageDeltaRecord.java | 2 +-
.../cache/CacheAffinitySharedManager.java | 2 +-
.../processors/cache/CacheGroupContext.java | 12 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 6 +-
.../processors/cache/GridCacheProcessor.java | 19 +-
.../cache/GridCacheSharedContext.java | 4 +-
.../cache/IgniteCacheOffheapManager.java | 8 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 28 +-
.../cache/IgniteRebalanceIterator.java | 2 +-
.../processors/cache/database/CacheDataRow.java | 57 -
.../cache/database/CacheDataRowAdapter.java | 593 ---
.../cache/database/CacheSearchRow.java | 45 -
.../database/CheckpointLockStateChecker.java | 28 -
.../cache/database/DataStructure.java | 384 --
.../IgniteCacheDatabaseSharedManager.java | 968 ----
.../database/IgniteCacheSnapshotManager.java | 133 -
.../cache/database/MemoryMetricsImpl.java | 284 --
.../cache/database/MemoryMetricsMXBeanImpl.java | 131 -
.../cache/database/MemoryMetricsSnapshot.java | 112 -
.../processors/cache/database/MemoryPolicy.java | 83 -
.../processors/cache/database/MetaStore.java | 51 -
.../cache/database/MetadataStorage.java | 417 --
.../database/PersistenceMetricsSnapshot.java | 144 -
.../processors/cache/database/RootPage.java | 62 -
.../processors/cache/database/RowStore.java | 107 -
.../evict/FairFifoPageEvictionTracker.java | 76 -
.../database/evict/NoOpPageEvictionTracker.java | 50 -
.../evict/PageAbstractEvictionTracker.java | 171 -
.../database/evict/PageEvictionTracker.java | 52 -
.../evict/Random2LruPageEvictionTracker.java | 180 -
.../evict/RandomLruPageEvictionTracker.java | 159 -
.../cache/database/freelist/FreeList.java | 51 -
.../cache/database/freelist/FreeListImpl.java | 594 ---
.../cache/database/freelist/PagesList.java | 1484 ------
.../database/freelist/io/PagesListMetaIO.java | 186 -
.../database/freelist/io/PagesListNodeIO.java | 231 -
.../cache/database/tree/BPlusTree.java | 4808 ------------------
.../cache/database/tree/io/BPlusIO.java | 403 --
.../cache/database/tree/io/BPlusInnerIO.java | 180 -
.../cache/database/tree/io/BPlusLeafIO.java | 56 -
.../cache/database/tree/io/BPlusMetaIO.java | 182 -
.../cache/database/tree/io/CacheVersionIO.java | 184 -
.../cache/database/tree/io/DataPageIO.java | 1450 ------
.../cache/database/tree/io/DataPagePayload.java | 64 -
.../cache/database/tree/io/IOVersions.java | 99 -
.../cache/database/tree/io/PageIO.java | 548 --
.../cache/database/tree/io/PageMetaIO.java | 222 -
.../tree/io/PagePartitionCountersIO.java | 175 -
.../database/tree/io/PagePartitionMetaIO.java | 163 -
.../cache/database/tree/io/TrackingPageIO.java | 334 --
.../cache/database/tree/reuse/ReuseBag.java | 33 -
.../cache/database/tree/reuse/ReuseList.java | 43 -
.../database/tree/reuse/ReuseListImpl.java | 95 -
.../cache/database/tree/util/PageHandler.java | 511 --
.../database/tree/util/PageLockListener.java | 69 -
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 2 +-
.../dht/GridPartitionedSingleGetFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 3 +-
.../dht/colocated/GridDhtColocatedCache.java | 3 +-
.../colocated/GridDhtDetachedCacheEntry.java | 2 +-
.../dht/preloader/GridDhtPartitionSupplier.java | 2 +-
.../distributed/near/GridNearCacheEntry.java | 2 +-
.../local/atomic/GridLocalAtomicCache.java | 3 +-
.../cache/persistence/CacheDataRow.java | 57 +
.../cache/persistence/CacheDataRowAdapter.java | 593 +++
.../cache/persistence/CacheSearchRow.java | 45 +
.../persistence/CheckpointLockStateChecker.java | 28 +
.../cache/persistence/DataStructure.java | 384 ++
.../cache/persistence/DbCheckpointListener.java | 38 +
.../FullPageIdIterableComparator.java | 51 +
.../GridCacheDatabaseSharedManager.java | 3113 ++++++++++++
.../persistence/GridCacheOffheapManager.java | 1316 +++++
.../IgniteCacheDatabaseSharedManager.java | 968 ++++
.../persistence/IgniteCacheSnapshotManager.java | 133 +
.../cache/persistence/MemoryMetricsImpl.java | 284 ++
.../persistence/MemoryMetricsMXBeanImpl.java | 131 +
.../persistence/MemoryMetricsSnapshot.java | 112 +
.../cache/persistence/MemoryPolicy.java | 83 +
.../processors/cache/persistence/MetaStore.java | 51 +
.../cache/persistence/MetadataStorage.java | 417 ++
.../persistence/PersistenceMetricsImpl.java | 297 ++
.../persistence/PersistenceMetricsSnapshot.java | 144 +
.../processors/cache/persistence/RootPage.java | 62 +
.../processors/cache/persistence/RowStore.java | 107 +
.../evict/FairFifoPageEvictionTracker.java | 76 +
.../evict/NoOpPageEvictionTracker.java | 50 +
.../evict/PageAbstractEvictionTracker.java | 171 +
.../persistence/evict/PageEvictionTracker.java | 52 +
.../evict/Random2LruPageEvictionTracker.java | 180 +
.../evict/RandomLruPageEvictionTracker.java | 159 +
.../cache/persistence/file/FilePageStore.java | 529 ++
.../persistence/file/FilePageStoreManager.java | 671 +++
.../cache/persistence/freelist/FreeList.java | 51 +
.../persistence/freelist/FreeListImpl.java | 594 +++
.../cache/persistence/freelist/PagesList.java | 1482 ++++++
.../freelist/io/PagesListMetaIO.java | 186 +
.../freelist/io/PagesListNodeIO.java | 231 +
.../pagemem/CheckpointMetricsTracker.java | 183 +
.../persistence/pagemem/EvictCandidate.java | 77 +
.../persistence/pagemem/FullPageIdTable.java | 556 ++
.../cache/persistence/pagemem/PageMemoryEx.java | 149 +
.../persistence/pagemem/PageMemoryImpl.java | 2313 +++++++++
.../cache/persistence/tree/BPlusTree.java | 4808 ++++++++++++++++++
.../cache/persistence/tree/io/BPlusIO.java | 403 ++
.../cache/persistence/tree/io/BPlusInnerIO.java | 180 +
.../cache/persistence/tree/io/BPlusLeafIO.java | 56 +
.../cache/persistence/tree/io/BPlusMetaIO.java | 182 +
.../persistence/tree/io/CacheVersionIO.java | 184 +
.../cache/persistence/tree/io/DataPageIO.java | 1450 ++++++
.../persistence/tree/io/DataPagePayload.java | 64 +
.../cache/persistence/tree/io/IOVersions.java | 99 +
.../cache/persistence/tree/io/PageIO.java | 548 ++
.../cache/persistence/tree/io/PageMetaIO.java | 222 +
.../tree/io/PagePartitionCountersIO.java | 175 +
.../tree/io/PagePartitionMetaIO.java | 163 +
.../persistence/tree/io/TrackingPageIO.java | 334 ++
.../cache/persistence/tree/reuse/ReuseBag.java | 33 +
.../cache/persistence/tree/reuse/ReuseList.java | 43 +
.../persistence/tree/reuse/ReuseListImpl.java | 95 +
.../persistence/tree/util/PageHandler.java | 511 ++
.../persistence/tree/util/PageLockListener.java | 69 +
.../wal/ByteBufferBackedDataInput.java | 40 +
.../wal/ByteBufferBackedDataInputImpl.java | 173 +
.../cache/persistence/wal/FileInput.java | 453 ++
.../cache/persistence/wal/FileWALPointer.java | 139 +
.../wal/FileWriteAheadLogManager.java | 2533 +++++++++
.../cache/persistence/wal/RecordSerializer.java | 52 +
.../persistence/wal/SegmentEofException.java | 37 +
.../IgniteDataIntegrityViolationException.java | 41 +
.../persistence/wal/crc/PureJavaCrc32.java | 655 +++
.../persistence/wal/record/HeaderRecord.java | 50 +
.../wal/serializer/RecordV1Serializer.java | 1654 ++++++
.../cache/query/GridCacheQueryManager.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../cluster/GridClusterStateProcessor.java | 154 +-
.../processors/igfs/IgfsDataManager.java | 2 +-
.../schema/SchemaIndexCacheVisitorImpl.java | 2 +-
.../internal/ClusterNodeMetricsSelfTest.java | 2 +-
.../pagemem/impl/PageMemoryNoLoadSelfTest.java | 4 +-
.../processors/cache/IgniteCacheGroupsTest.java | 2 +-
.../MemoryPolicyInitializationTest.java | 313 --
.../database/tree/io/TrackingPageIOTest.java | 283 --
.../IgnitePdsAtomicCacheRebalancingTest.java | 40 +
.../IgnitePdsCacheRebalancingAbstractTest.java | 523 ++
.../IgnitePdsClientNearCachePutGetTest.java | 55 +
.../IgnitePdsContinuousRestartTest.java | 259 +
.../persistence/IgnitePdsDynamicCacheTest.java | 150 +
.../IgnitePdsMultiNodePutGetRestartTest.java | 252 +
.../persistence/IgnitePdsPageSizesTest.java | 152 +
...gnitePdsRecoveryAfterFileCorruptionTest.java | 361 ++
.../IgnitePdsRemoveDuringRebalancingTest.java | 143 +
...gnitePdsSingleNodePutGetPersistenceTest.java | 55 +
.../IgnitePdsTxCacheRebalancingTest.java | 61 +
.../IgnitePersistenceMetricsSelfTest.java | 228 +
.../IgnitePersistentStoreCacheGroupsTest.java | 508 ++
...IgnitePersistentStoreDataStructuresTest.java | 196 +
.../MemoryPolicyInitializationTest.java | 313 ++
.../db/IgnitePdsMultiNodePutGetRestartTest.java | 242 +
...PdsPageEvictionDuringPartitionClearTest.java | 174 +
.../db/IgnitePdsPageEvictionTest.java | 239 +
...tePdsRebalancingOnNotStableTopologyTest.java | 215 +
.../db/IgnitePdsTransactionsHangTest.java | 304 ++
.../db/IgnitePdsWholeClusterRestartTest.java | 165 +
.../db/file/IgnitePdsCacheIntegrationTest.java | 285 ++
.../db/file/IgnitePdsEvictionTest.java | 297 ++
.../file/IgnitePdsNoActualWalHistoryTest.java | 215 +
.../file/ignitePdsCheckpointSimulationTest.java | 1000 ++++
.../persistence/db/wal/IgnitePdsWalTlbTest.java | 134 +
.../IgniteWalDirectoriesConfigurationTest.java | 54 +
.../wal/IgniteWalHistoryReservationsTest.java | 395 ++
.../IgniteWalRecoverySeveralRestartsTest.java | 347 ++
.../db/wal/IgniteWalRecoveryTest.java | 1326 +++++
.../db/wal/WalRecoveryTxLogicalRecordsTest.java | 951 ++++
.../db/wal/crc/IgniteDataIntegrityTests.java | 137 +
.../pagemem/BPlusTreePageMemoryImplTest.java | 96 +
.../BPlusTreeReuseListPageMemoryImplTest.java | 97 +
.../pagemem/FullPageIdTableTest.java | 115 +
.../MetadataStoragePageMemoryImplTest.java | 102 +
.../persistence/pagemem/NoOpWALManager.java | 128 +
.../pagemem/PageIdDistributionTest.java | 234 +
.../pagemem/PageMemoryImplNoLoadTest.java | 98 +
.../persistence/pagemem/PageMemoryImplTest.java | 119 +
.../AbstractNodeJoinTemplate.java | 743 +++
.../IgniteChangeGlobalStateAbstractTest.java | 366 ++
.../IgniteChangeGlobalStateCacheTest.java | 168 +
...IgniteChangeGlobalStateDataStreamerTest.java | 112 +
...gniteChangeGlobalStateDataStructureTest.java | 278 +
.../IgniteChangeGlobalStateFailOverTest.java | 353 ++
.../IgniteChangeGlobalStateServiceTest.java | 102 +
.../IgniteChangeGlobalStateTest.java | 711 +++
.../IgniteStandByClusterTest.java | 213 +
.../extended/GridActivateExtensionTest.java | 239 +
.../extended/GridActivationAtomicCacheSuit.java | 79 +
.../GridActivationCacheAbstractTestSuit.java | 108 +
.../GridActivationLocalAndNearCacheSuit.java | 47 +
.../GridActivationPartitionedCacheSuit.java | 80 +
.../GridActivationReplicatedCacheSuit.java | 63 +
.../join/JoinActiveNodeToActiveCluster.java | 431 ++
.../join/JoinActiveNodeToInActiveCluster.java | 227 +
.../join/JoinInActiveNodeToActiveCluster.java | 356 ++
.../join/JoinInActiveNodeToInActiveCluster.java | 226 +
...ctiveNodeToActiveClusterWithPersistence.java | 98 +
...iveNodeToInActiveClusterWithPersistence.java | 31 +
...ctiveNodeToActiveClusterWithPersistence.java | 86 +
...iveNodeToInActiveClusterWithPersistence.java | 31 +
...gniteAbstractStandByClientReconnectTest.java | 336 ++
.../IgniteStandByClientReconnectTest.java | 283 ++
...eStandByClientReconnectToNewClusterTest.java | 289 ++
.../persistence/tree/io/TrackingPageIOTest.java | 283 ++
.../database/BPlusTreeFakeReuseSelfTest.java | 4 +-
.../database/BPlusTreeReuseSelfTest.java | 6 +-
.../processors/database/BPlusTreeSelfTest.java | 20 +-
.../database/FreeListImplSelfTest.java | 12 +-
.../database/IgniteDbAbstractTest.java | 2 +-
.../IgniteDbMemoryLeakAbstractTest.java | 2 +-
.../database/MemoryMetricsSelfTest.java | 2 +-
.../database/MetadataStorageSelfTest.java | 6 +-
.../loadtests/hashmap/GridCacheTestContext.java | 5 +-
.../testsuites/IgniteCacheTestSuite2.java | 2 +-
.../IgnitePdsOutOfMemoryTestSuite.java | 38 +
.../ignite/testsuites/IgnitePdsTestSuite.java | 87 +
.../ignite/testsuites/IgnitePdsTestSuite2.java | 82 +
.../testsuites/IgniteStandByClusterSuite.java | 46 +
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../query/h2/database/H2PkHashIndex.java | 2 +-
.../query/h2/database/H2RowFactory.java | 2 +-
.../processors/query/h2/database/H2Tree.java | 8 +-
.../query/h2/database/H2TreeIndex.java | 6 +-
.../query/h2/database/io/H2ExtrasInnerIO.java | 10 +-
.../query/h2/database/io/H2ExtrasLeafIO.java | 10 +-
.../query/h2/database/io/H2InnerIO.java | 8 +-
.../query/h2/database/io/H2LeafIO.java | 8 +-
.../processors/query/h2/opt/GridH2Row.java | 2 +-
...niteCacheLockPartitionOnAffinityRunTest.java | 2 +-
...dexingAndGroupPutGetPersistenceSelfTest.java | 42 +
...leNodeWithIndexingPutGetPersistenceTest.java | 55 +
...gniteDbSingleNodeWithIndexingPutGetTest.java | 1 -
.../IgnitePersistentStoreSchemaLoadTest.java | 297 ++
.../h2/database/InlineIndexHelperTest.java | 2 +-
.../IgnitePdsWithIndexingTestSuite.java | 46 +
modules/pds/pom.xml | 189 -
.../cache/database/DbCheckpointListener.java | 38 -
.../database/FullPageIdIterableComparator.java | 51 -
.../GridCacheDatabaseSharedManager.java | 3113 ------------
.../cache/database/GridCacheOffheapManager.java | 1316 -----
.../cache/database/PersistenceMetricsImpl.java | 297 --
.../cache/database/file/FilePageStore.java | 529 --
.../database/file/FilePageStoreManager.java | 671 ---
.../pagemem/CheckpointMetricsTracker.java | 183 -
.../cache/database/pagemem/EvictCandidate.java | 77 -
.../cache/database/pagemem/FullPageIdTable.java | 556 --
.../cache/database/pagemem/PageMemoryEx.java | 149 -
.../cache/database/pagemem/PageMemoryImpl.java | 2313 ---------
.../database/wal/ByteBufferBackedDataInput.java | 40 -
.../wal/ByteBufferBackedDataInputImpl.java | 173 -
.../cache/database/wal/FileInput.java | 453 --
.../cache/database/wal/FileWALPointer.java | 139 -
.../database/wal/FileWriteAheadLogManager.java | 2533 ---------
.../cache/database/wal/RecordSerializer.java | 52 -
.../cache/database/wal/SegmentEofException.java | 37 -
.../IgniteDataIntegrityViolationException.java | 41 -
.../cache/database/wal/crc/PureJavaCrc32.java | 655 ---
.../cache/database/wal/record/HeaderRecord.java | 50 -
.../wal/serializer/RecordV1Serializer.java | 1654 ------
.../resources/META-INF/classnames.properties | 28 -
.../IgnitePdsAtomicCacheRebalancingTest.java | 40 -
.../IgnitePdsCacheRebalancingAbstractTest.java | 523 --
.../IgnitePdsClientNearCachePutGetTest.java | 55 -
.../IgnitePdsContinuousRestartTest.java | 259 -
.../database/IgnitePdsDynamicCacheTest.java | 150 -
.../IgnitePdsMultiNodePutGetRestartTest.java | 252 -
.../cache/database/IgnitePdsPageSizesTest.java | 152 -
...gnitePdsRecoveryAfterFileCorruptionTest.java | 361 --
.../IgnitePdsRemoveDuringRebalancingTest.java | 143 -
...gnitePdsSingleNodePutGetPersistenceTest.java | 55 -
...dexingAndGroupPutGetPersistenceSelfTest.java | 42 -
...leNodeWithIndexingPutGetPersistenceTest.java | 55 -
.../IgnitePdsTxCacheRebalancingTest.java | 61 -
.../IgnitePersistenceMetricsSelfTest.java | 228 -
.../IgnitePersistentStoreCacheGroupsTest.java | 508 --
...IgnitePersistentStoreDataStructuresTest.java | 196 -
.../IgnitePersistentStoreSchemaLoadTest.java | 297 --
.../db/IgnitePdsMultiNodePutGetRestartTest.java | 242 -
...PdsPageEvictionDuringPartitionClearTest.java | 174 -
.../database/db/IgnitePdsPageEvictionTest.java | 239 -
...tePdsRebalancingOnNotStableTopologyTest.java | 215 -
.../db/IgnitePdsTransactionsHangTest.java | 304 --
.../db/IgnitePdsWholeClusterRestartTest.java | 165 -
.../db/file/IgnitePdsCacheIntegrationTest.java | 285 --
.../database/db/file/IgnitePdsEvictionTest.java | 297 --
.../file/IgnitePdsNoActualWalHistoryTest.java | 215 -
.../file/ignitePdsCheckpointSimulationTest.java | 1000 ----
.../database/db/wal/IgnitePdsWalTlbTest.java | 134 -
.../IgniteWalDirectoriesConfigurationTest.java | 54 -
.../wal/IgniteWalHistoryReservationsTest.java | 395 --
.../IgniteWalRecoverySeveralRestartsTest.java | 347 --
.../database/db/wal/IgniteWalRecoveryTest.java | 1288 -----
.../db/wal/WalRecoveryTxLogicalRecordsTest.java | 951 ----
.../db/wal/crc/IgniteDataIntegrityTests.java | 137 -
.../pagemem/BPlusTreePageMemoryImplTest.java | 98 -
.../BPlusTreeReuseListPageMemoryImplTest.java | 99 -
.../database/pagemem/FullPageIdTableTest.java | 115 -
.../MetadataStoragePageMemoryImplTest.java | 104 -
.../database/pagemem/NoOpPageStoreManager.java | 200 -
.../cache/database/pagemem/NoOpWALManager.java | 128 -
.../pagemem/PageIdDistributionTest.java | 234 -
.../pagemem/PageMemoryImplNoLoadTest.java | 100 -
.../database/pagemem/PageMemoryImplTest.java | 121 -
.../AbstractNodeJoinTemplate.java | 743 ---
.../IgniteChangeGlobalStateAbstractTest.java | 366 --
.../IgniteChangeGlobalStateCacheTest.java | 168 -
...IgniteChangeGlobalStateDataStreamerTest.java | 112 -
...gniteChangeGlobalStateDataStructureTest.java | 278 -
.../IgniteChangeGlobalStateFailOverTest.java | 353 --
.../IgniteChangeGlobalStateServiceTest.java | 102 -
.../IgniteChangeGlobalStateTest.java | 711 ---
.../IgniteStandByClusterTest.java | 213 -
.../extended/GridActivateExtensionTest.java | 239 -
.../extended/GridActivationAtomicCacheSuit.java | 79 -
.../GridActivationCacheAbstractTestSuit.java | 108 -
.../GridActivationLocalAndNearCacheSuit.java | 47 -
.../GridActivationPartitionedCacheSuit.java | 80 -
.../GridActivationReplicatedCacheSuit.java | 63 -
.../join/JoinActiveNodeToActiveCluster.java | 431 --
.../join/JoinActiveNodeToInActiveCluster.java | 227 -
.../join/JoinInActiveNodeToActiveCluster.java | 356 --
.../join/JoinInActiveNodeToInActiveCluster.java | 226 -
...ctiveNodeToActiveClusterWithPersistence.java | 97 -
...iveNodeToInActiveClusterWithPersistence.java | 31 -
...ctiveNodeToActiveClusterWithPersistence.java | 85 -
...iveNodeToInActiveClusterWithPersistence.java | 31 -
...gniteAbstractStandByClientReconnectTest.java | 336 --
.../IgniteStandByClientReconnectTest.java | 283 --
...eStandByClientReconnectToNewClusterTest.java | 289 --
.../IgnitePdsOutOfMemoryTestSuite.java | 38 -
.../ignite/testsuites/IgnitePdsTestSuite.java | 95 -
.../ignite/testsuites/IgnitePdsTestSuite2.java | 84 -
.../testsuites/IgniteStandByClusterSuite.java | 46 -
parent/pom.xml | 1 +
pom.xml | 1 -
379 files changed, 49654 insertions(+), 49971 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
index c9ad0cf..94abc86 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
@@ -30,15 +30,15 @@ import org.apache.ignite.internal.pagemem.PageIdAllocator;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.pagemem.PageUtils;
import org.apache.ignite.internal.pagemem.impl.PageMemoryNoStoreImpl;
-import org.apache.ignite.internal.processors.cache.database.MemoryMetricsImpl;
-import org.apache.ignite.internal.processors.cache.database.tree.BPlusTree;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusInnerIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusLeafIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.IOVersions;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
-import org.apache.ignite.internal.processors.cache.database.tree.reuse.ReuseBag;
-import org.apache.ignite.internal.processors.cache.database.tree.reuse.ReuseList;
+import org.apache.ignite.internal.processors.cache.persistence.MemoryMetricsImpl;
+import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusInnerIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusLeafIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseBag;
+import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import org.apache.ignite.logger.java.JavaLogger;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Scope;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 6c714d0f..17e850d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -211,6 +211,20 @@
<version>1.1</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
index 1b70ab4..0cd2fc1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
@@ -89,22 +89,7 @@ public enum IgniteComponentType {
"org.apache.ignite.internal.processors.schedule.IgniteNoopScheduleProcessor",
"org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessor",
"ignite-schedule"
- ),
-
- /** Database manager used when persistence is enabled. */
- DATABASE_MANAGER(null,
- "org.apache.ignite.internal.processors.cache.database.GridCacheDatabaseSharedManager",
- "ignite-pds"),
-
- /** Page store manager used when persistence is enabled. */
- PAGE_STORE_MANAGER(null,
- "org.apache.ignite.internal.processors.cache.database.file.FilePageStoreManager",
- "ignite-pds"),
-
- /** Write-Ahead Log manager used when persistence is enabled. */
- WAL_MANAGER(null,
- "org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager",
- "ignite-pds");
+ );
/** No-op class name. */
private final String noOpClsName;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index fa605d6..a6ad89e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -112,7 +112,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey;
import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
-import org.apache.ignite.internal.processors.cache.database.MemoryPolicy;
+import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicy;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
index dc72482..8f146dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
@@ -34,8 +34,8 @@ import org.apache.ignite.internal.mem.IgniteOutOfMemoryException;
import org.apache.ignite.internal.pagemem.PageIdUtils;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
-import org.apache.ignite.internal.processors.cache.database.MemoryMetricsImpl;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.MemoryMetricsImpl;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.OffheapReadWriteLock;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
index eeaabd1..042fbe4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.DataPageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
/**
* Insert fragment to data page record.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java
index f23d57a..17425fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.DataPageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
/**
* Insert into data page.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java
index 17c7fe8..3aabe08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageRemoveRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.DataPageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
import org.apache.ignite.internal.util.typedef.internal.S;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java
index c835052..82281de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageSetFreeListPageRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.DataPageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
import static org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType.DATA_PAGE_SET_FREE_LIST_PAGE;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java
index 65b7172..d4e2811 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageUpdateRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.DataPageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
/**
* Update existing record in data page.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java
index c727710..3ab1c4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixCountRecord.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
/**
* Fix elements count record.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java
index 94155c9..15ee7dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixLeftmostChildRecord.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusInnerIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusInnerIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
/**
* Fix leftmost child.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java
index b9900e1..b6ea410 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/FixRemoveId.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
/**
* Fix remove ID record.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java
index f5607dd..f883e06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InitNewPageRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java
index f6d8f8c..d0e66a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/InsertRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java
index 176df33..1f1e976 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageAddRootRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusMetaIO;
/**
* New root in meta page.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java
index 50ccddc..3fc42a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageCutRootRecord.java
@@ -17,10 +17,9 @@
package org.apache.ignite.internal.pagemem.wal.record.delta;
-import java.nio.ByteBuffer;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusMetaIO;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java
index 1daf5a1..692b8f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRecord.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageMetaIO;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java
index 212f5b9..7eb8426 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootInlineRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusMetaIO;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java
index 280310f..0eb61b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageInitRootRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusMetaIO;
/**
* Initialize new meta page.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java
index d916be2..548735e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastAllocatedIndex.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageMetaIO;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java
index e322b4f..34be353 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulFullSnapshotId.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageMetaIO;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java
index df9d778..7fca5dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateLastSuccessfulSnapshotId.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageMetaIO;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java
index 1403bd7..0cd72ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdateNextSnapshotId.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageMetaIO;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
index b28dd52..15d1a0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PagePartitionMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PagePartitionMetaIO;
import org.apache.ignite.internal.util.typedef.internal.S;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java
index 277d773..bdfdef5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/NewRootInitRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusInnerIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusInnerIO;
/**
* Initialize new root page.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java
index 16587d3..4756c9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PageListMetaResetCountRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.freelist.io.PagesListMetaIO;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListMetaIO;
/**
* Delta record for page-list meta count reset
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java
index a503b46..2577ec3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListAddPageRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.freelist.io.PagesListNodeIO;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListNodeIO;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java
index b035323..673d33c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListInitNewPageRecord.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.freelist.io.PagesListNodeIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListNodeIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java
index 26f832c..2341129 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListRemovePageRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.freelist.io.PagesListNodeIO;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListNodeIO;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java
index c0bed60..30600e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetNextRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.freelist.io.PagesListNodeIO;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListNodeIO;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java
index 21c3ef2..590643e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/PagesListSetPreviousRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.freelist.io.PagesListNodeIO;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListNodeIO;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java
index 1737e12..92ea88e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RecycleRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
/**
* Recycle index page.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java
index 6d278e9..ac5d442 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RemoveRecord.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.util.typedef.internal.S;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java
index 4e85c43..2f504ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/ReplaceRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
/**
* Replace.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
index 418d28b..5cb3023 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java
index 7cd0948..05e96ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.pagemem.PageMemory;
-import org.apache.ignite.internal.processors.cache.database.tree.io.TrackingPageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.TrackingPageIO;
/**
* Delta record for updates in tracking pages
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 70bf117..6340360 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -387,7 +387,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
nearCfg = req.nearCacheConfiguration();
}
else // Only static cache configured on client must be started.
- startCache = cctx.kernalContext().state().isLocalConfigure(req.cacheName());
+ startCache = cctx.kernalContext().state().isLocallyConfigured(req.cacheName());
}
else if (cctx.localNodeId().equals(req.initiatingNodeId())) {
startCache = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
index b85c41d..7367374 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
@@ -37,9 +37,10 @@ import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.processors.affinity.AffinityAssignment;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache;
-import org.apache.ignite.internal.processors.cache.database.MemoryPolicy;
-import org.apache.ignite.internal.processors.cache.database.freelist.FreeList;
-import org.apache.ignite.internal.processors.cache.database.tree.reuse.ReuseList;
+import org.apache.ignite.internal.processors.cache.persistence.GridCacheOffheapManager;
+import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicy;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.FreeList;
+import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
@@ -855,10 +856,7 @@ public class CacheGroupContext {
ClassLoader clsLdr = U.gridClassLoader();
try {
- offheapMgr = (IgniteCacheOffheapManager) clsLdr
- .loadClass("org.apache.ignite.internal.processors.cache.database.GridCacheOffheapManager")
- .getConstructor()
- .newInstance();
+ offheapMgr = new GridCacheOffheapManager();
}
catch (Exception e) {
throw new IgniteCheckedException("Failed to initialize offheap manager", e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 535cfdd..81cb1f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -83,7 +83,7 @@ import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException
import org.apache.ignite.internal.cluster.IgniteClusterEx;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityImpl;
-import org.apache.ignite.internal.processors.cache.database.CacheDataRow;
+import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
import org.apache.ignite.internal.processors.cache.distributed.IgniteExternalizableExpiryPolicy;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 44cf4e0..83f7aa0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -56,7 +56,7 @@ import org.apache.ignite.internal.managers.deployment.GridDeploymentManager;
import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cache.database.MemoryPolicy;
+import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicy;
import org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 28656fb..eea8935 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -38,9 +38,9 @@ import org.apache.ignite.internal.pagemem.wal.record.DataEntry;
import org.apache.ignite.internal.pagemem.wal.record.DataRecord;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheUpdateAtomicResult.UpdateOutcome;
-import org.apache.ignite.internal.processors.cache.database.CacheDataRow;
-import org.apache.ignite.internal.processors.cache.database.CacheDataRowAdapter;
-import org.apache.ignite.internal.processors.cache.database.MemoryPolicy;
+import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
+import org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter;
+import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicy;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 5ee80ef..55b4998 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -77,11 +77,13 @@ import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheJoinNodeDiscoveryData.CacheInfo;
import org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
-import org.apache.ignite.internal.processors.cache.database.IgniteCacheDatabaseSharedManager;
-import org.apache.ignite.internal.processors.cache.database.IgniteCacheSnapshotManager;
-import org.apache.ignite.internal.processors.cache.database.MemoryPolicy;
-import org.apache.ignite.internal.processors.cache.database.freelist.FreeList;
-import org.apache.ignite.internal.processors.cache.database.tree.reuse.ReuseList;
+import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager;
+import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager;
+import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheSnapshotManager;
+import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicy;
+import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.FreeList;
+import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCache;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
@@ -95,6 +97,7 @@ import org.apache.ignite.internal.processors.cache.dr.GridCacheDrManager;
import org.apache.ignite.internal.processors.cache.jta.CacheJtaManagerAdapter;
import org.apache.ignite.internal.processors.cache.local.GridLocalCache;
import org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache;
+import org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager;
import org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager;
import org.apache.ignite.internal.processors.cache.query.GridCacheLocalQueryManager;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
@@ -2175,11 +2178,11 @@ public class GridCacheProcessor extends GridProcessorAdapter {
" configuration will be ignored).");
}
- dbMgr = IgniteComponentType.DATABASE_MANAGER.create(ctx, false);
+ dbMgr = new GridCacheDatabaseSharedManager(ctx);
- pageStoreMgr = IgniteComponentType.PAGE_STORE_MANAGER.create(ctx, false);
+ pageStoreMgr = new FilePageStoreManager(ctx);
- walMgr = IgniteComponentType.WAL_MANAGER.create(ctx, false);
+ walMgr = new FileWriteAheadLogManager(ctx);
}
else
dbMgr = new IgniteCacheDatabaseSharedManager();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index be1ab3d..0ee0020 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -40,8 +40,8 @@ import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
import org.apache.ignite.internal.pagemem.store.IgnitePageStoreManager;
import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cache.database.IgniteCacheDatabaseSharedManager;
-import org.apache.ignite.internal.processors.cache.database.IgniteCacheSnapshotManager;
+import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager;
+import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheSnapshotManager;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
index 8951396..001848e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
@@ -21,10 +21,10 @@ import java.util.Map;
import javax.cache.Cache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cache.database.CacheDataRow;
-import org.apache.ignite.internal.processors.cache.database.RootPage;
-import org.apache.ignite.internal.processors.cache.database.RowStore;
-import org.apache.ignite.internal.processors.cache.database.tree.reuse.ReuseList;
+import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
+import org.apache.ignite.internal.processors.cache.persistence.RootPage;
+import org.apache.ignite.internal.processors.cache.persistence.RowStore;
+import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.GridAtomicLong;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index ae47443..b9afad8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -36,20 +36,20 @@ import org.apache.ignite.internal.pagemem.FullPageId;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.pagemem.PageUtils;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cache.database.CacheDataRow;
-import org.apache.ignite.internal.processors.cache.database.CacheDataRowAdapter;
-import org.apache.ignite.internal.processors.cache.database.CacheSearchRow;
-import org.apache.ignite.internal.processors.cache.database.RootPage;
-import org.apache.ignite.internal.processors.cache.database.RowStore;
-import org.apache.ignite.internal.processors.cache.database.freelist.FreeList;
-import org.apache.ignite.internal.processors.cache.database.tree.BPlusTree;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusInnerIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusLeafIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.DataPageIO;
-import org.apache.ignite.internal.processors.cache.database.tree.io.DataPagePayload;
-import org.apache.ignite.internal.processors.cache.database.tree.io.IOVersions;
-import org.apache.ignite.internal.processors.cache.database.tree.reuse.ReuseList;
+import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
+import org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter;
+import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
+import org.apache.ignite.internal.processors.cache.persistence.RootPage;
+import org.apache.ignite.internal.processors.cache.persistence.RowStore;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.FreeList;
+import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusInnerIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusLeafIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPagePayload;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
+import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf5ce46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteRebalanceIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteRebalanceIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteRebalanceIterator.java
index c191c72..4efe640 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteRebalanceIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteRebalanceIterator.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.internal.processors.cache.database.CacheDataRow;
+import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
import org.apache.ignite.internal.util.lang.GridCloseableIterator;
/**