abdullah alamoudi has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2238
Change subject: [ASTERIXDB-2204][STO] Fix the IIndexCursor interface
......................................................................
[ASTERIXDB-2204][STO] Fix the IIndexCursor interface
- user model changes: no
- storage format changes: no
- interface changes: yes
- replace IIndexCursor.reset with close
- replace IIndexCursor.close with destroy
Details:
- This change is the first step towards fixing the behavior
of implementors/callers of the IIndexCursor interface
- In this change, we simply rename the reset -> close
and close -> destroy and we write down the javadocs
explaining the semantics of the interface.
Change-Id: I64cf8c0a5473268bdfd71fd560ee6b3bff219ce9
---
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeRangeSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/TreeIndexDiskOrderScanCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponentScanCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyAbstractCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexRangeSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedListCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexRangeSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/PartitionedOnDiskInvertedIndex.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSortedCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesFlushCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/TreeTupleSorter.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSearchCursor.java
M
hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndexCursor.java
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractSearchOperationCallbackTest.java
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/AbstractIndexTestWorker.java
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/RTreeTestUtils.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/multithread/BTreeTestWorker.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceScanDiskComponentsTest.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/multithread/LSMBTreeTestWorker.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexTestWorker.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestUtils.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/AbstractLSMRTreeTestWorker.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeTestWorker.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeWithAntiMatterTuplesTestWorker.java
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeTestWorker.java
57 files changed, 240 insertions(+), 214 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/38/2238/1
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java
index c11fb61..88b8a14 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java
@@ -102,7 +102,7 @@
searchKeyTupleBuilder.reset();
searchKeyTupleBuilder.addField(intSerde, currentFileNumber);
searchKey.reset(searchKeyTupleBuilder.getFieldEndOffsets(),
searchKeyTupleBuilder.getByteArray());
- fileIndexSearchCursor.reset();
+ fileIndexSearchCursor.close();
// Perform search
fileIndexAccessor.search(fileIndexSearchCursor, searchPredicate);
@@ -137,7 +137,7 @@
public void close() throws HyracksDataException {
if (index != null) {
try {
- fileIndexSearchCursor.close();
+ fileIndexSearchCursor.destroy();
} finally {
indexDataflowHelper.close();
}
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 368fc2a..6dd6237 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -1194,7 +1194,7 @@
SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING)
}));
}
} finally {
- rangeCursor.close();
+ rangeCursor.destroy();
}
datasetLifecycleManager.close(resourceName);
@@ -1215,7 +1215,7 @@
SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING)
}));
}
} finally {
- rangeCursor.close();
+ rangeCursor.destroy();
}
datasetLifecycleManager.close(resourceName);
@@ -1237,7 +1237,7 @@
SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING)
}));
}
} finally {
- rangeCursor.close();
+ rangeCursor.destroy();
}
datasetLifecycleManager.close(resourceName);
} catch (Exception e) {
@@ -1282,7 +1282,7 @@
}
}
} finally {
- rangeCursor.close();
+ rangeCursor.destroy();
}
datasetLifecycleManager.close(resourceName);
}
@@ -1316,7 +1316,7 @@
}
}
} finally {
- rangeCursor.close();
+ rangeCursor.destroy();
}
} finally {
datasetLifecycleManager.close(resourceName);
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
index 4855a27..0d74e30 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
@@ -25,7 +25,6 @@
import org.apache.asterix.common.api.INcApplicationContext;
import org.apache.asterix.common.dataflow.LSMIndexUtil;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.transactions.ILogMarkerCallback;
import org.apache.asterix.common.transactions.PrimaryIndexLogMarkerCallback;
import org.apache.asterix.om.pointables.nonvisitor.ARecordPointable;
@@ -143,7 +142,7 @@
if (cursor.hasNext()) {
cursor.next();
prevTuple = cursor.getTuple();
- cursor.reset(); // end the search
+ cursor.close(); // end the search
appendFilterToPrevTuple();
appendPrevRecord();
appendPreviousMeta();
@@ -318,7 +317,7 @@
if (isFiltered) {
writeMissingField();
}
- cursor.reset();
+ cursor.close();
}
/**
@@ -361,7 +360,7 @@
public void close() throws HyracksDataException {
try {
try {
- cursor.close();
+ cursor.destroy();
} finally {
writer.close();
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java
index d7084bb..82df92c 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java
@@ -207,7 +207,7 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
if (page != null) {
releasePage();
}
@@ -220,9 +220,9 @@
}
@Override
- public void reset() {
+ public void close() {
try {
- close();
+ destroy();
} catch (Exception e) {
e.printStackTrace();
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeRangeSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeRangeSearchCursor.java
index 13cb57a..5ce9e1a 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeRangeSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeRangeSearchCursor.java
@@ -81,7 +81,7 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
if (page != null) {
if (exclusiveLatchNodes) {
page.releaseWriteLatch(isPageDirty);
@@ -292,8 +292,8 @@
}
@Override
- public void reset() throws HyracksDataException {
- close();
+ public void close() throws HyracksDataException {
+ destroy();
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java
index 64f8263..4ff0656 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java
@@ -390,7 +390,7 @@
cursor = Mockito.mock(IIndexCursor.class);
Mockito.when(cursor.hasNext()).thenReturn(true, true, false);
Mockito.when(cursor.getTuple()).thenReturn(tuples[i]);
- Mockito.doThrow(new HyracksDataException("Failed to close
cursor")).when(cursor).close();
+ Mockito.doThrow(new HyracksDataException("Failed to close
cursor")).when(cursor).destroy();
cursors[j] = cursor;
j++;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
index 1e5f69b..09812c1 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
@@ -201,7 +201,7 @@
try {
for (int i = 0; i < tupleCount; i++) {
resetSearchPredicate(i);
- cursor.reset();
+ cursor.close();
indexAccessor.search(cursor, searchPred);
writeSearchResults(i);
}
@@ -232,7 +232,7 @@
}
try {
- cursor.close();
+ cursor.destroy();
} catch (Throwable th) {
if (closeException == null) {
closeException = HyracksDataException.create(th);
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
index dc86c74..7626815 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
@@ -95,7 +95,7 @@
throw new HyracksDataException(th);
} finally {
try {
- cursor.close();
+ cursor.destroy();
} catch (Exception cursorCloseException) {
throw new IllegalStateException(cursorCloseException);
} finally {
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/TreeIndexDiskOrderScanCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/TreeIndexDiskOrderScanCursor.java
index 0b8b64c..6bc5be2 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/TreeIndexDiskOrderScanCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/TreeIndexDiskOrderScanCursor.java
@@ -48,7 +48,7 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
page.releaseReadLatch();
bufferCache.unpin(page);
page = null;
@@ -130,7 +130,7 @@
}
@Override
- public void reset() {
+ public void close() {
tupleIndex = 0;
currentPageId = -1;
maxPageId = -1;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java
index c6ce339..0c4ea0f 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java
@@ -342,7 +342,7 @@
componentBulkLoader.delete(tuple);
}
} finally {
- buddyBtreeCursor.close();
+ buddyBtreeCursor.destroy();
}
} else {
componentBulkLoader = mergedComponent.createBulkLoader(1.0f,
false, 0L, false, false, false);
@@ -355,7 +355,7 @@
componentBulkLoader.add(frameTuple);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
componentBulkLoader.end();
return mergedComponent;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
index 6929530..3b056ee 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
@@ -189,14 +189,14 @@
if (!lsmbtreeTuple.isAntimatter()) {
throw
HyracksDataException.create(ErrorCode.DUPLICATE_KEY);
} else {
- memCursor.close();
+ memCursor.destroy();
ctx.getCurrentMutableBTreeAccessor().upsertIfConditionElseInsert(tuple,
AntimatterAwareTupleAcceptor.INSTANCE);
return true;
}
}
} finally {
- memCursor.close();
+ memCursor.destroy();
}
// TODO: Can we just remove the above code that search the mutable
@@ -214,7 +214,7 @@
throw HyracksDataException.create(ErrorCode.DUPLICATE_KEY);
}
} finally {
- searchCursor.close();
+ searchCursor.destroy();
// Add the current active mutable component back
ctx.getComponentHolder().add(0, firstComponent);
}
@@ -264,7 +264,7 @@
numElements =
IntegerPointable.getInteger(countTuple.getFieldData(0),
countTuple.getFieldStart(0));
}
} finally {
- countingCursor.close();
+ countingCursor.destroy();
}
}
@@ -287,7 +287,7 @@
componentBulkLoader.add(scanCursor.getTuple());
}
} finally {
- scanCursor.close();
+ scanCursor.destroy();
}
if (component.getLSMComponentFilter() != null) {
@@ -337,7 +337,7 @@
componentBulkLoader.add(frameTuple);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
if (mergedComponent.getLSMComponentFilter() != null) {
List<ITupleReference> filterTuples = new ArrayList<>();
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponentScanCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponentScanCursor.java
index 2f77504..efaf555 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponentScanCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponentScanCursor.java
@@ -176,11 +176,11 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
if (lsmHarness != null) {
try {
for (int i = 0; i < rangeCursors.length; i++) {
- rangeCursors[i].close();
+ rangeCursors[i].destroy();
}
rangeCursors = null;
} finally {
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
index 211a233..c9b6562 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
@@ -89,7 +89,7 @@
if (reconciled) {
searchCallback.cancel(predicate.getLowKey());
}
- rangeCursors[i].close();
+ rangeCursors[i].destroy();
return false;
} else {
frameTuple = rangeCursors[i].getTuple();
@@ -100,7 +100,7 @@
}
if (i == 0 && includeMutableComponent) {
// unlatch/unpin
- rangeCursors[i].reset();
+ rangeCursors[i].close();
searchCallback.reconcile(predicate.getLowKey());
reconciled = true;
@@ -110,7 +110,7 @@
rangeCursors[i].next();
if (((ILSMTreeTupleReference)
rangeCursors[i].getTuple()).isAntimatter()) {
searchCallback.cancel(predicate.getLowKey());
- rangeCursors[i].close();
+ rangeCursors[i].destroy();
return false;
} else {
frameTuple = rangeCursors[i].getTuple();
@@ -121,7 +121,7 @@
}
} else {
searchCallback.cancel(predicate.getLowKey());
- rangeCursors[i].close();
+ rangeCursors[i].destroy();
}
} else {
frameTuple = rangeCursors[i].getTuple();
@@ -132,18 +132,18 @@
return true;
}
} else {
- rangeCursors[i].close();
+ rangeCursors[i].destroy();
}
}
return false;
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
try {
if (rangeCursors != null) {
for (int i = 0; i < rangeCursors.length; ++i) {
- rangeCursors[i].reset();
+ rangeCursors[i].close();
}
}
nextHasBeenCalled = false;
@@ -182,7 +182,7 @@
rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame,
false);
} else {
// reset
- rangeCursors[i].reset();
+ rangeCursors[i].close();
}
btree = ((LSMBTreeMemoryComponent) component).getIndex();
// no bloom filter for in-memory BTree
@@ -190,7 +190,7 @@
} else {
if (rangeCursors[i] != null) {
// can re-use cursor
- rangeCursors[i].reset();
+ rangeCursors[i].close();
} else {
// create new cursor <should be relatively rare>
IBTreeLeafFrame leafFrame = (IBTreeLeafFrame)
lsmInitialState.getLeafFrameFactory().createFrame();
@@ -216,7 +216,7 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
if (lsmHarness != null) {
try {
closeCursors();
@@ -272,7 +272,7 @@
if (rangeCursors != null) {
for (int i = 0; i < numBTrees; ++i) {
if (rangeCursors[i] != null) {
- rangeCursors[i].close();
+ rangeCursors[i].destroy();
}
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
index 3e14fb9..3b46ab6 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
@@ -66,8 +66,8 @@
}
@Override
- public void reset() throws HyracksDataException {
- super.reset();
+ public void close() throws HyracksDataException {
+ super.close();
canCallProceed = true;
}
@@ -121,7 +121,7 @@
TupleUtils.copyTuple(tupleBuilder,
queueHead.getTuple(), cmp.getKeyFieldCount());
copyTuple.reset(tupleBuilder.getFieldEndOffsets(), tupleBuilder.getByteArray());
// Unlatches/unpins the leaf page of the index.
- rangeCursors[0].reset();
+ rangeCursors[0].close();
// Reconcile.
searchCallback.reconcile(copyTuple);
// Re-traverses the index.
@@ -221,7 +221,7 @@
copyTuple.reset(switchComponentTupleBuilders[i].getFieldEndOffsets(),
switchComponentTupleBuilders[i].getByteArray());
reusablePred.setLowKey(copyTuple, true);
- rangeCursors[i].reset();
+ rangeCursors[i].close();
ILSMComponent component = operationalComponents.get(i);
BTree btree = (BTree) component.getIndex();
if (i == 0 && component.getType() != LSMComponentType.MEMORY) {
@@ -273,8 +273,8 @@
}
TupleUtils.copyTuple(switchComponentTupleBuilders[i],
element.getTuple(), cmp.getKeyFieldCount());
}
- rangeCursors[i].reset();
rangeCursors[i].close();
+ rangeCursors[i].destroy();
switchRequest[i] = true;
switchedElements[i] = element;
}
@@ -301,7 +301,7 @@
TupleUtils.copyTuple(tupleBuilder, mutableElement.getTuple(),
cmp.getKeyFieldCount());
copyTuple.reset(tupleBuilder.getFieldEndOffsets(),
tupleBuilder.getByteArray());
// Unlatches/unpins the leaf page of the index.
- rangeCursors[0].reset();
+ rangeCursors[0].close();
// Re-traverses the index.
reusablePred.setLowKey(copyTuple, true);
btreeAccessors[0].search(rangeCursors[0], reusablePred);
@@ -352,7 +352,7 @@
rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
} else {
// re-use
- rangeCursors[i].reset();
+ rangeCursors[i].close();
}
if (component.getType() == LSMComponentType.MEMORY) {
includeMutableComponent = true;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeSearchCursor.java
index fef8afe..07af6f6 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeSearchCursor.java
@@ -72,17 +72,17 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
if (currentCursor != null) {
- currentCursor.close();
+ currentCursor.destroy();
}
currentCursor = null;
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
if (currentCursor != null) {
- currentCursor.reset();
+ currentCursor.close();
}
currentCursor = null;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyAbstractCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyAbstractCursor.java
index f619a52..59c352b 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyAbstractCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyAbstractCursor.java
@@ -107,7 +107,7 @@
buddyBtreeCursors[i] = new BTreeRangeSearchCursor(
(IBTreeLeafFrame)
lsmInitialState.getBuddyBTreeLeafFrameFactory().createFrame(), false);
} else {
- buddyBtreeCursors[i].reset();
+ buddyBtreeCursors[i].close();
}
btree = ((LSMBTreeWithBuddyMemoryComponent)
component).getIndex();
buddyBtree = ((LSMBTreeWithBuddyMemoryComponent)
component).getBuddyIndex();
@@ -117,7 +117,7 @@
buddyBtreeCursors[i] = new BTreeRangeSearchCursor(
(IBTreeLeafFrame)
lsmInitialState.getBuddyBTreeLeafFrameFactory().createFrame(), false);
} else {
- buddyBtreeCursors[i].reset();
+ buddyBtreeCursors[i].close();
}
btree = ((LSMBTreeWithBuddyDiskComponent)
component).getIndex();
buddyBtree = ((LSMBTreeWithBuddyDiskComponent)
component).getBuddyIndex();
@@ -129,7 +129,7 @@
btreeAccessors[i] =
btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
buddyBtreeAccessors[i] =
buddyBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
} else {
- btreeCursors[i].reset();
+ btreeCursors[i].close();
btreeAccessors[i].reset(btree, NoOpOperationCallback.INSTANCE,
NoOpOperationCallback.INSTANCE);
buddyBtreeAccessors[i].reset(buddyBtree,
NoOpOperationCallback.INSTANCE,
NoOpOperationCallback.INSTANCE);
@@ -141,15 +141,15 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
if (!open) {
return;
}
try {
if (btreeCursors != null && buddyBtreeCursors != null) {
for (int i = 0; i < numberOfTrees; i++) {
- btreeCursors[i].close();
- buddyBtreeCursors[i].close();
+ btreeCursors[i].destroy();
+ buddyBtreeCursors[i].destroy();
}
}
btreeCursors = null;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
index 503182a..c7f5cea 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
@@ -37,13 +37,13 @@
}
@Override
- public void close() throws HyracksDataException {
- super.close();
+ public void destroy() throws HyracksDataException {
+ super.destroy();
currentCursor = 0;
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
if (!open) {
return;
}
@@ -52,8 +52,8 @@
foundNext = false;
try {
for (int i = 0; i < numberOfTrees; i++) {
- btreeCursors[i].close();
- buddyBtreeCursors[i].close();
+ btreeCursors[i].destroy();
+ buddyBtreeCursors[i].destroy();
}
btreeCursors = null;
buddyBtreeCursors = null;
@@ -64,7 +64,7 @@
private void searchNextCursor() throws HyracksDataException {
if (currentCursor < numberOfTrees) {
- btreeCursors[currentCursor].reset();
+ btreeCursors[currentCursor].close();
btreeAccessors[currentCursor].search(btreeCursors[currentCursor],
btreeRangePredicate);
}
}
@@ -85,7 +85,7 @@
&&
!buddyBtreeBloomFilters[i].contains(buddyBTreeTuple, hashes)) {
continue;
}
- buddyBtreeCursors[i].reset();
+ buddyBtreeCursors[i].close();
buddyBtreeRangePredicate.setHighKey(buddyBTreeTuple, true);
buddyBtreeRangePredicate.setLowKey(buddyBTreeTuple, true);
buddyBtreeAccessors[i].search(buddyBtreeCursors[i],
buddyBtreeRangePredicate);
@@ -94,7 +94,7 @@
killerTupleFound = true;
}
} finally {
- buddyBtreeCursors[i].close();
+ buddyBtreeCursors[i].destroy();
}
}
if (!killerTupleFound) {
@@ -103,7 +103,7 @@
return true;
}
}
- btreeCursors[currentCursor].close();
+ btreeCursors[currentCursor].destroy();
currentCursor++;
searchNextCursor();
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
index 8fd3a83..d889622 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
@@ -39,7 +39,7 @@
throws HyracksDataException {
super(opCtx);
this.buddyBtreeTuple = new PermutingTupleReference(buddyBTreeFields);
- reset();
+ close();
}
public ILSMIndexOperationContext getOpCtx() {
@@ -47,12 +47,12 @@
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
depletedBtreeCursors = new boolean[numberOfTrees];
foundNext = false;
try {
for (int i = 0; i < numberOfTrees; i++) {
- btreeCursors[i].reset();
+ btreeCursors[i].close();
btreeAccessors[i].search(btreeCursors[i], btreeRangePredicate);
if (btreeCursors[i].hasNext()) {
btreeCursors[i].next();
@@ -127,7 +127,7 @@
boolean killed = false;
buddyBtreeTuple.reset(frameTuple);
for (int i = 0; i < foundIn; i++) {
- buddyBtreeCursors[i].reset();
+ buddyBtreeCursors[i].close();
buddyBtreeRangePredicate.setHighKey(buddyBtreeTuple, true);
btreeRangePredicate.setLowKey(buddyBtreeTuple, true);
btreeAccessors[i].search(btreeCursors[i], btreeRangePredicate);
@@ -137,7 +137,7 @@
break;
}
} finally {
- btreeCursors[i].close();
+ btreeCursors[i].destroy();
}
}
if (!killed) {
@@ -160,7 +160,7 @@
depletedBtreeCursors = new boolean[numberOfTrees];
foundNext = false;
for (int i = 0; i < numberOfTrees; i++) {
- btreeCursors[i].reset();
+ btreeCursors[i].close();
btreeAccessors[i].search(btreeCursors[i], btreeRangePredicate);
if (btreeCursors[i].hasNext()) {
btreeCursors[i].next();
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java
index 17c681c..aec2b44 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java
@@ -107,7 +107,7 @@
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
hasNextCallCount = 0;
switchPossible = true;
outputElement = null;
@@ -122,7 +122,7 @@
if (rangeCursors != null) {
for (int i = 0; i < rangeCursors.length; i++) {
- rangeCursors[i].reset();
+ rangeCursors[i].close();
}
}
rangeCursors = null;
@@ -147,7 +147,7 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
try {
if (outputPriorityQueue != null) {
outputPriorityQueue.clear();
@@ -155,7 +155,7 @@
if (rangeCursors != null) {
for (int i = 0; i < rangeCursors.length; i++) {
if (rangeCursors[i] != null) {
- rangeCursors[i].close();
+ rangeCursors[i].destroy();
}
}
rangeCursors = null;
@@ -202,7 +202,7 @@
outputPriorityQueue.offer(e);
return true;
}
- rangeCursors[cursorIndex].close();
+ rangeCursors[cursorIndex].destroy();
return false;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
index 01f0f1a..05561f2 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
@@ -294,7 +294,7 @@
numBTreeTuples =
IntegerPointable.getInteger(countTuple.getFieldData(0),
countTuple.getFieldStart(0));
}
} finally {
- btreeCountingCursor.close();
+ btreeCountingCursor.destroy();
}
ILSMDiskComponentBulkLoader componentBulkLoader =
@@ -310,7 +310,7 @@
componentBulkLoader.delete(deletedKeysScanCursor.getTuple());
}
} finally {
- deletedKeysScanCursor.close();
+ deletedKeysScanCursor.destroy();
}
// Scan the in-memory inverted index
@@ -327,7 +327,7 @@
componentBulkLoader.add(scanCursor.getTuple());
}
} finally {
- scanCursor.close();
+ scanCursor.destroy();
}
if (component.getLSMComponentFilter() != null) {
List<ITupleReference> filterTuples = new ArrayList<>();
@@ -383,7 +383,7 @@
componentBulkLoader.delete(tuple);
}
} finally {
- btreeCursor.close();
+ btreeCursor.destroy();
}
} else {
componentBulkLoader = component.createBulkLoader(1.0f, false, 0L,
false, false, false);
@@ -396,7 +396,7 @@
componentBulkLoader.add(tuple);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
if (component.getLSMComponentFilter() != null) {
List<ITupleReference> filterTuples = new ArrayList<>();
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexRangeSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexRangeSearchCursor.java
index d565b9a..4afccef 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexRangeSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexRangeSearchCursor.java
@@ -106,14 +106,14 @@
if (bloomFilters[i] != null &&
bloomFilters[i].contains(keysOnlyTuple, hashes)) {
continue;
}
- deletedKeysBTreeCursors[i].reset();
+ deletedKeysBTreeCursors[i].close();
try {
deletedKeysBTreeAccessors.get(i).search(deletedKeysBTreeCursors[i],
keySearchPred);
if (deletedKeysBTreeCursors[i].hasNext()) {
return true;
}
} finally {
- deletedKeysBTreeCursors[i].close();
+ deletedKeysBTreeCursors[i].destroy();
}
}
return false;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexSearchCursor.java
index c214a2c..14ea6e1 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexSearchCursor.java
@@ -98,7 +98,7 @@
keySearchPred.setLowKey(key, true);
keySearchPred.setHighKey(key, true);
for (int i = 0; i < accessorIndex; i++) {
- deletedKeysBTreeCursors[i].reset();
+ deletedKeysBTreeCursors[i].close();
if (deletedKeysBTreeBloomFilters[i] != null &&
!deletedKeysBTreeBloomFilters[i].contains(key, hashes)) {
continue;
}
@@ -108,7 +108,7 @@
return true;
}
} finally {
- deletedKeysBTreeCursors[i].close();
+ deletedKeysBTreeCursors[i].destroy();
}
}
return false;
@@ -147,7 +147,7 @@
if (nextValidTuple()) {
return true;
}
- currentCursor.close();
+ currentCursor.destroy();
accessorIndex++;
}
while (accessorIndex < indexAccessors.size()) {
@@ -159,7 +159,7 @@
return true;
}
// Close as we go to release resources.
- currentCursor.close();
+ currentCursor.destroy();
accessorIndex++;
}
return false;
@@ -172,15 +172,15 @@
}
@Override
- public void close() throws HyracksDataException {
- reset();
+ public void destroy() throws HyracksDataException {
+ close();
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
try {
if (currentCursor != null) {
- currentCursor.close();
+ currentCursor.destroy();
currentCursor = null;
}
accessorIndex = 0;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedListCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedListCursor.java
index 7078c4b..7bf5322 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedListCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedListCursor.java
@@ -91,8 +91,8 @@
tokenTuple.reset(tokenTupleBuilder.getFieldEndOffsets(),
tokenTupleBuilder.getByteArray());
btreeSearchTuple.reset();
btreeSearchTuple.addTuple(tokenTuple);
- btreeCursor.reset();
- countingCursor.reset();
+ btreeCursor.close();
+ countingCursor.close();
}
@Override
@@ -113,7 +113,7 @@
@Override
public void unpinPages() throws HyracksDataException {
if (cursorNeedsClose) {
- btreeCursor.close();
+ btreeCursor.destroy();
cursorNeedsClose = false;
}
}
@@ -154,7 +154,7 @@
e.printStackTrace();
} finally {
try {
- countingCursor.close();
+ countingCursor.destroy();
} catch (HyracksDataException e) {
e.printStackTrace();
}
@@ -197,8 +197,8 @@
try {
containsKey = btreeCursor.hasNext();
} finally {
+ btreeCursor.destroy();
btreeCursor.close();
- btreeCursor.reset();
btreeSearchTuple.removeLastTuple();
}
return containsKey;
@@ -219,8 +219,8 @@
strBuilder.append(o.toString() + " ");
}
} finally {
+ btreeCursor.destroy();
btreeCursor.close();
- btreeCursor.reset();
}
btreeAccessor.search(btreeCursor, btreePred);
return strBuilder.toString();
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java
index 5301fa1..8db298d 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java
@@ -205,8 +205,8 @@
listCursor.reset(0, 0, 0, 0);
}
} finally {
+ ctx.getBtreeCursor().destroy();
ctx.getBtreeCursor().close();
- ctx.getBtreeCursor().reset();
}
}
@@ -589,7 +589,7 @@
}
}
} finally {
- btreeCursor.close();
+ btreeCursor.destroy();
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexRangeSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexRangeSearchCursor.java
index b2aff3a..632d739 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexRangeSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexRangeSearchCursor.java
@@ -109,21 +109,21 @@
}
@Override
+ public void destroy() throws HyracksDataException {
+ if (unpinNeeded) {
+ invListCursor.unpinPages();
+ unpinNeeded = false;
+ }
+ btreeCursor.destroy();
+ }
+
+ @Override
public void close() throws HyracksDataException {
if (unpinNeeded) {
invListCursor.unpinPages();
unpinNeeded = false;
}
- btreeCursor.close();
- }
-
- @Override
- public void reset() throws HyracksDataException {
- if (unpinNeeded) {
- invListCursor.unpinPages();
- unpinNeeded = false;
- }
- btreeCursor.close();
+ btreeCursor.destroy();
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexSearchCursor.java
index af5a187..1aab6e1 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexSearchCursor.java
@@ -104,7 +104,7 @@
}
@Override
- public void reset() {
+ public void close() {
currentBufferIndex = 0;
tupleIndex = 0;
invIndexSearcher.reset();
@@ -113,7 +113,7 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
currentBufferIndex = 0;
tupleIndex = 0;
resultBuffers = null;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/PartitionedOnDiskInvertedIndex.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/PartitionedOnDiskInvertedIndex.java
index a33d6d3..01e0684 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/PartitionedOnDiskInvertedIndex.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/PartitionedOnDiskInvertedIndex.java
@@ -102,8 +102,8 @@
tokenExists = true;
}
} finally {
+ ctx.getBtreeCursor().destroy();
ctx.getBtreeCursor().close();
- ctx.getBtreeCursor().reset();
}
return tokenExists;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java
index 6f61935..2f819cf 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java
@@ -301,7 +301,7 @@
builder.add(tuple);
}
} finally {
- btreeCursor.close();
+ btreeCursor.destroy();
builder.end();
}
btreeBulkLoader.end();
@@ -315,7 +315,7 @@
bulkLoader.add(frameTuple);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
bulkLoader.end();
return mergedComponent;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
index 9712b7c..d32ee25 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
@@ -140,7 +140,7 @@
numBTreeTuples =
IntegerPointable.getInteger(countTuple.getFieldData(0),
countTuple.getFieldStart(0));
}
} finally {
- btreeCountingCursor.close();
+ btreeCountingCursor.destroy();
}
ILSMDiskComponentBulkLoader componentBulkLoader =
@@ -163,7 +163,7 @@
rTreeTupleSorter.insertTupleEntry(rtreeScanCursor.getPageId(),
rtreeScanCursor.getTupleOffset());
}
} finally {
- rtreeScanCursor.close();
+ rtreeScanCursor.destroy();
}
rTreeTupleSorter.sort();
@@ -177,7 +177,7 @@
componentBulkLoader.add(frameTuple);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
}
@@ -191,7 +191,7 @@
componentBulkLoader.delete(frameTuple);
}
} finally {
- btreeScanCursor.close();
+ btreeScanCursor.destroy();
}
if (component.getLSMComponentFilter() != null) {
@@ -241,7 +241,7 @@
componentBulkLoader.delete(tuple);
}
} finally {
- btreeCursor.close();
+ btreeCursor.destroy();
}
} else {
//no buddy-btree needed
@@ -256,7 +256,7 @@
componentBulkLoader.add(frameTuple);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
if (mergedComponent.getLSMComponentFilter() != null) {
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
index 2d2b548..4d43b7e 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
@@ -111,7 +111,7 @@
(IBTreeLeafFrame)
lsmInitialState.getBTreeLeafFrameFactory().createFrame(), false);
} else {
//re-use
- btreeCursors[i].reset();
+ btreeCursors[i].close();
}
rtree = ((LSMRTreeMemoryComponent) component).getIndex();
btree = ((LSMRTreeMemoryComponent) component).getBuddyIndex();
@@ -123,7 +123,7 @@
(IBTreeLeafFrame)
lsmInitialState.getBTreeLeafFrameFactory().createFrame(), false);
} else {
// reset
- btreeCursors[i].reset();
+ btreeCursors[i].close();
}
rtree = ((LSMRTreeDiskComponent) component).getIndex();
btree = ((LSMRTreeDiskComponent) component).getBuddyIndex();
@@ -134,7 +134,7 @@
(IRTreeInteriorFrame)
lsmInitialState.getRTreeInteriorFrameFactory().createFrame(),
(IRTreeLeafFrame)
lsmInitialState.getRTreeLeafFrameFactory().createFrame());
} else {
- rtreeCursors[i].reset();
+ rtreeCursors[i].close();
}
if (rtreeAccessors[i] == null) {
rtreeAccessors[i] =
rtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
@@ -153,7 +153,7 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
if (!open) {
return;
}
@@ -161,8 +161,8 @@
try {
if (rtreeCursors != null && btreeCursors != null) {
for (int i = 0; i < numberOfTrees; i++) {
- rtreeCursors[i].close();
- btreeCursors[i].close();
+ rtreeCursors[i].destroy();
+ btreeCursors[i].destroy();
}
}
rtreeCursors = null;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSearchCursor.java
index 06c39db..0edf22f 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSearchCursor.java
@@ -39,13 +39,13 @@
}
@Override
- public void close() throws HyracksDataException {
- super.close();
+ public void destroy() throws HyracksDataException {
+ super.destroy();
currentCursor = 0;
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
if (!open) {
return;
}
@@ -54,8 +54,8 @@
foundNext = false;
try {
for (int i = 0; i < numberOfTrees; i++) {
- rtreeCursors[i].close();
- btreeCursors[i].close();
+ rtreeCursors[i].destroy();
+ btreeCursors[i].destroy();
}
rtreeCursors = null;
btreeCursors = null;
@@ -82,7 +82,7 @@
private void searchNextCursor() throws HyracksDataException {
if (currentCursor < numberOfTrees) {
- rtreeCursors[currentCursor].reset();
+ rtreeCursors[currentCursor].close();
rtreeAccessors[currentCursor].search(rtreeCursors[currentCursor],
rtreeSearchPredicate);
}
}
@@ -102,7 +102,7 @@
if (bloomFilters[i] != null &&
bloomFilters[i].contains(btreeTuple, hashes)) {
continue;
}
- btreeCursors[i].reset();
+ btreeCursors[i].close();
btreeRangePredicate.setHighKey(btreeTuple, true);
btreeRangePredicate.setLowKey(btreeTuple, true);
btreeAccessors[i].search(btreeCursors[i],
btreeRangePredicate);
@@ -111,7 +111,7 @@
killerTupleFound = true;
}
} finally {
- btreeCursors[i].close();
+ btreeCursors[i].destroy();
}
}
if (!killerTupleFound) {
@@ -120,7 +120,7 @@
return true;
}
}
- rtreeCursors[currentCursor].close();
+ rtreeCursors[currentCursor].destroy();
currentCursor++;
searchNextCursor();
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSortedCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSortedCursor.java
index e3f74d3..d66e882 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSortedCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeSortedCursor.java
@@ -43,7 +43,7 @@
super(opCtx);
this.linearizeCmp = linearizer.createBinaryComparator();
this.btreeTuple = new PermutingTupleReference(buddyBTreeFields);
- reset();
+ close();
}
public ILSMIndexOperationContext getOpCtx() {
@@ -51,12 +51,12 @@
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
depletedRtreeCursors = new boolean[numberOfTrees];
foundNext = false;
try {
for (int i = 0; i < numberOfTrees; i++) {
- rtreeCursors[i].reset();
+ rtreeCursors[i].close();
rtreeAccessors[i].search(rtreeCursors[i],
rtreeSearchPredicate);
if (rtreeCursors[i].hasNext()) {
rtreeCursors[i].next();
@@ -128,7 +128,7 @@
boolean killed = false;
btreeTuple.reset(frameTuple);
for (int i = 0; i < foundIn; i++) {
- btreeCursors[i].reset();
+ btreeCursors[i].close();
btreeRangePredicate.setHighKey(btreeTuple, true);
btreeRangePredicate.setLowKey(btreeTuple, true);
btreeAccessors[i].search(btreeCursors[i], btreeRangePredicate);
@@ -138,7 +138,7 @@
break;
}
} finally {
- btreeCursors[i].close();
+ btreeCursors[i].destroy();
}
}
if (!killed) {
@@ -161,7 +161,7 @@
depletedRtreeCursors = new boolean[numberOfTrees];
foundNext = false;
for (int i = 0; i < numberOfTrees; i++) {
- rtreeCursors[i].reset();
+ rtreeCursors[i].close();
rtreeAccessors[i].search(rtreeCursors[i], rtreeSearchPredicate);
if (rtreeCursors[i].hasNext()) {
rtreeCursors[i].next();
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
index 41e9b92..5eab2a1 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
@@ -116,7 +116,7 @@
rTreeTupleSorter.insertTupleEntry(rtreeScanCursor.getPageId(),
rtreeScanCursor.getTupleOffset());
}
} finally {
- rtreeScanCursor.close();
+ rtreeScanCursor.destroy();
}
if (!isEmpty) {
rTreeTupleSorter.sort();
@@ -140,7 +140,7 @@
bTreeTupleSorter.insertTupleEntry(btreeScanCursor.getPageId(),
btreeScanCursor.getTupleOffset());
}
} finally {
- btreeScanCursor.close();
+ btreeScanCursor.destroy();
}
if (!isEmpty) {
bTreeTupleSorter.sort();
@@ -158,7 +158,7 @@
componentBulkLoader.add(frameTuple);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
if (component.getLSMComponentFilter() != null) {
@@ -194,7 +194,7 @@
componentBulkLoader.add(frameTuple);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
if (component.getLSMComponentFilter() != null) {
List<ITupleReference> filterTuples = new ArrayList<>();
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesFlushCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesFlushCursor.java
index af9fef6..e29a1f6 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesFlushCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesFlushCursor.java
@@ -130,11 +130,11 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
index 2520eac..7ae72a9 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
@@ -133,7 +133,7 @@
private void searchNextCursor() throws HyracksDataException {
if (currentCursor < numMutableComponents) {
- mutableRTreeCursors[currentCursor].reset();
+ mutableRTreeCursors[currentCursor].close();
mutableRTreeAccessors[currentCursor].search(mutableRTreeCursors[currentCursor],
rtreeSearchPredicate);
}
}
@@ -161,7 +161,7 @@
return true;
}
}
- mutableRTreeCursors[currentCursor].close();
+ mutableRTreeCursors[currentCursor].destroy();
currentCursor++;
searchNextCursor();
}
@@ -216,7 +216,6 @@
return filter == null ? null : filter.getMaxTuple();
}
-
@Override
public void next() throws HyracksDataException {
foundNext = false;
@@ -228,7 +227,7 @@
}
@Override
- public void reset() throws HyracksDataException {
+ public void close() throws HyracksDataException {
if (!open) {
return;
}
@@ -236,27 +235,27 @@
foundNext = false;
if (includeMutableComponent) {
for (int i = 0; i < numMutableComponents; i++) {
- mutableRTreeCursors[i].reset();
- btreeCursors[i].reset();
+ mutableRTreeCursors[i].close();
+ btreeCursors[i].close();
}
}
- super.reset();
+ super.close();
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
if (!open) {
return;
}
if (includeMutableComponent) {
for (int i = 0; i < numMutableComponents; i++) {
- mutableRTreeCursors[i].close();
- btreeCursors[i].close();
+ mutableRTreeCursors[i].destroy();
+ btreeCursors[i].destroy();
}
}
currentCursor = 0;
open = false;
- super.close();
+ super.destroy();
}
@Override
@@ -267,7 +266,7 @@
private boolean searchMemBTrees(ITupleReference tuple, int
lastBTreeToSearch) throws HyracksDataException {
for (int i = 0; i < lastBTreeToSearch; i++) {
- btreeCursors[i].reset();
+ btreeCursors[i].close();
btreeRangePredicate.setHighKey(tuple, true);
btreeRangePredicate.setLowKey(tuple, true);
btreeAccessors[i].search(btreeCursors[i], btreeRangePredicate);
@@ -276,7 +275,7 @@
return false;
}
} finally {
- btreeCursors[i].close();
+ btreeCursors[i].destroy();
}
}
return true;
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/TreeTupleSorter.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/TreeTupleSorter.java
index cad1f74..787bd67 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/TreeTupleSorter.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/TreeTupleSorter.java
@@ -62,7 +62,7 @@
}
@Override
- public void reset() {
+ public void close() {
numTuples = 0;
currentTupleIndex = 0;
}
@@ -217,7 +217,7 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
// do nothing
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSearchCursor.java
index 4302c61..f9bc59a 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSearchCursor.java
@@ -62,7 +62,7 @@
}
@Override
- public void close() throws HyracksDataException {
+ public void destroy() throws HyracksDataException {
if (readLatched) {
page.releaseReadLatch();
bufferCache.unpin(page);
@@ -249,8 +249,8 @@
}
@Override
- public void reset() throws HyracksDataException {
- close();
+ public void close() throws HyracksDataException {
+ destroy();
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndexCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndexCursor.java
index cd16210..2b99365 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndexCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndexCursor.java
@@ -22,6 +22,33 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
+/**
+ * Represents an index cursor. The expected use
+ * cursor = new cursor();
+ * while (more predicates){
+ * -cursor.open(predicate);
+ * -while (cursor.hasNext()){
+ * --cursor.next()
+ * -}
+ * -cursor.close();
+ * }
+ * cursor.destroy();
+ * Each created cursor must have destroy called
+ * Each successfully opened cursor must have close called
+ *
+ * A cursor is a state machine that works as follows:
+ * The states are:
+ * <ul>
+ * <li>CLOSED</li>
+ * <li>OPENED</li>
+ * <li>DESTROYED</li>
+ * </ul>
+ * When a cursor object is created, it is in the CLOSED state.
+ * CLOSED: The only legal calls are open() --> OPENED, or destroy() -->
DESTROYED
+ * OPENED: The only legal calls are hasNext(), next(), or close() --> CLOSED.
+ * DESTROYED: All calls are illegal.
+ * Cursors must enforce the cursor state machine
+ */
public interface IIndexCursor {
/**
* Opens the cursor
@@ -49,19 +76,19 @@
void next() throws HyracksDataException;
/**
- * Closes the cursor
+ * Destroys the cursor allowing for release of resources.
+ * The cursor can't be used anymore after this call.
+ *
+ * @throws HyracksDataException
+ */
+ void destroy() throws HyracksDataException;
+
+ /**
+ * Close the cursor.
*
* @throws HyracksDataException
*/
void close() throws HyracksDataException;
-
- /**
- * Reset the cursor to be reused
- *
- * @throws HyracksDataException
- * @throws IndexException
- */
- void reset() throws HyracksDataException;
/**
* @return the tuple pointed to by the cursor
@@ -70,12 +97,13 @@
/**
* @return the min tuple of the current index's filter
+ * TODO: Move to another interface specific to lsm indexes
*/
ITupleReference getFilterMinTuple();
/**
- *
* @return the max tuple of the current index's filter
+ * TODO: Move to another interface specific to lsm indexes
*/
ITupleReference getFilterMaxTuple();
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractSearchOperationCallbackTest.java
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractSearchOperationCallbackTest.java
index 0323d1b..368430c 100644
---
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractSearchOperationCallbackTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractSearchOperationCallbackTest.java
@@ -127,7 +127,7 @@
// consume tuples [153, 300]
consumeIntTupleRange(153, 300, false, -1);
- cursor.close();
+ cursor.destroy();
} finally {
lock.unlock();
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
index 2a7b978..9204642 100644
---
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
@@ -773,7 +773,7 @@
}
}
} finally {
- scanCursor.close();
+ scanCursor.destroy();
}
}
@@ -796,7 +796,7 @@
}
}
} finally {
- diskOrderCursor.close();
+ diskOrderCursor.destroy();
}
} catch (UnsupportedOperationException e) {
// Ignore exception because some indexes, e.g. the LSMBTree, don't
@@ -842,7 +842,7 @@
}
}
} finally {
- rangeCursor.close();
+ rangeCursor.destroy();
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java
index 665178c..754e0bd 100644
---
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java
+++
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java
@@ -137,7 +137,7 @@
+ "\nActual : " + actualCount);
}
} finally {
- searchCursor.close();
+ searchCursor.destroy();
}
}
@@ -180,7 +180,7 @@
fail("Point search returned more than one answer.");
}
} finally {
- searchCursor.close();
+ searchCursor.destroy();
}
}
}
@@ -496,7 +496,7 @@
+ "\nActual : " + actualCount);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/AbstractIndexTestWorker.java
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/AbstractIndexTestWorker.java
index 0291f41..5248a22 100644
---
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/AbstractIndexTestWorker.java
+++
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/AbstractIndexTestWorker.java
@@ -73,7 +73,7 @@
cursor.next();
}
} finally {
- cursor.close();
+ cursor.destroy();
}
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java
index 9304adf..0936863 100644
---
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java
+++
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java
@@ -157,7 +157,7 @@
}
} finally {
try {
- diskOrderCursor.close();
+ diskOrderCursor.destroy();
} catch (Exception ex) {
LOGGER.log(Level.WARN, "Error during scan cursor close",
ex);
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
index 4a31cd6..844cdf3 100644
---
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
@@ -858,7 +858,7 @@
}
}
} finally {
- scanCursor.close();
+ scanCursor.destroy();
}
}
@@ -881,7 +881,7 @@
}
}
} finally {
- diskOrderCursor.close();
+ diskOrderCursor.destroy();
}
} catch (UnsupportedOperationException e) {
// Ignore exception because some indexes, e.g. the LSMRTree, don't
@@ -926,7 +926,7 @@
}
}
} finally {
- rangeCursor.close();
+ rangeCursor.destroy();
}
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/RTreeTestUtils.java
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/RTreeTestUtils.java
index eb4ea56..88d3df2 100644
---
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/RTreeTestUtils.java
+++
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/RTreeTestUtils.java
@@ -196,7 +196,7 @@
+ "\nActual : " + actualCount);
}
} finally {
- cursor.close();
+ cursor.destroy();
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java
index 2943ee9..6c234b7 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java
@@ -378,7 +378,7 @@
} catch (Exception e) {
e.printStackTrace();
} finally {
- rangeCursor.close();
+ rangeCursor.destroy();
}
getExpectedResults(expectedResults, keys, lowKey, highKey,
lowKeyInclusive, highKeyInclusive);
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
index bc297fa..f32bda3 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
@@ -147,7 +147,7 @@
} catch (Exception e) {
e.printStackTrace();
} finally {
- updateScanCursor.close();
+ updateScanCursor.destroy();
}
// Ordered scan to verify the values.
@@ -169,7 +169,7 @@
} catch (Exception e) {
e.printStackTrace();
} finally {
- scanCursor.close();
+ scanCursor.destroy();
}
btree.deactivate();
btree.destroy();
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/multithread/BTreeTestWorker.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/multithread/BTreeTestWorker.java
index 5866075..06a00e0 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/multithread/BTreeTestWorker.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/multithread/BTreeTestWorker.java
@@ -107,7 +107,7 @@
break;
case POINT_SEARCH:
- searchCursor.reset();
+ searchCursor.close();
rangePred.setLowKey(tuple, true);
rangePred.setHighKey(tuple, true);
accessor.search(searchCursor, rangePred);
@@ -115,7 +115,7 @@
break;
case SCAN:
- searchCursor.reset();
+ searchCursor.close();
rangePred.setLowKey(null, true);
rangePred.setHighKey(null, true);
accessor.search(searchCursor, rangePred);
@@ -123,7 +123,7 @@
break;
case DISKORDER_SCAN:
- diskOrderScanCursor.reset();
+ diskOrderScanCursor.close();
accessor.diskOrderScan(diskOrderScanCursor);
consumeCursorTuples(diskOrderScanCursor);
break;
@@ -139,7 +139,7 @@
cursor.next();
}
} finally {
- cursor.close();
+ cursor.destroy();
}
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java
index e108369..0904806 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java
@@ -142,7 +142,7 @@
// consume tuples [152, 300]
consumeIntTupleRange(152, 300, false, -1);
- cursor.close();
+ cursor.destroy();
} finally {
lock.unlock();
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceScanDiskComponentsTest.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceScanDiskComponentsTest.java
index 790cddd..035ef98 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceScanDiskComponentsTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceScanDiskComponentsTest.java
@@ -377,7 +377,7 @@
}
Assert.assertFalse(cursor.hasNext());
} finally {
- cursor.close();
+ cursor.destroy();
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/multithread/LSMBTreeTestWorker.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/multithread/LSMBTreeTestWorker.java
index ad0e13d..4c07dea 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/multithread/LSMBTreeTestWorker.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/multithread/LSMBTreeTestWorker.java
@@ -101,7 +101,7 @@
break;
case POINT_SEARCH:
- searchCursor.reset();
+ searchCursor.close();
rangePred.setLowKey(tuple, true);
rangePred.setHighKey(tuple, true);
accessor.search(searchCursor, rangePred);
@@ -109,7 +109,7 @@
break;
case SCAN:
- searchCursor.reset();
+ searchCursor.close();
rangePred.setLowKey(null, true);
rangePred.setHighKey(null, true);
accessor.search(searchCursor, rangePred);
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexTestWorker.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexTestWorker.java
index ace93e0..ca06f6b 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexTestWorker.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexTestWorker.java
@@ -91,7 +91,7 @@
}
case POINT_SEARCH: {
- searchCursor.reset();
+ searchCursor.close();
searchPred.setQueryTuple(tuple);
searchPred.setQueryFieldIndex(0);
try {
@@ -107,7 +107,7 @@
}
case SCAN: {
- rangeSearchCursor.reset();
+ rangeSearchCursor.close();
accessor.rangeSearch(rangeSearchCursor, rangePred);
consumeCursorTuples(rangeSearchCursor);
break;
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestUtils.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestUtils.java
index 95c25d5..5902e62 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestUtils.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestUtils.java
@@ -298,7 +298,7 @@
fail("Indexes do not match. Actual index contains too many
entries.");
}
} finally {
- invIndexCursor.close();
+ invIndexCursor.destroy();
}
}
@@ -574,7 +574,7 @@
}
}
} finally {
- resultCursor.close();
+ resultCursor.destroy();
}
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/AbstractLSMRTreeTestWorker.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/AbstractLSMRTreeTestWorker.java
index 22021bd..081ef7a 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/AbstractLSMRTreeTestWorker.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/AbstractLSMRTreeTestWorker.java
@@ -83,7 +83,7 @@
cursor.next();
}
} finally {
- cursor.close();
+ cursor.destroy();
}
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeTestWorker.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeTestWorker.java
index 6482565..b75bfb1 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeTestWorker.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeTestWorker.java
@@ -70,7 +70,7 @@
break;
case SCAN:
- searchCursor.reset();
+ searchCursor.close();
rangePred.setSearchKey(null);
accessor.search(searchCursor, rangePred);
consumeCursorTuples(searchCursor);
@@ -122,7 +122,7 @@
cursor.next();
}
} finally {
- cursor.close();
+ cursor.destroy();
}
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeWithAntiMatterTuplesTestWorker.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeWithAntiMatterTuplesTestWorker.java
index f49fdbf..89d05a6 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeWithAntiMatterTuplesTestWorker.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeWithAntiMatterTuplesTestWorker.java
@@ -59,7 +59,7 @@
break;
case SCAN:
- searchCursor.reset();
+ searchCursor.close();
rangePred.setSearchKey(null);
accessor.search(searchCursor, rangePred);
consumeCursorTuples(searchCursor);
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeTestWorker.java
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeTestWorker.java
index cf2fa77..9d2d59e 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeTestWorker.java
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeTestWorker.java
@@ -69,14 +69,14 @@
break;
case SCAN:
- searchCursor.reset();
+ searchCursor.close();
rangePred.setSearchKey(null);
accessor.search(searchCursor, rangePred);
consumeCursorTuples(searchCursor);
break;
case DISKORDER_SCAN:
- diskOrderScanCursor.reset();
+ diskOrderScanCursor.close();
accessor.diskOrderScan(diskOrderScanCursor);
consumeCursorTuples(diskOrderScanCursor);
break;
--
To view, visit https://asterix-gerrit.ics.uci.edu/2238
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64cf8c0a5473268bdfd71fd560ee6b3bff219ce9
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <[email protected]>
