From 1f5c196a3e3b46f8826d8bee24ba04f116e786d5 Mon Sep 17 00:00:00 2001 From: Tglman Date: Thu, 24 Dec 2015 13:49:37 +0000 Subject: [PATCH] removed unused references to OWALChagesTree --- .../hashindex/local/ODirectoryFirstPage.java | 1 - .../index/hashindex/local/ODirectoryPage.java | 1 - .../index/hashindex/local/OHashIndexBucket.java | 3 +-- .../local/OHashIndexFileLevelMetadataPage.java | 1 - .../core/index/hashindex/local/ONullBucket.java | 1 - .../core/index/sbtree/local/OSBTreeBucket.java | 1 - .../core/index/sbtree/local/OSBTreeValuePage.java | 1 - .../sbtreebonsai/local/OSBTreeBonsaiBucket.java | 15 ++++++--------- .../core/index/sbtreebonsai/local/OSysBucket.java | 5 ++--- .../impl/local/paginated/OClusterPage.java | 11 +++++------ .../paginated/OClusterPositionMapBucket.java | 5 ++--- .../local/paginated/OPaginatedClusterState.java | 5 ++--- .../atomicoperations/OAtomicOperation.java | 2 +- .../local/paginated/base/ODurableComponent.java | 4 ++-- .../impl/local/paginated/base/ODurablePage.java | 1 - 15 files changed, 21 insertions(+), 36 deletions(-) diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ODirectoryFirstPage.java b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ODirectoryFirstPage.java index 85436b70981..d8deceefd95 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ODirectoryFirstPage.java +++ b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ODirectoryFirstPage.java @@ -24,7 +24,6 @@ import com.orientechnologies.orient.core.config.OGlobalConfiguration; import com.orientechnologies.orient.core.storage.cache.OCacheEntry; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; import java.io.IOException; diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ODirectoryPage.java b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ODirectoryPage.java index f58fbee1a5b..a6ab5d78504 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ODirectoryPage.java +++ b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ODirectoryPage.java @@ -25,7 +25,6 @@ import com.orientechnologies.orient.core.storage.cache.OCacheEntry; import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; import java.io.IOException; diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/OHashIndexBucket.java b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/OHashIndexBucket.java index 19b4cbbe641..9e6d6290264 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/OHashIndexBucket.java +++ b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/OHashIndexBucket.java @@ -29,7 +29,6 @@ import com.orientechnologies.orient.core.metadata.schema.OType; import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; @@ -72,7 +71,7 @@ public OHashIndexBucket(int depth, OCacheEntry cacheEntry, OBinarySerializer @SuppressFBWarnings("EI_EXPOSE_REP2") public OHashIndexBucket(OCacheEntry cacheEntry, OBinarySerializer keySerializer, OBinarySerializer valueSerializer, - OType[] keyTypes, OWALChangesTree changesTree) { + OType[] keyTypes, OWALChanges changesTree) { super(cacheEntry, changesTree); this.keySerializer = keySerializer; diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/OHashIndexFileLevelMetadataPage.java b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/OHashIndexFileLevelMetadataPage.java index 322855c8ed0..86c9f9b6086 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/OHashIndexFileLevelMetadataPage.java +++ b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/OHashIndexFileLevelMetadataPage.java @@ -25,7 +25,6 @@ import com.orientechnologies.orient.core.storage.cache.OCacheEntry; import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; import java.io.IOException; diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ONullBucket.java b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ONullBucket.java index ad7cde2d835..ad51792c12f 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ONullBucket.java +++ b/core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/ONullBucket.java @@ -26,7 +26,6 @@ import com.orientechnologies.orient.core.storage.cache.OCacheEntry; import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; /** * @author Andrey Lomakin (a.lomakin-at-orientechnologies.com) diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/sbtree/local/OSBTreeBucket.java b/core/src/main/java/com/orientechnologies/orient/core/index/sbtree/local/OSBTreeBucket.java index 2e1c1f47dfe..0c502521f40 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/index/sbtree/local/OSBTreeBucket.java +++ b/core/src/main/java/com/orientechnologies/orient/core/index/sbtree/local/OSBTreeBucket.java @@ -34,7 +34,6 @@ import com.orientechnologies.orient.core.metadata.schema.OType; import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/sbtree/local/OSBTreeValuePage.java b/core/src/main/java/com/orientechnologies/orient/core/index/sbtree/local/OSBTreeValuePage.java index 00c117f00f6..952094b56a9 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/index/sbtree/local/OSBTreeValuePage.java +++ b/core/src/main/java/com/orientechnologies/orient/core/index/sbtree/local/OSBTreeValuePage.java @@ -27,7 +27,6 @@ import com.orientechnologies.orient.core.storage.cache.OCacheEntry; import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; /** * This page will contain value if it exceeds value limit for SBTree. Value is stored as list of linked pages. Following format is diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSBTreeBonsaiBucket.java b/core/src/main/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSBTreeBonsaiBucket.java index bd6614c82dc..db995c4c183 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSBTreeBonsaiBucket.java +++ b/core/src/main/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSBTreeBonsaiBucket.java @@ -20,12 +20,6 @@ package com.orientechnologies.orient.core.index.sbtreebonsai.local; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; - import com.orientechnologies.common.comparator.ODefaultComparator; import com.orientechnologies.common.serialization.types.OBinarySerializer; import com.orientechnologies.common.serialization.types.OByteSerializer; @@ -33,11 +27,14 @@ import com.orientechnologies.common.serialization.types.OLongSerializer; import com.orientechnologies.orient.core.config.OGlobalConfiguration; import com.orientechnologies.orient.core.exception.OSBTreeBonsaiLocalException; -import com.orientechnologies.orient.core.index.sbtree.local.OSBTree; import com.orientechnologies.orient.core.storage.cache.OCacheEntry; -import com.orientechnologies.orient.core.index.sbtree.local.OSBTreeException; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Map; /** * @author Andrey Lomakin diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSysBucket.java b/core/src/main/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSysBucket.java index d0b4b03807f..e38defd20b6 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSysBucket.java +++ b/core/src/main/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSysBucket.java @@ -20,13 +20,12 @@ package com.orientechnologies.orient.core.index.sbtreebonsai.local; -import java.io.IOException; - import com.orientechnologies.common.serialization.types.OByteSerializer; import com.orientechnologies.common.serialization.types.OLongSerializer; import com.orientechnologies.orient.core.storage.cache.OCacheEntry; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; + +import java.io.IOException; /** *

diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OClusterPage.java b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OClusterPage.java index 5c728e75866..42decd38716 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OClusterPage.java +++ b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OClusterPage.java @@ -20,19 +20,18 @@ package com.orientechnologies.orient.core.storage.impl.local.paginated; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - import com.orientechnologies.common.serialization.types.OByteSerializer; import com.orientechnologies.common.serialization.types.OIntegerSerializer; import com.orientechnologies.common.serialization.types.OLongSerializer; import com.orientechnologies.orient.core.config.OGlobalConfiguration; +import com.orientechnologies.orient.core.record.ORecordVersionHelper; import com.orientechnologies.orient.core.storage.cache.OCacheEntry; import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; -import com.orientechnologies.orient.core.record.ORecordVersionHelper; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; /** * @author Andrey Lomakin diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OClusterPositionMapBucket.java b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OClusterPositionMapBucket.java index cde19aeac15..3a07fe65166 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OClusterPositionMapBucket.java +++ b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OClusterPositionMapBucket.java @@ -20,8 +20,6 @@ package com.orientechnologies.orient.core.storage.impl.local.paginated; -import java.io.IOException; - import com.orientechnologies.common.serialization.types.OByteSerializer; import com.orientechnologies.common.serialization.types.OIntegerSerializer; import com.orientechnologies.common.serialization.types.OLongSerializer; @@ -29,7 +27,8 @@ import com.orientechnologies.orient.core.storage.cache.OCacheEntry; import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; + +import java.io.IOException; /** * @author Andrey Lomakin (a.lomakin-at-orientechnologies.com) diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OPaginatedClusterState.java b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OPaginatedClusterState.java index c4fa9b465b4..8dd1ebe8861 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OPaginatedClusterState.java +++ b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OPaginatedClusterState.java @@ -20,13 +20,12 @@ package com.orientechnologies.orient.core.storage.impl.local.paginated; -import java.io.IOException; - import com.orientechnologies.common.serialization.types.OLongSerializer; import com.orientechnologies.orient.core.storage.cache.OCacheEntry; import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; + +import java.io.IOException; /** * @author Andrey Lomakin diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/atomicoperations/OAtomicOperation.java b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/atomicoperations/OAtomicOperation.java index 8aea4994435..3c0e7afb9c7 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/atomicoperations/OAtomicOperation.java +++ b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/atomicoperations/OAtomicOperation.java @@ -193,7 +193,7 @@ public void releasePage(OCacheEntry cacheEntry) { readCache.release(cacheEntry, writeCache, storagePerformanceStatistic); } - public OWALChangesTree getChangesTree(long fileId, long pageIndex) { + public OWALChanges getChangesTree(long fileId, long pageIndex) { fileId = checkFileIdCompatibilty(fileId, storageId); if (deletedFiles.contains(fileId)) diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/base/ODurableComponent.java b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/base/ODurableComponent.java index 898ecd17949..54667f6194b 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/base/ODurableComponent.java +++ b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/base/ODurableComponent.java @@ -27,7 +27,7 @@ import com.orientechnologies.orient.core.storage.impl.local.OAbstractPaginatedStorage; import com.orientechnologies.orient.core.storage.impl.local.paginated.atomicoperations.OAtomicOperation; import com.orientechnologies.orient.core.storage.impl.local.paginated.atomicoperations.OAtomicOperationsManager; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; import com.orientechnologies.orient.core.storage.impl.local.statistic.OSessionStoragePerformanceStatistic; import com.orientechnologies.orient.core.storage.impl.local.statistic.OStoragePerformanceStatistic; @@ -115,7 +115,7 @@ protected OAtomicOperation startAtomicOperation(boolean trackNonTxOperations) th return atomicOperationsManager.startAtomicOperation(this, trackNonTxOperations); } - protected OWALChangesTree getChangesTree(OAtomicOperation atomicOperation, OCacheEntry entry) { + protected OWALChanges getChangesTree(OAtomicOperation atomicOperation, OCacheEntry entry) { if (atomicOperation == null) return null; diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/base/ODurablePage.java b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/base/ODurablePage.java index bbf1998d89c..376986dfe97 100755 --- a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/base/ODurablePage.java +++ b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/base/ODurablePage.java @@ -32,7 +32,6 @@ import com.orientechnologies.orient.core.storage.cache.local.OWOWCache; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OLogSequenceNumber; import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChanges; -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALChangesTree; import java.io.IOException;