Renaming classes and vars.
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
index eaa2585..c8ed0d0 100644
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
+++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
@@ -76,10 +76,10 @@
public class LSMBTree extends AbstractLSMIndex implements ITreeIndex {
// For creating BTree's used in flush and merge.
- private final LSMBTreeImmutableComponentFactory componentFactory;
+ private final LSMBTreeDiskComponentFactory componentFactory;
// For creating BTree's used in bulk load. Different from diskBTreeFactory
// because it should have a different tuple writer in it's leaf frames.
- private final LSMBTreeImmutableComponentFactory bulkLoadComponentFactory;
+ private final LSMBTreeDiskComponentFactory bulkLoadComponentFactory;
// Common for in-memory and on-disk components.
private final ITreeIndexFrameFactory insertLeafFrameFactory;
@@ -97,20 +97,20 @@
bloomFilterFalsePositiveRate, mergePolicy, opTracker, ioScheduler, ioOpCallbackProvider);
int i = 0;
for (IVirtualBufferCache virtualBufferCache : virtualBufferCaches) {
- LSMBTreeMutableComponent mutableComponent = new LSMBTreeMutableComponent(new BTree(virtualBufferCache,
+ LSMBTreeMemoryComponent mutableComponent = new LSMBTreeMemoryComponent(new BTree(virtualBufferCache,
virtualBufferCache.getFileMapProvider(), new VirtualFreePageManager(
virtualBufferCache.getNumPages()), interiorFrameFactory, insertLeafFrameFactory,
cmpFactories, fieldCount, new FileReference(new File(fileManager.getBaseDir() + "_virtual_" + i))),
virtualBufferCache, i == 0 ? true : false);
- mutableComponents.add(mutableComponent);
+ memoryComponents.add(mutableComponent);
++i;
}
this.insertLeafFrameFactory = insertLeafFrameFactory;
this.deleteLeafFrameFactory = deleteLeafFrameFactory;
this.cmpFactories = cmpFactories;
- componentFactory = new LSMBTreeImmutableComponentFactory(diskBTreeFactory, bloomFilterFactory);
- bulkLoadComponentFactory = new LSMBTreeImmutableComponentFactory(bulkLoadBTreeFactory, bloomFilterFactory);
+ componentFactory = new LSMBTreeDiskComponentFactory(diskBTreeFactory, bloomFilterFactory);
+ bulkLoadComponentFactory = new LSMBTreeDiskComponentFactory(bulkLoadBTreeFactory, bloomFilterFactory);
}
@Override
@@ -129,8 +129,8 @@
if (isActivated) {
throw new HyracksDataException("Failed to activate the index since it is already activated.");
}
- for (ILSMComponent c : mutableComponents) {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) c;
((IVirtualBufferCache) mutableComponent.getBTree().getBufferCache()).open();
mutableComponent.getBTree().create();
mutableComponent.getBTree().activate();
@@ -144,7 +144,7 @@
throw new HyracksDataException(e);
}
for (LSMComponentFileReferences lsmComonentFileReference : validFileReferences) {
- LSMBTreeImmutableComponent component;
+ LSMBTreeDiskComponent component;
try {
component = createDiskComponent(componentFactory,
lsmComonentFileReference.getInsertIndexFileReference(),
@@ -177,14 +177,14 @@
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- LSMBTreeImmutableComponent component = (LSMBTreeImmutableComponent) c;
+ LSMBTreeDiskComponent component = (LSMBTreeDiskComponent) c;
BTree btree = component.getBTree();
BloomFilter bloomFilter = component.getBloomFilter();
btree.deactivate();
bloomFilter.deactivate();
}
- for (ILSMComponent c : mutableComponents) {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) c;
mutableComponent.getBTree().deactivate();
mutableComponent.getBTree().destroy();
((IVirtualBufferCache) mutableComponent.getBTree().getBufferCache()).close();
@@ -205,12 +205,12 @@
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- LSMBTreeImmutableComponent component = (LSMBTreeImmutableComponent) c;
+ LSMBTreeDiskComponent component = (LSMBTreeDiskComponent) c;
component.getBTree().destroy();
component.getBloomFilter().destroy();
}
- for (ILSMComponent c : mutableComponents) {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) c;
mutableComponent.getBTree().destroy();
}
fileManager.deleteDirs();
@@ -223,13 +223,13 @@
}
List<ILSMComponent> immutableComponents = diskComponents;
- for (ILSMComponent c : mutableComponents) {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) c;
mutableComponent.getBTree().clear();
mutableComponent.reset();
}
for (ILSMComponent c : immutableComponents) {
- LSMBTreeImmutableComponent component = (LSMBTreeImmutableComponent) c;
+ LSMBTreeDiskComponent component = (LSMBTreeDiskComponent) c;
component.getBloomFilter().deactivate();
component.getBTree().deactivate();
component.getBloomFilter().destroy();
@@ -245,27 +245,27 @@
operationalComponents.clear();
int cmc = currentMutableComponentId.get();
ctx.setCurrentMutableComponentId(cmc);
- int numMutableComponents = mutableComponents.size();
+ int numMutableComponents = memoryComponents.size();
switch (ctx.getOperation()) {
case UPDATE:
case UPSERT:
case PHYSICALDELETE:
case FLUSH:
case DELETE:
- operationalComponents.add(mutableComponents.get(cmc));
+ operationalComponents.add(memoryComponents.get(cmc));
break;
case SEARCH:
case INSERT:
for (int i = 0; i < numMutableComponents - 1; i++) {
- ILSMComponent c = mutableComponents.get((cmc + i + 1) % numMutableComponents);
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) c;
+ ILSMComponent c = memoryComponents.get((cmc + i + 1) % numMutableComponents);
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) c;
if (mutableComponent.isReadable()) {
// Make sure newest components are added first
operationalComponents.add(0, mutableComponent);
}
}
// The current mutable component is always added
- operationalComponents.add(0, mutableComponents.get(cmc));
+ operationalComponents.add(0, memoryComponents.get(cmc));
operationalComponents.addAll(immutableComponents);
break;
case MERGE:
@@ -294,7 +294,7 @@
private boolean insert(ITupleReference tuple, LSMBTreeOpContext ctx) throws HyracksDataException, IndexException {
ILSMComponent c = ctx.getComponentHolder().get(0);
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) c;
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) c;
MultiComparator comparator = MultiComparator.createIgnoreFieldLength(mutableComponent.getBTree()
.getComparatorFactories());
LSMBTreePointSearchCursor searchCursor = new LSMBTreePointSearchCursor(ctx);
@@ -372,7 +372,7 @@
@Override
public ILSMComponent flush(ILSMIOOperation operation) throws HyracksDataException, IndexException {
LSMBTreeFlushOperation flushOp = (LSMBTreeFlushOperation) operation;
- LSMBTreeMutableComponent flushingComponent = (LSMBTreeMutableComponent) flushOp.getFlushingComponent();
+ LSMBTreeMemoryComponent flushingComponent = (LSMBTreeMemoryComponent) flushOp.getFlushingComponent();
IIndexAccessor accessor = flushingComponent.getBTree().createAccessor(NoOpOperationCallback.INSTANCE,
NoOpOperationCallback.INSTANCE);
@@ -395,7 +395,7 @@
BloomFilterSpecification bloomFilterSpec = BloomCalculations.computeBloomSpec(maxBucketsPerElement,
bloomFilterFalsePositiveRate);
- LSMBTreeImmutableComponent component = createDiskComponent(componentFactory, flushOp.getBTreeFlushTarget(),
+ LSMBTreeDiskComponent component = createDiskComponent(componentFactory, flushOp.getBTreeFlushTarget(),
flushOp.getBloomFilterFlushTarget(), true);
IIndexBulkLoader bulkLoader = component.getBTree().createBulkLoader(1.0f, false, numElements, false);
IIndexBulkLoader builder = component.getBloomFilter().createBuilder(numElements,
@@ -425,8 +425,8 @@
List<ILSMComponent> mergingComponents = ctx.getComponentHolder();
ITreeIndexCursor cursor = new LSMBTreeRangeSearchCursor(opCtx);
- BTree firstBTree = (BTree) ((LSMBTreeImmutableComponent) mergingComponents.get(0)).getBTree();
- BTree lastBTree = (BTree) ((LSMBTreeImmutableComponent) mergingComponents.get(mergingComponents.size() - 1))
+ BTree firstBTree = (BTree) ((LSMBTreeDiskComponent) mergingComponents.get(0)).getBTree();
+ BTree lastBTree = (BTree) ((LSMBTreeDiskComponent) mergingComponents.get(mergingComponents.size() - 1))
.getBTree();
FileReference firstFile = diskFileMapProvider.lookupFileName(firstBTree.getFileId());
FileReference lastFile = diskFileMapProvider.lookupFileName(lastBTree.getFileId());
@@ -449,13 +449,13 @@
long numElements = 0L;
for (int i = 0; i < mergedComponents.size(); ++i) {
- numElements += ((LSMBTreeImmutableComponent) mergedComponents.get(i)).getBloomFilter().getNumElements();
+ numElements += ((LSMBTreeDiskComponent) mergedComponents.get(i)).getBloomFilter().getNumElements();
}
int maxBucketsPerElement = BloomCalculations.maxBucketsPerElement(numElements);
BloomFilterSpecification bloomFilterSpec = BloomCalculations.computeBloomSpec(maxBucketsPerElement,
bloomFilterFalsePositiveRate);
- LSMBTreeImmutableComponent mergedComponent = createDiskComponent(componentFactory,
+ LSMBTreeDiskComponent mergedComponent = createDiskComponent(componentFactory,
mergeOp.getBTreeMergeTarget(), mergeOp.getBloomFilterMergeTarget(), true);
IIndexBulkLoader bulkLoader = mergedComponent.getBTree().createBulkLoader(1.0f, false, numElements, false);
@@ -476,11 +476,11 @@
return mergedComponent;
}
- private LSMBTreeImmutableComponent createDiskComponent(LSMBTreeImmutableComponentFactory factory,
+ private LSMBTreeDiskComponent createDiskComponent(LSMBTreeDiskComponentFactory factory,
FileReference btreeFileRef, FileReference bloomFilterFileRef, boolean createComponent)
throws HyracksDataException, IndexException {
// Create new BTree instance.
- LSMBTreeImmutableComponent component = (LSMBTreeImmutableComponent) factory
+ LSMBTreeDiskComponent component = (LSMBTreeDiskComponent) factory
.createLSMComponentInstance(new LSMComponentFileReferences(btreeFileRef, null, bloomFilterFileRef));
if (createComponent) {
component.getBTree().create();
@@ -512,7 +512,7 @@
public void markAsValid(ILSMComponent lsmComponent) throws HyracksDataException {
// The order of forcing the dirty page to be flushed is critical. The
// bloom filter must be always done first.
- LSMBTreeImmutableComponent component = (LSMBTreeImmutableComponent) lsmComponent;
+ LSMBTreeDiskComponent component = (LSMBTreeDiskComponent) lsmComponent;
// Flush the bloom filter first.
int fileId = component.getBloomFilter().getFileId();
IBufferCache bufferCache = component.getBTree().getBufferCache();
@@ -541,13 +541,13 @@
} catch (HyracksDataException | IndexException e) {
throw new TreeIndexException(e);
}
- bulkLoader = (BTreeBulkLoader) ((LSMBTreeImmutableComponent) component).getBTree().createBulkLoader(
+ bulkLoader = (BTreeBulkLoader) ((LSMBTreeDiskComponent) component).getBTree().createBulkLoader(
fillFactor, verifyInput, numElementsHint, false);
int maxBucketsPerElement = BloomCalculations.maxBucketsPerElement(numElementsHint);
BloomFilterSpecification bloomFilterSpec = BloomCalculations.computeBloomSpec(maxBucketsPerElement,
bloomFilterFalsePositiveRate);
- builder = ((LSMBTreeImmutableComponent) component).getBloomFilter().createBuilder(numElementsHint,
+ builder = ((LSMBTreeDiskComponent) component).getBloomFilter().createBuilder(numElementsHint,
bloomFilterSpec.getNumHashes(), bloomFilterSpec.getNumBucketsPerElements());
}
@@ -573,10 +573,10 @@
builder.end();
endedBloomFilterLoad = true;
}
- ((LSMBTreeImmutableComponent) component).getBTree().deactivate();
- ((LSMBTreeImmutableComponent) component).getBTree().destroy();
- ((LSMBTreeImmutableComponent) component).getBloomFilter().deactivate();
- ((LSMBTreeImmutableComponent) component).getBloomFilter().destroy();
+ ((LSMBTreeDiskComponent) component).getBTree().deactivate();
+ ((LSMBTreeDiskComponent) component).getBTree().destroy();
+ ((LSMBTreeDiskComponent) component).getBloomFilter().deactivate();
+ ((LSMBTreeDiskComponent) component).getBloomFilter().destroy();
}
}
@@ -599,7 +599,7 @@
public LSMBTreeOpContext createOpContext(IModificationOperationCallback modificationCallback,
ISearchOperationCallback searchCallback) {
- return new LSMBTreeOpContext(mutableComponents, insertLeafFrameFactory, deleteLeafFrameFactory,
+ return new LSMBTreeOpContext(memoryComponents, insertLeafFrameFactory, deleteLeafFrameFactory,
modificationCallback, searchCallback, componentFactory.getBloomFilterKeyFields().length);
}
@@ -636,35 +636,35 @@
@Override
public ITreeIndexFrameFactory getInteriorFrameFactory() {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) mutableComponents
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getBTree().getInteriorFrameFactory();
}
@Override
public int getFieldCount() {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) mutableComponents
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getBTree().getFieldCount();
}
@Override
public int getFileId() {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) mutableComponents
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getBTree().getFileId();
}
@Override
public IFreePageManager getFreePageManager() {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) mutableComponents
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getBTree().getFreePageManager();
}
@Override
public ITreeIndexFrameFactory getLeafFrameFactory() {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) mutableComponents
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getBTree().getLeafFrameFactory();
}
@@ -672,8 +672,8 @@
@Override
public long getMemoryAllocationSize() {
long size = 0;
- for (ILSMComponent c : mutableComponents) {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) c;
IBufferCache virtualBufferCache = mutableComponent.getBTree().getBufferCache();
size += virtualBufferCache.getNumPages() * virtualBufferCache.getPageSize();
}
@@ -682,20 +682,20 @@
@Override
public int getRootPageId() {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) mutableComponents
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getBTree().getRootPageId();
}
@Override
public void validate() throws HyracksDataException {
- for (ILSMComponent c : mutableComponents) {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) c;
mutableComponent.getBTree().validate();
}
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- BTree btree = (BTree) ((LSMBTreeImmutableComponent) c).getBTree();
+ BTree btree = (BTree) ((LSMBTreeDiskComponent) c).getBTree();
btree.validate();
}
}
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeImmutableComponent.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeImmutableComponent.java
deleted file mode 100644
index add1f63..0000000
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeImmutableComponent.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * you may obtain a copy of the License from
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.uci.ics.hyracks.storage.am.lsm.btree.impls;
-
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.storage.am.bloomfilter.impls.BloomFilter;
-import edu.uci.ics.hyracks.storage.am.btree.impls.BTree;
-import edu.uci.ics.hyracks.storage.am.lsm.common.impls.AbstractDiskLSMComponent;
-
-public class LSMBTreeImmutableComponent extends AbstractDiskLSMComponent {
- private final BTree btree;
- private final BloomFilter bloomFilter;
-
- public LSMBTreeImmutableComponent(BTree btree, BloomFilter bloomFilter) {
- this.btree = btree;
- this.bloomFilter = bloomFilter;
- }
-
- @Override
- public void destroy() throws HyracksDataException {
- btree.deactivate();
- btree.destroy();
- bloomFilter.deactivate();
- bloomFilter.destroy();
- }
-
- public BTree getBTree() {
- return btree;
- }
-
- public BloomFilter getBloomFilter() {
- return bloomFilter;
- }
-}
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeImmutableComponentFactory.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeImmutableComponentFactory.java
deleted file mode 100644
index 0efdc65..0000000
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeImmutableComponentFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * you may obtain a copy of the License from
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.uci.ics.hyracks.storage.am.lsm.btree.impls;
-
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.storage.am.bloomfilter.impls.BloomFilterFactory;
-import edu.uci.ics.hyracks.storage.am.btree.impls.BTree;
-import edu.uci.ics.hyracks.storage.am.common.api.IndexException;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMComponent;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMComponentFactory;
-import edu.uci.ics.hyracks.storage.am.lsm.common.impls.LSMComponentFileReferences;
-import edu.uci.ics.hyracks.storage.am.lsm.common.impls.TreeIndexFactory;
-import edu.uci.ics.hyracks.storage.common.buffercache.IBufferCache;
-
-public class LSMBTreeImmutableComponentFactory implements ILSMComponentFactory {
- private final TreeIndexFactory<BTree> btreeFactory;
- private final BloomFilterFactory bloomFilterFactory;
-
- public LSMBTreeImmutableComponentFactory(TreeIndexFactory<BTree> btreeFactory, BloomFilterFactory bloomFilterFactory) {
- this.btreeFactory = btreeFactory;
- this.bloomFilterFactory = bloomFilterFactory;
- }
-
- @Override
- public ILSMComponent createLSMComponentInstance(LSMComponentFileReferences cfr) throws IndexException,
- HyracksDataException {
- return new LSMBTreeImmutableComponent(btreeFactory.createIndexInstance(cfr.getInsertIndexFileReference()),
- bloomFilterFactory.createBloomFiltertInstance(cfr.getBloomFilterFileReference()));
- }
-
- @Override
- public IBufferCache getBufferCache() {
- return btreeFactory.getBufferCache();
- }
-
- public int[] getBloomFilterKeyFields() {
- return bloomFilterFactory.getBloomFilterKeyFields();
- }
-}
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeMergeOperation.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeMergeOperation.java
index fd3f1fd..bfa6000 100644
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeMergeOperation.java
+++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeMergeOperation.java
@@ -53,7 +53,7 @@
public Set<IODeviceHandle> getReadDevices() {
Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
for (ILSMComponent o : mergingComponents) {
- LSMBTreeImmutableComponent component = (LSMBTreeImmutableComponent) o;
+ LSMBTreeDiskComponent component = (LSMBTreeDiskComponent) o;
devs.add(component.getBTree().getFileReference().getDeviceHandle());
devs.add(component.getBloomFilter().getFileReference().getDeviceHandle());
}
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeMutableComponent.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeMutableComponent.java
deleted file mode 100644
index 63dd0ae..0000000
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeMutableComponent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * you may obtain a copy of the License from
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.uci.ics.hyracks.storage.am.lsm.btree.impls;
-
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.storage.am.btree.impls.BTree;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.IVirtualBufferCache;
-import edu.uci.ics.hyracks.storage.am.lsm.common.impls.AbstractMemoryLSMComponent;
-
-public class LSMBTreeMutableComponent extends AbstractMemoryLSMComponent {
-
- private final BTree btree;
-
- public LSMBTreeMutableComponent(BTree btree, IVirtualBufferCache vbc, boolean isActive) {
- super(vbc, isActive);
- this.btree = btree;
- }
-
- public BTree getBTree() {
- return btree;
- }
-
- @Override
- protected void reset() throws HyracksDataException {
- super.reset();
- btree.deactivate();
- btree.destroy();
- btree.create();
- btree.activate();
- }
-
-}
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeOpContext.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeOpContext.java
index d36f45d..6d2d7c0 100644
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeOpContext.java
+++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeOpContext.java
@@ -52,7 +52,7 @@
public LSMBTreeOpContext(List<ILSMComponent> mutableComponents, ITreeIndexFrameFactory insertLeafFrameFactory,
ITreeIndexFrameFactory deleteLeafFrameFactory, IModificationOperationCallback modificationCallback,
ISearchOperationCallback searchCallback, int numBloomFilterKeyFields) {
- LSMBTreeMutableComponent c = (LSMBTreeMutableComponent) mutableComponents.get(0);
+ LSMBTreeMemoryComponent c = (LSMBTreeMemoryComponent) mutableComponents.get(0);
IBinaryComparatorFactory cmpFactories[] = c.getBTree().getComparatorFactories();
if (cmpFactories[0] != null) {
this.cmp = MultiComparator.create(c.getBTree().getComparatorFactories());
@@ -66,7 +66,7 @@
mutableBTreeAccessors = new BTree.BTreeAccessor[mutableComponents.size()];
mutableBTreeOpCtxs = new BTreeOpContext[mutableComponents.size()];
for (int i = 0; i < mutableComponents.size(); i++) {
- LSMBTreeMutableComponent mutableComponent = (LSMBTreeMutableComponent) mutableComponents.get(i);
+ LSMBTreeMemoryComponent mutableComponent = (LSMBTreeMemoryComponent) mutableComponents.get(i);
mutableBTrees[i] = mutableComponent.getBTree();
mutableBTreeAccessors[i] = (BTree.BTreeAccessor) mutableBTrees[i].createAccessor(modificationCallback,
NoOpOperationCallback.INSTANCE);
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
index 005629f..fc09a74 100644
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
+++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
@@ -159,11 +159,11 @@
includeMutableComponent = true;
// No need for a bloom filter for the in-memory BTree.
rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
- btree = (BTree) ((LSMBTreeMutableComponent) component).getBTree();
+ btree = (BTree) ((LSMBTreeMemoryComponent) component).getBTree();
} else {
rangeCursors[i] = new BloomFilterAwareBTreePointSearchCursor(leafFrame, false,
- ((LSMBTreeImmutableComponent) component).getBloomFilter());
- btree = (BTree) ((LSMBTreeImmutableComponent) component).getBTree();
+ ((LSMBTreeDiskComponent) component).getBloomFilter());
+ btree = (BTree) ((LSMBTreeDiskComponent) component).getBTree();
}
btreeAccessors[i] = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
}
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
index d832583..6eada4b 100644
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
+++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
@@ -194,9 +194,9 @@
rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
if (component.getType() == LSMComponentType.MEMORY) {
includeMutableComponent = true;
- btree = (BTree) ((LSMBTreeMutableComponent) component).getBTree();
+ btree = (BTree) ((LSMBTreeMemoryComponent) component).getBTree();
} else {
- btree = (BTree) ((LSMBTreeImmutableComponent) component).getBTree();
+ btree = (BTree) ((LSMBTreeDiskComponent) component).getBTree();
}
btreeAccessors[i] = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
btreeAccessors[i].search(rangeCursors[i], searchPred);
diff --git a/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java b/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
index 8b675f2..794f440 100644
--- a/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
+++ b/hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
@@ -45,7 +45,7 @@
protected final ILSMIOOperationCallbackProvider ioOpCallbackProvider;
// In-memory components.
- protected final List<ILSMComponent> mutableComponents;
+ protected final List<ILSMComponent> memoryComponents;
protected final List<IVirtualBufferCache> virtualBufferCaches;
protected AtomicInteger currentMutableComponentId;
@@ -74,7 +74,7 @@
lsmHarness = new LSMHarness(this, mergePolicy, opTracker);
isActivated = false;
diskComponents = new LinkedList<ILSMComponent>();
- mutableComponents = new ArrayList<ILSMComponent>();
+ memoryComponents = new ArrayList<ILSMComponent>();
currentMutableComponentId = new AtomicInteger();
flushRequests = new AtomicBoolean[virtualBufferCaches.size()];
for (int i = 0; i < virtualBufferCaches.size(); i++) {
@@ -149,8 +149,8 @@
@Override
public void changeMutableComponent() {
- currentMutableComponentId.set((currentMutableComponentId.get() + 1) % mutableComponents.size());
- ((AbstractMemoryLSMComponent) mutableComponents.get(currentMutableComponentId.get())).setActive();
+ currentMutableComponentId.set((currentMutableComponentId.get() + 1) % memoryComponents.size());
+ ((AbstractMemoryLSMComponent) memoryComponents.get(currentMutableComponentId.get())).setActive();
}
@Override
@@ -185,7 +185,7 @@
public boolean isEmptyIndex() throws HyracksDataException {
boolean isModified = false;
- for (ILSMComponent c : mutableComponents) {
+ for (ILSMComponent c : memoryComponents) {
AbstractMemoryLSMComponent mutableComponent = (AbstractMemoryLSMComponent) c;
if (mutableComponent.isModified()) {
isModified = true;
diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
index 5b4f711..c8fdca8 100644
--- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
+++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
@@ -121,9 +121,9 @@
virtualBufferCache.getNumPages()), ((IVirtualBufferCache) virtualBufferCache).getFileMapProvider(),
invListTypeTraits, invListCmpFactories, BTreeLeafFrameType.REGULAR_NSM, new FileReference(new File(
fileManager.getBaseDir() + "_virtual_del_" + i)));
- LSMInvertedIndexMutableComponent mutableComponent = new LSMInvertedIndexMutableComponent(memInvIndex,
+ LSMInvertedIndexMemoryComponent mutableComponent = new LSMInvertedIndexMemoryComponent(memInvIndex,
deleteKeysBTree, virtualBufferCache, i == 0 ? true : false);
- mutableComponents.add(mutableComponent);
+ memoryComponents.add(mutableComponent);
++i;
}
}
@@ -147,8 +147,8 @@
try {
List<ILSMComponent> immutableComponents = diskComponents;
- for (ILSMComponent c : mutableComponents) {
- LSMInvertedIndexMutableComponent mutableComponent = (LSMInvertedIndexMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMInvertedIndexMemoryComponent mutableComponent = (LSMInvertedIndexMemoryComponent) c;
((IVirtualBufferCache) mutableComponent.getInvIndex().getBufferCache()).open();
mutableComponent.getInvIndex().create();
mutableComponent.getInvIndex().activate();
@@ -159,7 +159,7 @@
immutableComponents.clear();
List<LSMComponentFileReferences> validFileReferences = fileManager.cleanupAndGetValidFiles();
for (LSMComponentFileReferences lsmComonentFileReference : validFileReferences) {
- LSMInvertedIndexImmutableComponent component;
+ LSMInvertedIndexDiskComponent component;
try {
component = createDiskInvIndexComponent(componentFactory,
lsmComonentFileReference.getInsertIndexFileReference(),
@@ -183,15 +183,15 @@
throw new HyracksDataException("Failed to clear the index since it is not activated.");
}
- for (ILSMComponent c : mutableComponents) {
- LSMInvertedIndexMutableComponent mutableComponent = (LSMInvertedIndexMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMInvertedIndexMemoryComponent mutableComponent = (LSMInvertedIndexMemoryComponent) c;
mutableComponent.getInvIndex().clear();
mutableComponent.getDeletedKeysBTree().clear();
mutableComponent.reset();
}
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- LSMInvertedIndexImmutableComponent component = (LSMInvertedIndexImmutableComponent) c;
+ LSMInvertedIndexDiskComponent component = (LSMInvertedIndexDiskComponent) c;
component.getBloomFilter().deactivate();
component.getInvIndex().deactivate();
component.getDeletedKeysBTree().deactivate();
@@ -223,13 +223,13 @@
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- LSMInvertedIndexImmutableComponent component = (LSMInvertedIndexImmutableComponent) c;
+ LSMInvertedIndexDiskComponent component = (LSMInvertedIndexDiskComponent) c;
component.getBloomFilter().deactivate();
component.getInvIndex().deactivate();
component.getDeletedKeysBTree().deactivate();
}
- for (ILSMComponent c : mutableComponents) {
- LSMInvertedIndexMutableComponent mutableComponent = (LSMInvertedIndexMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMInvertedIndexMemoryComponent mutableComponent = (LSMInvertedIndexMemoryComponent) c;
mutableComponent.getInvIndex().deactivate();
mutableComponent.getDeletedKeysBTree().deactivate();
mutableComponent.getInvIndex().destroy();
@@ -249,14 +249,14 @@
throw new HyracksDataException("Failed to destroy the index since it is activated.");
}
- for (ILSMComponent c : mutableComponents) {
- LSMInvertedIndexMutableComponent mutableComponent = (LSMInvertedIndexMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMInvertedIndexMemoryComponent mutableComponent = (LSMInvertedIndexMemoryComponent) c;
mutableComponent.getInvIndex().destroy();
mutableComponent.getDeletedKeysBTree().destroy();
}
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- LSMInvertedIndexImmutableComponent component = (LSMInvertedIndexImmutableComponent) c;
+ LSMInvertedIndexDiskComponent component = (LSMInvertedIndexDiskComponent) c;
component.getInvIndex().destroy();
component.getDeletedKeysBTree().destroy();
component.getBloomFilter().destroy();
@@ -271,24 +271,24 @@
operationalComponents.clear();
int cmc = currentMutableComponentId.get();
ctx.setCurrentMutableComponentId(cmc);
- int numMutableComponents = mutableComponents.size();
+ int numMutableComponents = memoryComponents.size();
switch (ctx.getOperation()) {
case FLUSH:
case DELETE:
case INSERT:
- operationalComponents.add(mutableComponents.get(cmc));
+ operationalComponents.add(memoryComponents.get(cmc));
break;
case SEARCH:
for (int i = 0; i < numMutableComponents - 1; i++) {
- ILSMComponent c = mutableComponents.get((cmc + i + 1) % numMutableComponents);
- LSMInvertedIndexMutableComponent mutableComponent = (LSMInvertedIndexMutableComponent) c;
+ ILSMComponent c = memoryComponents.get((cmc + i + 1) % numMutableComponents);
+ LSMInvertedIndexMemoryComponent mutableComponent = (LSMInvertedIndexMemoryComponent) c;
if (mutableComponent.isReadable()) {
// Make sure newest components are added first
operationalComponents.add(0, mutableComponent);
}
}
// The current mutable component is always added
- operationalComponents.add(0, mutableComponents.get(cmc));
+ operationalComponents.add(0, memoryComponents.get(cmc));
operationalComponents.addAll(immutableComponents);
break;
case MERGE:
@@ -362,18 +362,18 @@
ILSMComponent component = operationalComponents.get(i);
if (component.getType() == LSMComponentType.MEMORY) {
includeMutableComponent = true;
- IIndexAccessor invIndexAccessor = ((LSMInvertedIndexMutableComponent) component).getInvIndex()
+ IIndexAccessor invIndexAccessor = ((LSMInvertedIndexMemoryComponent) component).getInvIndex()
.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
indexAccessors.add(invIndexAccessor);
- IIndexAccessor deletedKeysAccessor = ((LSMInvertedIndexMutableComponent) component)
+ IIndexAccessor deletedKeysAccessor = ((LSMInvertedIndexMemoryComponent) component)
.getDeletedKeysBTree().createAccessor(NoOpOperationCallback.INSTANCE,
NoOpOperationCallback.INSTANCE);
deletedKeysBTreeAccessors.add(deletedKeysAccessor);
} else {
- IIndexAccessor invIndexAccessor = ((LSMInvertedIndexImmutableComponent) component).getInvIndex()
+ IIndexAccessor invIndexAccessor = ((LSMInvertedIndexDiskComponent) component).getInvIndex()
.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
indexAccessors.add(invIndexAccessor);
- IIndexAccessor deletedKeysAccessor = ((LSMInvertedIndexImmutableComponent) component)
+ IIndexAccessor deletedKeysAccessor = ((LSMInvertedIndexDiskComponent) component)
.getDeletedKeysBTree().createAccessor(NoOpOperationCallback.INSTANCE,
NoOpOperationCallback.INSTANCE);
deletedKeysBTreeAccessors.add(deletedKeysAccessor);
@@ -397,16 +397,16 @@
if (pred instanceof InvertedIndexSearchPredicate) {
initState = new LSMInvertedIndexSearchCursorInitialState(keyCmp, keysOnlyTuple, indexAccessors,
deletedKeysBTreeAccessors,
- ((LSMInvertedIndexMutableComponent) mutableComponents.get(currentMutableComponentId.get()))
+ ((LSMInvertedIndexMemoryComponent) memoryComponents.get(currentMutableComponentId.get()))
.getDeletedKeysBTree().getLeafFrameFactory(), ictx, includeMutableComponent, lsmHarness,
operationalComponents);
} else {
- LSMInvertedIndexMutableComponent mutableComponent = (LSMInvertedIndexMutableComponent) mutableComponents
+ LSMInvertedIndexMemoryComponent mutableComponent = (LSMInvertedIndexMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
InMemoryInvertedIndex memInvIndex = (InMemoryInvertedIndex) mutableComponent.getInvIndex();
MultiComparator tokensAndKeysCmp = MultiComparator.create(memInvIndex.getBTree().getComparatorFactories());
initState = new LSMInvertedIndexRangeSearchCursorInitialState(tokensAndKeysCmp, keyCmp, keysOnlyTuple,
- ((LSMInvertedIndexMutableComponent) mutableComponents.get(currentMutableComponentId.get()))
+ ((LSMInvertedIndexMemoryComponent) memoryComponents.get(currentMutableComponentId.get()))
.getDeletedKeysBTree().getLeafFrameFactory(), includeMutableComponent, lsmHarness,
indexAccessors, deletedKeysBTreeAccessors, pred, operationalComponents);
}
@@ -446,13 +446,13 @@
LSMInvertedIndexFlushOperation flushOp = (LSMInvertedIndexFlushOperation) operation;
// Create an inverted index instance to be bulk loaded.
- LSMInvertedIndexImmutableComponent component = createDiskInvIndexComponent(componentFactory,
+ LSMInvertedIndexDiskComponent component = createDiskInvIndexComponent(componentFactory,
flushOp.getDictBTreeFlushTarget(), flushOp.getDeletedKeysBTreeFlushTarget(),
flushOp.getBloomFilterFlushTarget(), true);
IInvertedIndex diskInvertedIndex = component.getInvIndex();
// Create a scan cursor on the BTree underlying the in-memory inverted index.
- LSMInvertedIndexMutableComponent flushingComponent = (LSMInvertedIndexMutableComponent) flushOp
+ LSMInvertedIndexMemoryComponent flushingComponent = (LSMInvertedIndexMemoryComponent) flushOp
.getFlushingComponent();
InMemoryInvertedIndexAccessor memInvIndexAccessor = (InMemoryInvertedIndexAccessor) flushingComponent
.getInvIndex().createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
@@ -530,12 +530,12 @@
List<ILSMComponent> mergingComponents = ctx.getComponentHolder();
IIndexCursor cursor = new LSMInvertedIndexRangeSearchCursor(ictx);
- LSMInvertedIndexImmutableComponent firstComponent = (LSMInvertedIndexImmutableComponent) mergingComponents
+ LSMInvertedIndexDiskComponent firstComponent = (LSMInvertedIndexDiskComponent) mergingComponents
.get(0);
OnDiskInvertedIndex firstInvIndex = (OnDiskInvertedIndex) firstComponent.getInvIndex();
String firstFileName = firstInvIndex.getBTree().getFileReference().getFile().getName();
- LSMInvertedIndexImmutableComponent lastComponent = (LSMInvertedIndexImmutableComponent) mergingComponents
+ LSMInvertedIndexDiskComponent lastComponent = (LSMInvertedIndexDiskComponent) mergingComponents
.get(mergingComponents.size() - 1);
OnDiskInvertedIndex lastInvIndex = (OnDiskInvertedIndex) lastComponent.getInvIndex();
String lastFileName = lastInvIndex.getBTree().getFileReference().getFile().getName();
@@ -559,7 +559,7 @@
search(opCtx, cursor, mergePred);
// Create an inverted index instance.
- LSMInvertedIndexImmutableComponent component = createDiskInvIndexComponent(componentFactory,
+ LSMInvertedIndexDiskComponent component = createDiskInvIndexComponent(componentFactory,
mergeOp.getDictBTreeMergeTarget(), mergeOp.getDeletedKeysBTreeMergeTarget(),
mergeOp.getBloomFilterMergeTarget(), true);
@@ -612,7 +612,7 @@
} catch (HyracksDataException | IndexException e) {
throw new IndexException(e);
}
- invIndexBulkLoader = ((LSMInvertedIndexImmutableComponent) component).getInvIndex().createBulkLoader(
+ invIndexBulkLoader = ((LSMInvertedIndexDiskComponent) component).getInvIndex().createBulkLoader(
fillFactor, verifyInput, numElementsHint, false);
}
@@ -632,12 +632,12 @@
protected void cleanupArtifacts() throws HyracksDataException {
if (!cleanedUpArtifacts) {
cleanedUpArtifacts = true;
- ((LSMInvertedIndexImmutableComponent) component).getInvIndex().deactivate();
- ((LSMInvertedIndexImmutableComponent) component).getInvIndex().destroy();
- ((LSMInvertedIndexImmutableComponent) component).getDeletedKeysBTree().deactivate();
- ((LSMInvertedIndexImmutableComponent) component).getDeletedKeysBTree().destroy();
- ((LSMInvertedIndexImmutableComponent) component).getBloomFilter().deactivate();
- ((LSMInvertedIndexImmutableComponent) component).getBloomFilter().destroy();
+ ((LSMInvertedIndexDiskComponent) component).getInvIndex().deactivate();
+ ((LSMInvertedIndexDiskComponent) component).getInvIndex().destroy();
+ ((LSMInvertedIndexDiskComponent) component).getDeletedKeysBTree().deactivate();
+ ((LSMInvertedIndexDiskComponent) component).getDeletedKeysBTree().destroy();
+ ((LSMInvertedIndexDiskComponent) component).getBloomFilter().deactivate();
+ ((LSMInvertedIndexDiskComponent) component).getBloomFilter().destroy();
}
}
@@ -661,10 +661,10 @@
new FileReference(new File(fileManager.getBaseDir() + "_virtual_vocab_" + id)));
}
- protected LSMInvertedIndexImmutableComponent createDiskInvIndexComponent(ILSMComponentFactory factory,
+ protected LSMInvertedIndexDiskComponent createDiskInvIndexComponent(ILSMComponentFactory factory,
FileReference dictBTreeFileRef, FileReference btreeFileRef, FileReference bloomFilterFileRef, boolean create)
throws HyracksDataException, IndexException {
- LSMInvertedIndexImmutableComponent component = (LSMInvertedIndexImmutableComponent) factory
+ LSMInvertedIndexDiskComponent component = (LSMInvertedIndexDiskComponent) factory
.createLSMComponentInstance(new LSMComponentFileReferences(dictBTreeFileRef, btreeFileRef,
bloomFilterFileRef));
if (create) {
@@ -687,7 +687,7 @@
private LSMInvertedIndexOpContext createOpContext(IModificationOperationCallback modificationCallback,
ISearchOperationCallback searchCallback) throws HyracksDataException {
- return new LSMInvertedIndexOpContext(mutableComponents, modificationCallback, searchCallback);
+ return new LSMInvertedIndexOpContext(memoryComponents, modificationCallback, searchCallback);
}
@Override
@@ -714,8 +714,8 @@
@Override
public long getMemoryAllocationSize() {
long size = 0;
- for (ILSMComponent c : mutableComponents) {
- LSMInvertedIndexMutableComponent mutableComponent = (LSMInvertedIndexMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMInvertedIndexMemoryComponent mutableComponent = (LSMInvertedIndexMemoryComponent) c;
IBufferCache virtualBufferCache = mutableComponent.getInvIndex().getBufferCache();
size += virtualBufferCache.getNumPages() * virtualBufferCache.getPageSize();
}
@@ -746,7 +746,7 @@
@Override
public void markAsValid(ILSMComponent lsmComponent) throws HyracksDataException {
- LSMInvertedIndexImmutableComponent invIndexComponent = (LSMInvertedIndexImmutableComponent) lsmComponent;
+ LSMInvertedIndexDiskComponent invIndexComponent = (LSMInvertedIndexDiskComponent) lsmComponent;
OnDiskInvertedIndex invIndex = (OnDiskInvertedIndex) invIndexComponent.getInvIndex();
// Flush the bloom filter first.
int fileId = invIndexComponent.getBloomFilter().getFileId();
@@ -767,14 +767,14 @@
@Override
public void validate() throws HyracksDataException {
- for (ILSMComponent c : mutableComponents) {
- LSMInvertedIndexMutableComponent mutableComponent = (LSMInvertedIndexMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMInvertedIndexMemoryComponent mutableComponent = (LSMInvertedIndexMemoryComponent) c;
mutableComponent.getInvIndex().validate();
mutableComponent.getDeletedKeysBTree().validate();
}
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- LSMInvertedIndexImmutableComponent component = (LSMInvertedIndexImmutableComponent) c;
+ LSMInvertedIndexDiskComponent component = (LSMInvertedIndexDiskComponent) c;
component.getInvIndex().validate();
component.getDeletedKeysBTree().validate();
}
diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexComponentFactory.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexComponentFactory.java
index 1455647..cbfecca 100644
--- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexComponentFactory.java
+++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexComponentFactory.java
@@ -41,7 +41,7 @@
@Override
public ILSMComponent createLSMComponentInstance(LSMComponentFileReferences cfr) throws IndexException,
HyracksDataException {
- return new LSMInvertedIndexImmutableComponent(diskInvIndexFactory.createIndexInstance(cfr
+ return new LSMInvertedIndexDiskComponent(diskInvIndexFactory.createIndexInstance(cfr
.getInsertIndexFileReference()), btreeFactory.createIndexInstance(cfr.getDeleteIndexFileReference()),
bloomFilterFactory.createBloomFiltertInstance(cfr.getBloomFilterFileReference()));
}
diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexImmutableComponent.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexImmutableComponent.java
deleted file mode 100644
index ba48880..0000000
--- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexImmutableComponent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * you may obtain a copy of the License from
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.uci.ics.hyracks.storage.am.lsm.invertedindex.impls;
-
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.storage.am.bloomfilter.impls.BloomFilter;
-import edu.uci.ics.hyracks.storage.am.btree.impls.BTree;
-import edu.uci.ics.hyracks.storage.am.lsm.common.impls.AbstractDiskLSMComponent;
-import edu.uci.ics.hyracks.storage.am.lsm.invertedindex.api.IInvertedIndex;
-
-public class LSMInvertedIndexImmutableComponent extends AbstractDiskLSMComponent {
-
- private final IInvertedIndex invIndex;
- private final BTree deletedKeysBTree;
- private final BloomFilter bloomFilter;
-
- public LSMInvertedIndexImmutableComponent(IInvertedIndex invIndex, BTree deletedKeysBTree, BloomFilter bloomFilter) {
- this.invIndex = invIndex;
- this.deletedKeysBTree = deletedKeysBTree;
- this.bloomFilter = bloomFilter;
- }
-
- @Override
- public void destroy() throws HyracksDataException {
- invIndex.deactivate();
- invIndex.destroy();
- deletedKeysBTree.deactivate();
- deletedKeysBTree.destroy();
- bloomFilter.deactivate();
- bloomFilter.destroy();
- }
-
- public IInvertedIndex getInvIndex() {
- return invIndex;
- }
-
- public BTree getDeletedKeysBTree() {
- return deletedKeysBTree;
- }
-
- public BloomFilter getBloomFilter() {
- return bloomFilter;
- }
-}
diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexMergeOperation.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexMergeOperation.java
index 7714808..e3d9a13 100644
--- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexMergeOperation.java
+++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexMergeOperation.java
@@ -55,7 +55,7 @@
public Set<IODeviceHandle> getReadDevices() {
Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
for (Object o : mergingComponents) {
- LSMInvertedIndexImmutableComponent component = (LSMInvertedIndexImmutableComponent) o;
+ LSMInvertedIndexDiskComponent component = (LSMInvertedIndexDiskComponent) o;
OnDiskInvertedIndex invIndex = (OnDiskInvertedIndex) component.getInvIndex();
devs.add(invIndex.getBTree().getFileReference().getDeviceHandle());
devs.add(component.getDeletedKeysBTree().getFileReference().getDeviceHandle());
diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexMutableComponent.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexMutableComponent.java
deleted file mode 100644
index 9864f93..0000000
--- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexMutableComponent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * you may obtain a copy of the License from
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.uci.ics.hyracks.storage.am.lsm.invertedindex.impls;
-
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.storage.am.btree.impls.BTree;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.IVirtualBufferCache;
-import edu.uci.ics.hyracks.storage.am.lsm.common.impls.AbstractMemoryLSMComponent;
-import edu.uci.ics.hyracks.storage.am.lsm.invertedindex.api.IInvertedIndex;
-
-public class LSMInvertedIndexMutableComponent extends AbstractMemoryLSMComponent {
-
- private final IInvertedIndex invIndex;
- private final BTree deletedKeysBTree;
-
- public LSMInvertedIndexMutableComponent(IInvertedIndex invIndex, BTree deletedKeysBTree, IVirtualBufferCache vbc,
- boolean isActive) {
- super(vbc, isActive);
- this.invIndex = invIndex;
- this.deletedKeysBTree = deletedKeysBTree;
- }
-
- public IInvertedIndex getInvIndex() {
- return invIndex;
- }
-
- public BTree getDeletedKeysBTree() {
- return deletedKeysBTree;
- }
-
- @Override
- protected void reset() throws HyracksDataException {
- super.reset();
- invIndex.deactivate();
- invIndex.destroy();
- invIndex.create();
- invIndex.activate();
- deletedKeysBTree.deactivate();
- deletedKeysBTree.destroy();
- deletedKeysBTree.create();
- deletedKeysBTree.activate();
- }
-}
diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexOpContext.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexOpContext.java
index 119b9b7..1a9303f 100644
--- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexOpContext.java
+++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexOpContext.java
@@ -61,7 +61,7 @@
deletedKeysBTreeAccessors = new IIndexAccessor[mutableComponents.size()];
for (int i = 0; i < mutableComponents.size(); i++) {
- LSMInvertedIndexMutableComponent mutableComponent = (LSMInvertedIndexMutableComponent) mutableComponents
+ LSMInvertedIndexMemoryComponent mutableComponent = (LSMInvertedIndexMemoryComponent) mutableComponents
.get(i);
mutableInvIndexAccessors[i] = (IInvertedIndexAccessor) mutableComponent.getInvIndex().createAccessor(
NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
@@ -72,7 +72,7 @@
assert mutableComponents.size() > 0;
// Project away the document fields, leaving only the key fields.
- LSMInvertedIndexMutableComponent c = (LSMInvertedIndexMutableComponent) mutableComponents.get(0);
+ LSMInvertedIndexMemoryComponent c = (LSMInvertedIndexMemoryComponent) mutableComponents.get(0);
int numKeyFields = c.getInvIndex().getInvListTypeTraits().length;
int[] keyFieldPermutation = new int[numKeyFields];
for (int i = 0; i < numKeyFields; i++) {
diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexRangeSearchCursor.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexRangeSearchCursor.java
index f6996d4..cd0dde3 100644
--- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexRangeSearchCursor.java
+++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexRangeSearchCursor.java
@@ -81,7 +81,7 @@
} else {
deletedKeysBTreeCursors[i] = new BloomFilterAwareBTreePointSearchCursor((IBTreeLeafFrame) lsmInitState
.getgetDeletedKeysBTreeLeafFrameFactory().createFrame(), false,
- ((LSMInvertedIndexImmutableComponent) operationalComponents.get(i)).getBloomFilter());
+ ((LSMInvertedIndexDiskComponent) operationalComponents.get(i)).getBloomFilter());
}
}
}
diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexSearchCursor.java b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexSearchCursor.java
index 2b69485..19acbfb 100644
--- a/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexSearchCursor.java
+++ b/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexSearchCursor.java
@@ -80,7 +80,7 @@
} else {
deletedKeysBTreeCursors[i] = new BloomFilterAwareBTreePointSearchCursor((IBTreeLeafFrame) lsmInitState
.getgetDeletedKeysBTreeLeafFrameFactory().createFrame(), false,
- ((LSMInvertedIndexImmutableComponent) operationalComponents.get(i)).getBloomFilter());
+ ((LSMInvertedIndexDiskComponent) operationalComponents.get(i)).getBloomFilter());
}
}
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
index a66ac76..a810355 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
@@ -102,9 +102,9 @@
virtualBufferCache.getNumPages()), btreeInteriorFrameFactory, btreeLeafFrameFactory,
btreeCmpFactories, fieldCount, new FileReference(new File(fileManager.getBaseDir() + "_virtual_b_"
+ i)));
- LSMRTreeMutableComponent mutableComponent = new LSMRTreeMutableComponent(memRTree, memBTree,
+ LSMRTreeMemoryComponent mutableComponent = new LSMRTreeMemoryComponent(memRTree, memBTree,
virtualBufferCache, i == 0 ? true : false);
- mutableComponents.add(mutableComponent);
+ memoryComponents.add(mutableComponent);
++i;
}
@@ -138,8 +138,8 @@
throw new HyracksDataException("Failed to activate the index since it is already activated.");
}
- for (ILSMComponent c : mutableComponents) {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) c;
((IVirtualBufferCache) mutableComponent.getRTree().getBufferCache()).open();
mutableComponent.getRTree().create();
mutableComponent.getBTree().create();
@@ -166,8 +166,8 @@
}
}
- for (ILSMComponent c : mutableComponents) {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) c;
mutableComponent.getRTree().deactivate();
mutableComponent.getBTree().deactivate();
mutableComponent.getRTree().destroy();
@@ -189,8 +189,8 @@
throw new HyracksDataException("Failed to clear the index since it is not activated.");
}
- for (ILSMComponent c : mutableComponents) {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) c;
mutableComponent.getRTree().clear();
mutableComponent.getBTree().clear();
mutableComponent.reset();
@@ -204,24 +204,24 @@
List<ILSMComponent> immutableComponents = diskComponents;
int cmc = currentMutableComponentId.get();
ctx.setCurrentMutableComponentId(cmc);
- int numMutableComponents = mutableComponents.size();
+ int numMutableComponents = memoryComponents.size();
switch (ctx.getOperation()) {
case INSERT:
case DELETE:
case FLUSH:
- operationalComponents.add(mutableComponents.get(cmc));
+ operationalComponents.add(memoryComponents.get(cmc));
break;
case SEARCH:
for (int i = 0; i < numMutableComponents - 1; i++) {
- ILSMComponent c = mutableComponents.get((cmc + i + 1) % numMutableComponents);
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) c;
+ ILSMComponent c = memoryComponents.get((cmc + i + 1) % numMutableComponents);
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) c;
if (mutableComponent.isReadable()) {
// Make sure newest components are added first
operationalComponents.add(0, mutableComponent);
}
}
// The current mutable component is always added
- operationalComponents.add(0, mutableComponents.get(cmc));
+ operationalComponents.add(0, memoryComponents.get(cmc));
operationalComponents.addAll(immutableComponents);
break;
case MERGE:
@@ -247,8 +247,8 @@
protected LSMComponentFileReferences getMergeTargetFileName(List<ILSMComponent> mergingDiskComponents)
throws HyracksDataException {
- RTree firstTree = ((LSMRTreeImmutableComponent) mergingDiskComponents.get(0)).getRTree();
- RTree lastTree = ((LSMRTreeImmutableComponent) mergingDiskComponents.get(mergingDiskComponents.size() - 1))
+ RTree firstTree = ((LSMRTreeDiskComponent) mergingDiskComponents.get(0)).getRTree();
+ RTree lastTree = ((LSMRTreeDiskComponent) mergingDiskComponents.get(mergingDiskComponents.size() - 1))
.getRTree();
FileReference firstFile = diskFileMapProvider.lookupFileName(firstTree.getFileId());
FileReference lastFile = diskFileMapProvider.lookupFileName(lastTree.getFileId());
@@ -257,11 +257,11 @@
return fileRefs;
}
- protected LSMRTreeImmutableComponent createDiskComponent(ILSMComponentFactory factory, FileReference insertFileRef,
+ protected LSMRTreeDiskComponent createDiskComponent(ILSMComponentFactory factory, FileReference insertFileRef,
FileReference deleteFileRef, FileReference bloomFilterFileRef, boolean createComponent)
throws HyracksDataException, IndexException {
// Create new tree instance.
- LSMRTreeImmutableComponent component = (LSMRTreeImmutableComponent) factory
+ LSMRTreeDiskComponent component = (LSMRTreeDiskComponent) factory
.createLSMComponentInstance(new LSMComponentFileReferences(insertFileRef, deleteFileRef,
bloomFilterFileRef));
if (createComponent) {
@@ -282,42 +282,42 @@
@Override
public ITreeIndexFrameFactory getLeafFrameFactory() {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) mutableComponents
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getRTree().getLeafFrameFactory();
}
@Override
public ITreeIndexFrameFactory getInteriorFrameFactory() {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) mutableComponents
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getRTree().getInteriorFrameFactory();
}
@Override
public IFreePageManager getFreePageManager() {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) mutableComponents
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getRTree().getFreePageManager();
}
@Override
public int getFieldCount() {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) mutableComponents
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getRTree().getFieldCount();
}
@Override
public int getRootPageId() {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) mutableComponents
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getRTree().getRootPageId();
}
@Override
public int getFileId() {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) mutableComponents
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) memoryComponents
.get(currentMutableComponentId.get());
return mutableComponent.getRTree().getFileId();
}
@@ -374,7 +374,7 @@
}
protected LSMRTreeOpContext createOpContext(IModificationOperationCallback modCallback) {
- return new LSMRTreeOpContext(mutableComponents, (IRTreeLeafFrame) rtreeLeafFrameFactory.createFrame(),
+ return new LSMRTreeOpContext(memoryComponents, (IRTreeLeafFrame) rtreeLeafFrameFactory.createFrame(),
(IRTreeInteriorFrame) rtreeInteriorFrameFactory.createFrame(), btreeLeafFrameFactory,
btreeInteriorFrameFactory, rtreeCmpFactories, btreeCmpFactories, modCallback,
NoOpOperationCallback.INSTANCE);
@@ -393,8 +393,8 @@
@Override
public long getMemoryAllocationSize() {
long size = 0;
- for (ILSMComponent c : mutableComponents) {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) c;
+ for (ILSMComponent c : memoryComponents) {
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) c;
IBufferCache virtualBufferCache = mutableComponent.getRTree().getBufferCache();
size += virtualBufferCache.getNumPages() * virtualBufferCache.getPageSize();
}
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
index db08edc..e85dc1e 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
@@ -102,7 +102,7 @@
}
immutableComponents.clear();
for (LSMComponentFileReferences lsmComonentFileReference : validFileReferences) {
- LSMRTreeImmutableComponent component;
+ LSMRTreeDiskComponent component;
try {
component = createDiskComponent(componentFactory,
lsmComonentFileReference.getInsertIndexFileReference(),
@@ -121,7 +121,7 @@
super.deactivate(flushOnExit);
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- LSMRTreeImmutableComponent component = (LSMRTreeImmutableComponent) c;
+ LSMRTreeDiskComponent component = (LSMRTreeDiskComponent) c;
RTree rtree = component.getRTree();
BTree btree = component.getBTree();
BloomFilter bloomFilter = component.getBloomFilter();
@@ -142,7 +142,7 @@
super.destroy();
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- LSMRTreeImmutableComponent component = (LSMRTreeImmutableComponent) c;
+ LSMRTreeDiskComponent component = (LSMRTreeDiskComponent) c;
component.getBTree().destroy();
component.getBloomFilter().destroy();
component.getRTree().destroy();
@@ -155,7 +155,7 @@
super.clear();
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- LSMRTreeImmutableComponent component = (LSMRTreeImmutableComponent) c;
+ LSMRTreeDiskComponent component = (LSMRTreeDiskComponent) c;
component.getBTree().deactivate();
component.getBloomFilter().deactivate();
component.getRTree().deactivate();
@@ -183,7 +183,7 @@
@Override
public ILSMComponent flush(ILSMIOOperation operation) throws HyracksDataException, IndexException {
LSMRTreeFlushOperation flushOp = (LSMRTreeFlushOperation) operation;
- LSMRTreeMutableComponent flushingComponent = (LSMRTreeMutableComponent) flushOp.getFlushingComponent();
+ LSMRTreeMemoryComponent flushingComponent = (LSMRTreeMemoryComponent) flushOp.getFlushingComponent();
// Renaming order is critical because we use assume ordering when we
// read the file names when we open the tree.
// The RTree should be renamed before the BTree.
@@ -194,7 +194,7 @@
RTreeSearchCursor rtreeScanCursor = (RTreeSearchCursor) memRTreeAccessor.createSearchCursor();
SearchPredicate rtreeNullPredicate = new SearchPredicate(null, null);
memRTreeAccessor.search(rtreeScanCursor, rtreeNullPredicate);
- LSMRTreeImmutableComponent component = createDiskComponent(componentFactory, flushOp.getRTreeFlushTarget(),
+ LSMRTreeDiskComponent component = createDiskComponent(componentFactory, flushOp.getRTreeFlushTarget(),
flushOp.getBTreeFlushTarget(), flushOp.getBloomFilterFlushTarget(), true);
RTree diskRTree = component.getRTree();
IIndexBulkLoader rTreeBulkloader;
@@ -307,7 +307,7 @@
opCtx.getComponentHolder().addAll(mergeOp.getMergingComponents());
search(opCtx, cursor, rtreeSearchPred);
- LSMRTreeImmutableComponent mergedComponent = createDiskComponent(componentFactory,
+ LSMRTreeDiskComponent mergedComponent = createDiskComponent(componentFactory,
mergeOp.getRTreeMergeTarget(), mergeOp.getBTreeMergeTarget(), mergeOp.getBloomFilterMergeTarget(), true);
IIndexBulkLoader bulkLoader = mergedComponent.getRTree().createBulkLoader(1.0f, false, 0L, false);
@@ -380,7 +380,7 @@
} catch (HyracksDataException | IndexException e) {
throw new TreeIndexException(e);
}
- bulkLoader = ((LSMRTreeImmutableComponent) component).getRTree().createBulkLoader(fillFactor, verifyInput,
+ bulkLoader = ((LSMRTreeDiskComponent) component).getRTree().createBulkLoader(fillFactor, verifyInput,
numElementsHint, false);
}
@@ -412,19 +412,19 @@
protected void cleanupArtifacts() throws HyracksDataException {
if (!cleanedUpArtifacts) {
cleanedUpArtifacts = true;
- ((LSMRTreeImmutableComponent) component).getRTree().deactivate();
- ((LSMRTreeImmutableComponent) component).getRTree().destroy();
- ((LSMRTreeImmutableComponent) component).getBTree().deactivate();
- ((LSMRTreeImmutableComponent) component).getBTree().destroy();
- ((LSMRTreeImmutableComponent) component).getBloomFilter().deactivate();
- ((LSMRTreeImmutableComponent) component).getBloomFilter().destroy();
+ ((LSMRTreeDiskComponent) component).getRTree().deactivate();
+ ((LSMRTreeDiskComponent) component).getRTree().destroy();
+ ((LSMRTreeDiskComponent) component).getBTree().deactivate();
+ ((LSMRTreeDiskComponent) component).getBTree().destroy();
+ ((LSMRTreeDiskComponent) component).getBloomFilter().deactivate();
+ ((LSMRTreeDiskComponent) component).getBloomFilter().destroy();
}
}
}
@Override
public void markAsValid(ILSMComponent lsmComponent) throws HyracksDataException {
- LSMRTreeImmutableComponent component = (LSMRTreeImmutableComponent) lsmComponent;
+ LSMRTreeDiskComponent component = (LSMRTreeDiskComponent) lsmComponent;
// Flush the bloom filter first.
int fileId = component.getBloomFilter().getFileId();
IBufferCache bufferCache = component.getBTree().getBufferCache();
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
index 279b777..4e322d4 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
@@ -93,14 +93,14 @@
// No need for a bloom filter for the in-memory BTree.
btreeCursors[i] = new BTreeRangeSearchCursor((IBTreeLeafFrame) lsmInitialState
.getBTreeLeafFrameFactory().createFrame(), false);
- rtree = (RTree) ((LSMRTreeMutableComponent) component).getRTree();
- btree = (BTree) ((LSMRTreeMutableComponent) component).getBTree();
+ rtree = (RTree) ((LSMRTreeMemoryComponent) component).getRTree();
+ btree = (BTree) ((LSMRTreeMemoryComponent) component).getBTree();
} else {
btreeCursors[i] = new BloomFilterAwareBTreePointSearchCursor((IBTreeLeafFrame) lsmInitialState
.getBTreeLeafFrameFactory().createFrame(), false,
- ((LSMRTreeImmutableComponent) operationalComponents.get(i)).getBloomFilter());
- rtree = (RTree) ((LSMRTreeImmutableComponent) component).getRTree();
- btree = (BTree) ((LSMRTreeImmutableComponent) component).getBTree();
+ ((LSMRTreeDiskComponent) operationalComponents.get(i)).getBloomFilter());
+ rtree = (RTree) ((LSMRTreeDiskComponent) component).getRTree();
+ btree = (BTree) ((LSMRTreeDiskComponent) component).getBTree();
}
rtreeCursors[i] = new RTreeSearchCursor((IRTreeInteriorFrame) lsmInitialState
.getRTreeInteriorFrameFactory().createFrame(), (IRTreeLeafFrame) lsmInitialState
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeComponentFactory.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeComponentFactory.java
index 8f618da..e54b4b6 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeComponentFactory.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeComponentFactory.java
@@ -41,7 +41,7 @@
@Override
public ILSMComponent createLSMComponentInstance(LSMComponentFileReferences cfr) throws IndexException,
HyracksDataException {
- return new LSMRTreeImmutableComponent(rtreeFactory.createIndexInstance(cfr.getInsertIndexFileReference()),
+ return new LSMRTreeDiskComponent(rtreeFactory.createIndexInstance(cfr.getInsertIndexFileReference()),
btreeFactory.createIndexInstance(cfr.getDeleteIndexFileReference()),
bloomFilterFactory.createBloomFiltertInstance(cfr.getBloomFilterFileReference()));
}
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeImmutableComponent.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeImmutableComponent.java
deleted file mode 100644
index f6eea3f..0000000
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeImmutableComponent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * you may obtain a copy of the License from
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.uci.ics.hyracks.storage.am.lsm.rtree.impls;
-
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.storage.am.bloomfilter.impls.BloomFilter;
-import edu.uci.ics.hyracks.storage.am.btree.impls.BTree;
-import edu.uci.ics.hyracks.storage.am.lsm.common.impls.AbstractDiskLSMComponent;
-import edu.uci.ics.hyracks.storage.am.rtree.impls.RTree;
-
-public class LSMRTreeImmutableComponent extends AbstractDiskLSMComponent {
- private final RTree rtree;
- private final BTree btree;
- private final BloomFilter bloomFilter;
-
- public LSMRTreeImmutableComponent(RTree rtree, BTree btree, BloomFilter bloomFilter) {
- this.rtree = rtree;
- this.btree = btree;
- this.bloomFilter = bloomFilter;
- }
-
- @Override
- public void destroy() throws HyracksDataException {
- rtree.deactivate();
- rtree.destroy();
- if (btree != null) {
- btree.deactivate();
- btree.destroy();
- bloomFilter.deactivate();
- bloomFilter.destroy();
- }
- }
-
- public RTree getRTree() {
- return rtree;
- }
-
- public BTree getBTree() {
- return btree;
- }
-
- public BloomFilter getBloomFilter() {
- return bloomFilter;
- }
-}
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeMergeOperation.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeMergeOperation.java
index ef67a2b..4e2fab7 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeMergeOperation.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeMergeOperation.java
@@ -53,7 +53,7 @@
public Set<IODeviceHandle> getReadDevices() {
Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
for (ILSMComponent o : mergingComponents) {
- LSMRTreeImmutableComponent component = (LSMRTreeImmutableComponent) o;
+ LSMRTreeDiskComponent component = (LSMRTreeDiskComponent) o;
devs.add(component.getRTree().getFileReference().getDeviceHandle());
if (component.getBTree() != null) {
devs.add(component.getBTree().getFileReference().getDeviceHandle());
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeMutableComponent.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeMutableComponent.java
deleted file mode 100644
index 0c7107b..0000000
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeMutableComponent.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * you may obtain a copy of the License from
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.uci.ics.hyracks.storage.am.lsm.rtree.impls;
-
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.storage.am.btree.impls.BTree;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.IVirtualBufferCache;
-import edu.uci.ics.hyracks.storage.am.lsm.common.impls.AbstractMemoryLSMComponent;
-import edu.uci.ics.hyracks.storage.am.rtree.impls.RTree;
-
-public class LSMRTreeMutableComponent extends AbstractMemoryLSMComponent {
-
- private final RTree rtree;
- private final BTree btree;
-
- public LSMRTreeMutableComponent(RTree rtree, BTree btree, IVirtualBufferCache vbc, boolean isActive) {
- super(vbc, isActive);
- this.rtree = rtree;
- this.btree = btree;
- }
-
- public RTree getRTree() {
- return rtree;
- }
-
- public BTree getBTree() {
- return btree;
- }
-
- @Override
- protected void reset() throws HyracksDataException {
- super.reset();
- rtree.deactivate();
- rtree.destroy();
- rtree.create();
- rtree.activate();
- if (btree != null) {
- btree.deactivate();
- btree.destroy();
- btree.create();
- btree.activate();
- }
- }
-
-}
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeOpContext.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeOpContext.java
index 69fc2d9..b94feba 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeOpContext.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeOpContext.java
@@ -62,7 +62,7 @@
btreeOpContexts = new BTreeOpContext[mutableComponents.size()];
for (int i = 0; i < mutableComponents.size(); i++) {
- LSMRTreeMutableComponent mutableComponent = (LSMRTreeMutableComponent) mutableComponents.get(i);
+ LSMRTreeMemoryComponent mutableComponent = (LSMRTreeMemoryComponent) mutableComponents.get(i);
mutableRTreeAccessors[i] = (RTree.RTreeAccessor) mutableComponent.getRTree().createAccessor(
NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
mutableBTreeAccessors[i] = (BTree.BTreeAccessor) mutableComponent.getBTree().createAccessor(
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
index 89d8516..592f0c9 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
@@ -96,7 +96,7 @@
throw new HyracksDataException(e);
}
for (LSMComponentFileReferences lsmComonentFileReference : validFileReferences) {
- LSMRTreeImmutableComponent component;
+ LSMRTreeDiskComponent component;
try {
component = createDiskComponent(componentFactory,
lsmComonentFileReference.getInsertIndexFileReference(), null, null, false);
@@ -113,7 +113,7 @@
super.deactivate(flushOnExit);
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- RTree rtree = (RTree) ((LSMRTreeImmutableComponent) c).getRTree();
+ RTree rtree = (RTree) ((LSMRTreeDiskComponent) c).getRTree();
rtree.deactivate();
}
isActivated = false;
@@ -129,7 +129,7 @@
super.destroy();
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- RTree rtree = (RTree) ((LSMRTreeImmutableComponent) c).getRTree();
+ RTree rtree = (RTree) ((LSMRTreeDiskComponent) c).getRTree();
rtree.destroy();
}
fileManager.deleteDirs();
@@ -140,7 +140,7 @@
super.clear();
List<ILSMComponent> immutableComponents = diskComponents;
for (ILSMComponent c : immutableComponents) {
- RTree rtree = (RTree) ((LSMRTreeImmutableComponent) c).getRTree();
+ RTree rtree = (RTree) ((LSMRTreeDiskComponent) c).getRTree();
rtree.deactivate();
rtree.destroy();
}
@@ -166,13 +166,13 @@
// Renaming order is critical because we use assume ordering when we
// read the file names when we open the tree.
// The RTree should be renamed before the BTree.
- LSMRTreeMutableComponent flushingComponent = (LSMRTreeMutableComponent) flushOp.getFlushingComponent();
+ LSMRTreeMemoryComponent flushingComponent = (LSMRTreeMemoryComponent) flushOp.getFlushingComponent();
ITreeIndexAccessor memRTreeAccessor = flushingComponent.getRTree().createAccessor(
NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
RTreeSearchCursor rtreeScanCursor = (RTreeSearchCursor) memRTreeAccessor.createSearchCursor();
SearchPredicate rtreeNullPredicate = new SearchPredicate(null, null);
memRTreeAccessor.search(rtreeScanCursor, rtreeNullPredicate);
- LSMRTreeImmutableComponent component = createDiskComponent(componentFactory, flushOp.getRTreeFlushTarget(),
+ LSMRTreeDiskComponent component = createDiskComponent(componentFactory, flushOp.getRTreeFlushTarget(),
null, null, true);
RTree diskRTree = component.getRTree();
@@ -266,7 +266,7 @@
search(opCtx, cursor, rtreeSearchPred);
// Bulk load the tuples from all on-disk RTrees into the new RTree.
- LSMRTreeImmutableComponent component = createDiskComponent(componentFactory, mergeOp.getRTreeMergeTarget(),
+ LSMRTreeDiskComponent component = createDiskComponent(componentFactory, mergeOp.getRTreeMergeTarget(),
null, null, true);
RTree mergedRTree = component.getRTree();
IIndexBulkLoader bulkloader = mergedRTree.createBulkLoader(1.0f, false, 0L, false);
@@ -340,7 +340,7 @@
} catch (HyracksDataException | IndexException e) {
throw new TreeIndexException(e);
}
- bulkLoader = ((LSMRTreeImmutableComponent) component).getRTree().createBulkLoader(fillFactor, verifyInput,
+ bulkLoader = ((LSMRTreeDiskComponent) component).getRTree().createBulkLoader(fillFactor, verifyInput,
numElementsHint, false);
}
@@ -372,8 +372,8 @@
protected void cleanupArtifacts() throws HyracksDataException {
if (!cleanedUpArtifacts) {
cleanedUpArtifacts = true;
- ((LSMRTreeImmutableComponent) component).getRTree().deactivate();
- ((LSMRTreeImmutableComponent) component).getRTree().destroy();
+ ((LSMRTreeDiskComponent) component).getRTree().deactivate();
+ ((LSMRTreeDiskComponent) component).getRTree().destroy();
}
}
@@ -381,7 +381,7 @@
@Override
public void markAsValid(ILSMComponent lsmComponent) throws HyracksDataException {
- RTree rtree = ((LSMRTreeImmutableComponent) lsmComponent).getRTree();
+ RTree rtree = ((LSMRTreeDiskComponent) lsmComponent).getRTree();
forceFlushDirtyPages(rtree);
markAsValidInternal(rtree);
}
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesComponentFactory.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesComponentFactory.java
index 39f35b7..a555366 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesComponentFactory.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesComponentFactory.java
@@ -32,7 +32,7 @@
@Override
public ILSMComponent createLSMComponentInstance(LSMComponentFileReferences cfr) throws IndexException {
- return new LSMRTreeImmutableComponent(rtreeFactory.createIndexInstance(cfr.getInsertIndexFileReference()),
+ return new LSMRTreeDiskComponent(rtreeFactory.createIndexInstance(cfr.getInsertIndexFileReference()),
null, null);
}
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
index fbf0445..cbaf3b3 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
@@ -90,8 +90,8 @@
btreeAccessors = new ITreeIndexAccessor[numMutableComponents];
for (int i = 0; i < numMutableComponents; i++) {
ILSMComponent component = operationalComponents.get(i);
- RTree rtree = (RTree) ((LSMRTreeMutableComponent) component).getRTree();
- BTree btree = (BTree) ((LSMRTreeMutableComponent) component).getBTree();
+ RTree rtree = (RTree) ((LSMRTreeMemoryComponent) component).getRTree();
+ BTree btree = (BTree) ((LSMRTreeMemoryComponent) component).getBTree();
mutableRTreeCursors[i] = new RTreeSearchCursor((IRTreeInteriorFrame) lsmInitialState
.getRTreeInteriorFrameFactory().createFrame(), (IRTreeLeafFrame) lsmInitialState
.getRTreeLeafFrameFactory().createFrame());
@@ -110,7 +110,7 @@
rangeCursors[j] = new RTreeSearchCursor((IRTreeInteriorFrame) lsmInitialState
.getRTreeInteriorFrameFactory().createFrame(), (IRTreeLeafFrame) lsmInitialState
.getRTreeLeafFrameFactory().createFrame());
- RTree rtree = (RTree) ((LSMRTreeImmutableComponent) component).getRTree();
+ RTree rtree = (RTree) ((LSMRTreeDiskComponent) component).getRTree();
immutableRTreeAccessors[j] = rtree.createAccessor(NoOpOperationCallback.INSTANCE,
NoOpOperationCallback.INSTANCE);
immutableRTreeAccessors[j].search(rangeCursors[j], searchPred);