changed iinIIndex.open and IIndex.close to activate and deactive, respectively
git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_lsm_tree@1703 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IIndex.java b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IIndex.java
index 91e4c94..7cb9cb3 100644
--- a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IIndex.java
+++ b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IIndex.java
@@ -39,18 +39,9 @@
*/
public void create() throws HyracksDataException;
- /**
- * Opens the index backed by the given file id.
- *
- * @param fileReference
- * The file id backing this index.
- */
- public void open() throws HyracksDataException;
+ public void activate() throws HyracksDataException;
- /**
- * Closes the index.
- */
- public void close() throws HyracksDataException;
+ public void deactivate() throws HyracksDataException;
public void destroy() throws HyracksDataException;
diff --git a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
index 8e8b553..9c295d7 100644
--- a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
+++ b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/IndexDataflowHelper.java
@@ -90,7 +90,7 @@
}
}
if (register) {
- index.open();
+ index.activate();
indexRegistry.register(resourceId, index);
}
}
diff --git a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/TreeIndexDropOperatorNodePushable.java b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/TreeIndexDropOperatorNodePushable.java
index f5b2af8..3265a6a 100644
--- a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/TreeIndexDropOperatorNodePushable.java
+++ b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/dataflow/TreeIndexDropOperatorNodePushable.java
@@ -105,7 +105,7 @@
}
// remove name to id mapping
- index.close();
+ index.deactivate();
index.destroy();
}
diff --git a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/impls/AbstractTreeIndex.java b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/impls/AbstractTreeIndex.java
index d650802..21d2529 100644
--- a/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/impls/AbstractTreeIndex.java
+++ b/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/impls/AbstractTreeIndex.java
@@ -116,7 +116,7 @@
}
}
- public synchronized void open() throws HyracksDataException {
+ public synchronized void activate() throws HyracksDataException {
if (isOpen) {
return;
}
@@ -147,7 +147,7 @@
isOpen = true;
}
- public synchronized void close() throws HyracksDataException {
+ public synchronized void deactivate() throws HyracksDataException {
if (!isOpen) {
return;
}
diff --git a/hyracks-storage-am-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/invertedindex/impls/InvertedIndex.java b/hyracks-storage-am-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/invertedindex/impls/InvertedIndex.java
index 580521e..b775bac 100644
--- a/hyracks-storage-am-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/invertedindex/impls/InvertedIndex.java
+++ b/hyracks-storage-am-invertedindex/src/main/java/edu/uci/ics/hyracks/storage/am/invertedindex/impls/InvertedIndex.java
@@ -116,7 +116,7 @@
}
@Override
- public synchronized void open() throws HyracksDataException {
+ public synchronized void activate() throws HyracksDataException {
if (isOpen) {
return;
}
@@ -144,7 +144,7 @@
}
@Override
- public synchronized void close() throws HyracksDataException {
+ public synchronized void deactivate() throws HyracksDataException {
if (!isOpen) {
return;
}
diff --git a/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java b/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
index 3e50873..8e80198 100644
--- a/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
+++ b/hyracks-storage-am-lsm-btree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
@@ -140,14 +140,14 @@
* @throws HyracksDataException
*/
@Override
- public synchronized void open() throws HyracksDataException {
+ public synchronized void activate() throws HyracksDataException {
if (isOpen) {
return;
}
((InMemoryBufferCache) memBTree.getBufferCache()).open();
memBTree.create();
- memBTree.open();
+ memBTree.activate();
List<Object> validFileNames = fileManager.cleanupAndGetValidFiles(componentFinalizer);
for (Object o : validFileNames) {
String fileName = (String) o;
@@ -159,17 +159,17 @@
}
@Override
- public synchronized void close() throws HyracksDataException {
+ public synchronized void deactivate() throws HyracksDataException {
if (!isOpen) {
return;
}
for (Object o : diskBTrees) {
BTree btree = (BTree) o;
- btree.close();
+ btree.deactivate();
}
diskBTrees.clear();
- memBTree.close();
+ memBTree.deactivate();
memBTree.destroy();
((InMemoryBufferCache) memBTree.getBufferCache()).close();
isOpen = false;
@@ -198,7 +198,7 @@
memBTree.clear();
for (Object o : diskBTrees) {
BTree btree = (BTree) o;
- btree.close();
+ btree.deactivate();
btree.destroy();
}
diskBTrees.clear();
@@ -327,7 +327,7 @@
diskBTree.create();
}
// BTree will be closed during cleanup of merge().
- diskBTree.open();
+ diskBTree.activate();
return diskBTree;
}
@@ -408,7 +408,7 @@
for (Object o : mergedComponents) {
BTree oldBTree = (BTree) o;
FileReference fileRef = diskFileMapProvider.lookupFileName(oldBTree.getFileId());
- oldBTree.close();
+ oldBTree.deactivate();
fileRef.getFile().delete();
}
}
diff --git a/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/TreeIndexComponentFinalizer.java b/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/TreeIndexComponentFinalizer.java
index d87bf5b..c2453f3 100644
--- a/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/TreeIndexComponentFinalizer.java
+++ b/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/TreeIndexComponentFinalizer.java
@@ -36,7 +36,7 @@
public boolean isValid(Object lsmComponent) throws HyracksDataException {
ITreeIndex treeIndex = (ITreeIndex) lsmComponent;
IBufferCache bufferCache = treeIndex.getBufferCache();
- treeIndex.open();
+ treeIndex.activate();
try {
int metadataPage = treeIndex.getFreePageManager().getFirstMetadataPage();
ITreeIndexMetaDataFrame metadataFrame = treeIndex.getFreePageManager().getMetaDataFrameFactory()
@@ -52,7 +52,7 @@
bufferCache.unpin(page);
}
} finally {
- treeIndex.close();
+ treeIndex.deactivate();
}
}
diff --git a/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java b/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
index fd578fd..862389e 100644
--- a/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
+++ b/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
@@ -159,7 +159,7 @@
}
@Override
- public synchronized void open() throws HyracksDataException {
+ public synchronized void activate() throws HyracksDataException {
if (isOpen) {
return;
}
@@ -167,21 +167,21 @@
((InMemoryBufferCache) memComponent.getRTree().getBufferCache()).open();
memComponent.getRTree().create();
memComponent.getBTree().create();
- memComponent.getRTree().open();
- memComponent.getBTree().open();
+ memComponent.getRTree().activate();
+ memComponent.getBTree().activate();
isOpen = true;
}
@Override
- public synchronized void close() throws HyracksDataException {
+ public synchronized void deactivate() throws HyracksDataException {
if (!isOpen) {
return;
}
isOpen = false;
- memComponent.getRTree().close();
- memComponent.getBTree().close();
+ memComponent.getRTree().deactivate();
+ memComponent.getBTree().deactivate();
memComponent.getRTree().destroy();
memComponent.getBTree().destroy();
((InMemoryBufferCache) memComponent.getRTree().getBufferCache()).close();
@@ -193,8 +193,8 @@
throw new HyracksDataException("Failed to destroy since index is already open.");
}
- memComponent.getRTree().close();
- memComponent.getBTree().close();
+ memComponent.getRTree().deactivate();
+ memComponent.getBTree().deactivate();
fileManager.deleteDirs();
}
@@ -217,7 +217,7 @@
diskTree.create();
}
// Tree will be closed during cleanup of merge().
- diskTree.open();
+ diskTree.activate();
return diskTree;
}
diff --git a/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java b/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
index 6954eb6..57dd07b 100644
--- a/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
+++ b/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
@@ -88,8 +88,8 @@
* @throws HyracksDataException
*/
@Override
- public synchronized void open() throws HyracksDataException {
- super.open();
+ public synchronized void activate() throws HyracksDataException {
+ super.activate();
List<Object> validFileNames = fileManager.cleanupAndGetValidFiles(componentFinalizer);
for (Object o : validFileNames) {
LSMRTreeFileNameComponent component = (LSMRTreeFileNameComponent) o;
@@ -103,16 +103,16 @@
}
@Override
- public synchronized void close() throws HyracksDataException {
+ public synchronized void deactivate() throws HyracksDataException {
for (Object o : diskComponents) {
LSMRTreeComponent diskComponent = (LSMRTreeComponent) o;
RTree rtree = diskComponent.getRTree();
BTree btree = diskComponent.getBTree();
- rtree.close();
- btree.close();
+ rtree.deactivate();
+ btree.deactivate();
}
diskComponents.clear();
- super.close();
+ super.deactivate();
}
@Override
@@ -129,8 +129,8 @@
public synchronized void clear() throws HyracksDataException {
for (Object o : diskComponents) {
LSMRTreeComponent component = (LSMRTreeComponent) o;
- component.getBTree().close();
- component.getRTree().close();
+ component.getBTree().deactivate();
+ component.getRTree().deactivate();
component.getBTree().destroy();
component.getRTree().destroy();
}
@@ -316,11 +316,11 @@
LSMRTreeComponent component = (LSMRTreeComponent) o;
BTree oldBTree = component.getBTree();
FileReference btreeFileRef = diskFileMapProvider.lookupFileName(oldBTree.getFileId());
- oldBTree.close();
+ oldBTree.deactivate();
btreeFileRef.getFile().delete();
RTree oldRTree = component.getRTree();
FileReference rtreeFileRef = diskFileMapProvider.lookupFileName(oldRTree.getFileId());
- oldRTree.close();
+ oldRTree.deactivate();
rtreeFileRef.getFile().delete();
}
}
diff --git a/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java b/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
index 943a4ce..9855ac2 100644
--- a/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
+++ b/hyracks-storage-am-lsm-rtree/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
@@ -93,8 +93,8 @@
* @throws HyracksDataException
*/
@Override
- public synchronized void open() throws HyracksDataException {
- super.open();
+ public synchronized void activate() throws HyracksDataException {
+ super.activate();
List<Object> validFileNames = fileManager.cleanupAndGetValidFiles(componentFinalizer);
for (Object o : validFileNames) {
String fileName = (String) o;
@@ -105,13 +105,13 @@
}
@Override
- public synchronized void close() throws HyracksDataException {
+ public synchronized void deactivate() throws HyracksDataException {
for (Object o : diskComponents) {
RTree rtree = (RTree) o;
- rtree.close();
+ rtree.deactivate();
}
diskComponents.clear();
- super.close();
+ super.deactivate();
}
@Override
@@ -127,7 +127,7 @@
public synchronized void clear() throws HyracksDataException {
for (Object o : diskComponents) {
RTree rtree = (RTree) o;
- rtree.close();
+ rtree.deactivate();
rtree.destroy();
}
diskComponents.clear();
@@ -319,7 +319,7 @@
for (Object o : mergedComponents) {
RTree oldRTree = (RTree) o;
FileReference fileRef = diskFileMapProvider.lookupFileName(oldRTree.getFileId());
- oldRTree.close();
+ oldRTree.deactivate();
fileRef.getFile().delete();
}
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java
index ee0e10b..e4953b8 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java
@@ -39,7 +39,7 @@
throws Exception {
OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
for (int i = 0; i < bulkLoadRounds; i++) {
// We assume all fieldSerdes are of the same type. Check the first
// one
@@ -57,7 +57,7 @@
orderedIndexTestUtils.checkRangeSearch(ctx, prefixLowKey, prefixHighKey, true, true);
}
}
- ctx.getIndex().close();
+ ctx.getIndex().deactivate();
ctx.getIndex().destroy();
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexDeleteTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexDeleteTest.java
index d202e7b..829eef7 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexDeleteTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexDeleteTest.java
@@ -41,7 +41,7 @@
throws Exception {
OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
for (int i = 0; i < numInsertRounds; i++) {
// We assume all fieldSerdes are of the same type. Check the first
// one to determine which field types to generate.
@@ -63,7 +63,7 @@
}
}
}
- ctx.getIndex().close();
+ ctx.getIndex().deactivate();
ctx.getIndex().destroy();
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexExamplesTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
index 240ad9a..20e0927 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
@@ -82,7 +82,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, cmpFactories);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
long start = System.currentTimeMillis();
if (LOGGER.isLoggable(Level.INFO)) {
@@ -127,7 +127,7 @@
rangeSearch(cmpFactories, indexAccessor, fieldSerdes, lowKey, highKey);
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
@@ -161,7 +161,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, cmpFactories);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
long start = System.currentTimeMillis();
if (LOGGER.isLoggable(Level.INFO)) {
@@ -208,7 +208,7 @@
// Prefix-Range search in [-3, 3]
rangeSearch(cmpFactories, indexAccessor, fieldSerdes, lowKey, highKey);
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
@@ -239,7 +239,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, cmpFactories);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
long start = System.currentTimeMillis();
if (LOGGER.isLoggable(Level.INFO)) {
@@ -286,7 +286,7 @@
rangeSearch(cmpFactories, indexAccessor, fieldSerdes, lowKey, highKey);
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
@@ -318,7 +318,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, cmpFactories);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
@@ -387,7 +387,7 @@
break;
}
}
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
@@ -419,7 +419,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, cmpFactories);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Inserting into tree...");
@@ -473,7 +473,7 @@
// Do another scan after a round of updates.
orderedScan(indexAccessor, fieldSerdes);
}
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
@@ -505,7 +505,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, cmpFactories);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
// Load sorted records.
int ins = 100000;
@@ -542,7 +542,7 @@
// Prefix-Range search in [44444, 44500]
rangeSearch(cmpFactories, indexAccessor, fieldSerdes, lowKey, highKey);
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexInsertTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexInsertTest.java
index 246fbf8..48f90d5 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexInsertTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexInsertTest.java
@@ -45,7 +45,7 @@
throws Exception {
OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
// We assume all fieldSerdes are of the same type. Check the first one
// to determine which field types to generate.
if (fieldSerdes[0] instanceof IntegerSerializerDeserializer) {
@@ -62,7 +62,7 @@
if (prefixLowKey != null && prefixHighKey != null) {
orderedIndexTestUtils.checkRangeSearch(ctx, prefixLowKey, prefixHighKey, true, true);
}
- ctx.getIndex().close();
+ ctx.getIndex().deactivate();
ctx.getIndex().destroy();
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexUpdateTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexUpdateTest.java
index 9134215..d7ebfe4 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexUpdateTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexUpdateTest.java
@@ -44,7 +44,7 @@
}
OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
// We assume all fieldSerdes are of the same type. Check the first one
// to determine which field types to generate.
if (fieldSerdes[0] instanceof IntegerSerializerDeserializer) {
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexUpsertTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexUpsertTest.java
index f992bd8..bde6ec2 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexUpsertTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/btree/OrderedIndexUpsertTest.java
@@ -45,7 +45,7 @@
throws Exception {
OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
// We assume all fieldSerdes are of the same type. Check the first one
// to determine which field types to generate.
if (fieldSerdes[0] instanceof IntegerSerializerDeserializer) {
@@ -62,7 +62,7 @@
if (prefixLowKey != null && prefixHighKey != null) {
orderedIndexTestUtils.checkRangeSearch(ctx, prefixLowKey, prefixHighKey, true, true);
}
- ctx.getIndex().close();
+ ctx.getIndex().deactivate();
ctx.getIndex().destroy();
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/common/AbstractIndexLifecycleTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/common/AbstractIndexLifecycleTest.java
index 024797b..a29e6a3 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/common/AbstractIndexLifecycleTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/common/AbstractIndexLifecycleTest.java
@@ -39,8 +39,8 @@
Assert.assertTrue(persistentStateExists());
// Double open is valid
- index.open();
- index.open();
+ index.activate();
+ index.activate();
Assert.assertTrue(isEmptyIndex());
// insert some stuff
@@ -57,17 +57,17 @@
titu.insertIntTuples(testCtx, 10, getRandom());
// Double close is valid
- index.close();
- index.close();
+ index.deactivate();
+ index.deactivate();
// Reopen and reclose is valid
- index.open();
+ index.activate();
// make sure the stuff we inserted is still there
// TODO: re-enable when LSM index's close() is implemented properly
// titu.checkScan(testCtx);
- index.close();
+ index.deactivate();
// Double destroy is valid
index.destroy();
@@ -79,14 +79,14 @@
@Test(expected = HyracksDataException.class)
public void invalidSequenceTest1() throws Exception {
index.create();
- index.open();
+ index.activate();
index.create();
}
@Test(expected = HyracksDataException.class)
public void invalidSequenceTest2() throws Exception {
index.create();
- index.open();
+ index.activate();
index.destroy();
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/common/TreeIndexMultiThreadTestDriver.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/common/TreeIndexMultiThreadTestDriver.java
index 0e925ec..f4946d9 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/common/TreeIndexMultiThreadTestDriver.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/common/TreeIndexMultiThreadTestDriver.java
@@ -43,7 +43,7 @@
public void init(FileReference file) throws HyracksDataException {
index.create();
- index.open();
+ index.activate();
}
public long[] run(int numThreads, int numRepeats, int numOps, int batchSize) throws InterruptedException,
@@ -80,7 +80,7 @@
}
public void deinit() throws HyracksDataException {
- index.close();
+ index.deactivate();
}
// To allow subclasses to override the data gen params.
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeBulkLoadTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeBulkLoadTest.java
index 8c45347..54ad1fe 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeBulkLoadTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeBulkLoadTest.java
@@ -40,7 +40,7 @@
RTreePolicyType rtreePolicyType) throws Exception {
AbstractRTreeTestContext ctx = createTestContext(fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
for (int i = 0; i < bulkLoadRounds; i++) {
// We assume all fieldSerdes are of the same type. Check the first
// one to determine which field types to generate.
@@ -54,7 +54,7 @@
rTreeTestUtils.checkDiskOrderScan(ctx);
rTreeTestUtils.checkRangeSearch(ctx, key);
}
- ctx.getIndex().close();
+ ctx.getIndex().deactivate();
ctx.getIndex().destroy();
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
index 9d74657..18d042b 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
@@ -42,7 +42,7 @@
RTreePolicyType rtreePolicyType) throws Exception {
AbstractRTreeTestContext ctx = createTestContext(fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
for (int i = 0; i < numInsertRounds; i++) {
// We assume all fieldSerdes are of the same type. Check the first
// one to determine which field types to generate.
@@ -60,7 +60,7 @@
rTreeTestUtils.checkRangeSearch(ctx, key);
}
}
- ctx.getIndex().close();
+ ctx.getIndex().deactivate();
ctx.getIndex().destroy();
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
index 8a41eee..db14bf8 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
@@ -109,7 +109,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, rtreeCmpFactories, btreeCmpFactories,
valueProviderFactories, RTreePolicyType.RTREE);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
long start = System.currentTimeMillis();
if (LOGGER.isLoggable(Level.INFO)) {
@@ -157,7 +157,7 @@
rangeSearch(rtreeCmpFactories, indexAccessor, fieldSerdes, key);
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
@@ -217,7 +217,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, rtreeCmpFactories, btreeCmpFactories,
valueProviderFactories, RTreePolicyType.RTREE);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
long start = System.currentTimeMillis();
if (LOGGER.isLoggable(Level.INFO)) {
@@ -267,7 +267,7 @@
rangeSearch(rtreeCmpFactories, indexAccessor, fieldSerdes, key);
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
@@ -317,7 +317,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, rtreeCmpFactories, btreeCmpFactories,
valueProviderFactories, RTreePolicyType.RTREE);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
@@ -398,7 +398,7 @@
break;
}
}
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
@@ -449,7 +449,7 @@
ITreeIndex treeIndex = createTreeIndex(typeTraits, rtreeCmpFactories, btreeCmpFactories,
valueProviderFactories, RTreePolicyType.RTREE);
treeIndex.create();
- treeIndex.open();
+ treeIndex.activate();
// Load records.
int numInserts = 10000;
@@ -490,7 +490,7 @@
rangeSearch(rtreeCmpFactories, indexAccessor, fieldSerdes, key);
- treeIndex.close();
+ treeIndex.deactivate();
treeIndex.destroy();
}
diff --git a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
index c863665..eb90989 100644
--- a/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
+++ b/hyracks-test-support/src/main/java/edu/uci/ics/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
@@ -45,7 +45,7 @@
RTreePolicyType rtreePolicyType) throws Exception {
AbstractRTreeTestContext ctx = createTestContext(fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
// We assume all fieldSerdes are of the same type. Check the first one
// to determine which field types to generate.
if (fieldSerdes[0] instanceof IntegerSerializerDeserializer) {
@@ -57,7 +57,7 @@
rTreeTestUtils.checkScan(ctx);
rTreeTestUtils.checkDiskOrderScan(ctx);
rTreeTestUtils.checkRangeSearch(ctx, key);
- ctx.getIndex().close();
+ ctx.getIndex().deactivate();
ctx.getIndex().destroy();
}
diff --git a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeLifecycleTest.java b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeLifecycleTest.java
index 26c33fe..24cc4b4 100644
--- a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeLifecycleTest.java
+++ b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeLifecycleTest.java
@@ -30,7 +30,7 @@
@Override
public void tearDown() throws HyracksDataException {
- testCtx.getIndex().close();
+ testCtx.getIndex().deactivate();
testCtx.getIndex().destroy();
harness.tearDown();
}
diff --git a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeSearchCursorTest.java b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeSearchCursorTest.java
index ba5f3b0..d09a240 100644
--- a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeSearchCursorTest.java
+++ b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeSearchCursorTest.java
@@ -103,7 +103,7 @@
BTree btree = new BTree(bufferCache, harness.getFileMapProvider(), freePageManager, interiorFrameFactory,
leafFrameFactory, cmpFactories, fieldCount, harness.getFileReference());
btree.create();
- btree.open();
+ btree.activate();
ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
@@ -153,7 +153,7 @@
Assert.assertTrue(performSearches(keys, btree, leafFrame, interiorFrame, minSearchKey, maxSearchKey, true,
true, false));
- btree.close();
+ btree.deactivate();
btree.destroy();
}
@@ -182,7 +182,7 @@
BTree btree = new BTree(bufferCache, harness.getFileMapProvider(), freePageManager, interiorFrameFactory,
leafFrameFactory, cmpFactories, fieldCount, harness.getFileReference());
btree.create();
- btree.open();
+ btree.activate();
ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
@@ -229,7 +229,7 @@
Assert.assertTrue(performSearches(keys, btree, leafFrame, interiorFrame, minSearchKey, maxSearchKey, true,
true, false));
- btree.close();
+ btree.deactivate();
btree.destroy();
}
@@ -258,7 +258,7 @@
BTree btree = new BTree(bufferCache, harness.getFileMapProvider(), freePageManager, interiorFrameFactory,
leafFrameFactory, cmpFactories, fieldCount, harness.getFileReference());
btree.create();
- btree.open();
+ btree.activate();
ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
@@ -305,7 +305,7 @@
Assert.assertTrue(performSearches(keys, btree, leafFrame, interiorFrame, minSearchKey, maxSearchKey, true,
true, false));
- btree.close();
+ btree.deactivate();
btree.destroy();
}
diff --git a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeStatsTest.java b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeStatsTest.java
index 0cff43a..36aa21b 100644
--- a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeStatsTest.java
+++ b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeStatsTest.java
@@ -84,7 +84,7 @@
BTree btree = new BTree(bufferCache, fmp, freePageManager, interiorFrameFactory, leafFrameFactory,
cmpFactories, fieldCount, harness.getFileReference());
btree.create();
- btree.open();
+ btree.activate();
Random rnd = new Random();
rnd.setSeed(50);
@@ -153,7 +153,7 @@
fileId);
bufferCacheWarmup.warmup(leafFrame, metaFrame, new int[] { 1, 2 }, new int[] { 2, 5 });
- btree.close();
+ btree.deactivate();
btree.destroy();
bufferCache.close();
}
diff --git a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeUpdateSearchTest.java b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
index 8936249..4bc10b8 100644
--- a/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
+++ b/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
@@ -67,7 +67,7 @@
BTree btree = new BTree(bufferCache, harness.getFileMapProvider(), freePageManager, interiorFrameFactory,
leafFrameFactory, cmpFactories, fieldCount, harness.getFileReference());
btree.create();
- btree.open();
+ btree.activate();
Random rnd = new Random();
rnd.setSeed(50);
@@ -150,7 +150,7 @@
} finally {
scanCursor.close();
}
- btree.close();
+ btree.deactivate();
btree.destroy();
}
}
diff --git a/hyracks-tests/hyracks-storage-am-invertedindex-test/src/test/java/edu/uci/ics/hyracks/storage/am/invertedindex/AbstractInvIndexSearchTest.java b/hyracks-tests/hyracks-storage-am-invertedindex-test/src/test/java/edu/uci/ics/hyracks/storage/am/invertedindex/AbstractInvIndexSearchTest.java
index 5e40c05..c60d57f 100644
--- a/hyracks-tests/hyracks-storage-am-invertedindex-test/src/test/java/edu/uci/ics/hyracks/storage/am/invertedindex/AbstractInvIndexSearchTest.java
+++ b/hyracks-tests/hyracks-storage-am-invertedindex-test/src/test/java/edu/uci/ics/hyracks/storage/am/invertedindex/AbstractInvIndexSearchTest.java
@@ -157,7 +157,7 @@
btreeTypeTraits.length, btreeFile);
btree.create();
- btree.open();
+ btree.activate();
// --- INVERTED INDEX ---
@@ -170,7 +170,7 @@
invIndex = new InvertedIndex(bufferCache, btree, invListTypeTraits, invListCmpFactories, invListBuilder, fmp,
invListsFile);
invIndex.create();
- invIndex.open();
+ invIndex.activate();
rnd.setSeed(50);
}
@@ -178,9 +178,9 @@
@After
public void deinit() throws HyracksDataException {
AbstractInvIndexTest.tearDown();
- btree.close();
+ btree.deactivate();
btree.destroy();
- invIndex.close();
+ invIndex.deactivate();
invIndex.destroy();
bufferCache.close();
}
diff --git a/hyracks-tests/hyracks-storage-am-invertedindex-test/src/test/java/edu/uci/ics/hyracks/storage/am/invertedindex/BulkLoadTest.java b/hyracks-tests/hyracks-storage-am-invertedindex-test/src/test/java/edu/uci/ics/hyracks/storage/am/invertedindex/BulkLoadTest.java
index 3c2d656..cc8a503 100644
--- a/hyracks-tests/hyracks-storage-am-invertedindex-test/src/test/java/edu/uci/ics/hyracks/storage/am/invertedindex/BulkLoadTest.java
+++ b/hyracks-tests/hyracks-storage-am-invertedindex-test/src/test/java/edu/uci/ics/hyracks/storage/am/invertedindex/BulkLoadTest.java
@@ -120,7 +120,7 @@
BTree btree = new BTree(bufferCache, fmp, freePageManager, interiorFrameFactory, leafFrameFactory,
cmpFactories, btreeTypeTraits.length, btreeFile);
btree.create();
- btree.open();
+ btree.activate();
int invListFields = 1;
ITypeTraits[] invListTypeTraits = new ITypeTraits[invListFields];
invListTypeTraits[0] = IntegerPointable.TYPE_TRAITS;
@@ -133,7 +133,7 @@
InvertedIndex invIndex = new InvertedIndex(bufferCache, btree, invListTypeTraits, invListCmpFactories,
invListBuilder, fmp, invListsFile);
invIndex.create();
- invIndex.open();
+ invIndex.activate();
Random rnd = new Random();
rnd.setSeed(50);
@@ -277,9 +277,9 @@
invListCursor.unpinPages();
}
- btree.close();
+ btree.deactivate();
btree.destroy();
- invIndex.close();
+ invIndex.deactivate();
invIndex.destroy();
bufferCache.close();
}
diff --git a/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.java b/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.java
index 8a18781..a48ff17 100644
--- a/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.java
+++ b/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.java
@@ -46,7 +46,7 @@
@Override
public void tearDown() throws Exception {
- index.close();
+ index.deactivate();
index.destroy();
harness.tearDown();
}
diff --git a/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/btree/LSMBTreeMergeTestDriver.java b/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/btree/LSMBTreeMergeTestDriver.java
index 9a874f3..4d471b8 100644
--- a/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/btree/LSMBTreeMergeTestDriver.java
+++ b/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/btree/LSMBTreeMergeTestDriver.java
@@ -42,7 +42,7 @@
throws Exception {
OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
// Start off with one tree bulk loaded.
// We assume all fieldSerdes are of the same type. Check the first one
// to determine which field types to generate.
@@ -73,7 +73,7 @@
orderedIndexTestUtils.checkRangeSearch(ctx, prefixLowKey, prefixHighKey, true, true);
}
}
- ctx.getIndex().close();
+ ctx.getIndex().deactivate();
ctx.getIndex().destroy();
}
diff --git a/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeLifecycleTest.java b/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeLifecycleTest.java
index 9208783..f269315 100644
--- a/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeLifecycleTest.java
+++ b/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeLifecycleTest.java
@@ -57,7 +57,7 @@
@Override
public void tearDown() throws Exception {
- index.close();
+ index.deactivate();
index.destroy();
harness.tearDown();
}
diff --git a/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeMergeTestDriver.java b/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeMergeTestDriver.java
index f41d4b9..da66966 100644
--- a/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeMergeTestDriver.java
+++ b/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeMergeTestDriver.java
@@ -44,7 +44,7 @@
AbstractRTreeTestContext ctx = createTestContext(fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType);
ctx.getIndex().create();
- ctx.getIndex().open();
+ ctx.getIndex().activate();
// Start off with one tree bulk loaded.
// We assume all fieldSerdes are of the same type. Check the first one
// to determine which field types to generate.
@@ -71,7 +71,7 @@
rTreeTestUtils.checkDiskOrderScan(ctx);
rTreeTestUtils.checkRangeSearch(ctx, key);
}
- ctx.getIndex().close();
+ ctx.getIndex().deactivate();
ctx.getIndex().destroy();
}
diff --git a/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesLifecycleTest.java b/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesLifecycleTest.java
index f6723f4..cc05e32 100644
--- a/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesLifecycleTest.java
+++ b/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesLifecycleTest.java
@@ -57,7 +57,7 @@
@Override
public void tearDown() throws Exception {
- index.close();
+ index.deactivate();
index.destroy();
harness.tearDown();
}
diff --git a/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/rtree/RTreeLifecycleTest.java b/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/rtree/RTreeLifecycleTest.java
index 4f9dacf..32b6aca 100644
--- a/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/rtree/RTreeLifecycleTest.java
+++ b/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/rtree/RTreeLifecycleTest.java
@@ -38,7 +38,7 @@
@Override
public void tearDown() throws HyracksDataException {
- testCtx.getIndex().close();
+ testCtx.getIndex().deactivate();
testCtx.getIndex().destroy();
harness.tearDown();
}
diff --git a/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/rtree/RTreeSearchCursorTest.java b/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/rtree/RTreeSearchCursorTest.java
index 4662813..06d18bb 100644
--- a/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/rtree/RTreeSearchCursorTest.java
+++ b/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/edu/uci/ics/hyracks/storage/am/rtree/RTreeSearchCursorTest.java
@@ -120,7 +120,7 @@
RTree rtree = new RTree(bufferCache, harness.getFileMapProvider(), freePageManager, interiorFrameFactory,
leafFrameFactory, cmpFactories, fieldCount, harness.getFileReference());
rtree.create();
- rtree.open();
+ rtree.activate();
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
@@ -171,7 +171,7 @@
rTreeTestUtils.checkExpectedResults(searchCursor, expectedResult, fieldSerdes, keyFieldCount, null);
- rtree.close();
+ rtree.deactivate();
rtree.destroy();
}