>From Ritik Raj <[email protected]>:
Ritik Raj has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18763 )
Change subject: [ASTERIXDB-3491][STO] Resetting numTupleCount when skipping
MegaLeafPage
......................................................................
[ASTERIXDB-3491][STO] Resetting numTupleCount when skipping MegaLeafPage
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
Resetting TupleCount on skipping MegaLeafPage, so the column reader could also
skip the megaLeafPage.
Ext-ref: MB-63297
Change-Id: I5ec807992737a9b2f117478e96cfdd179ca10dd1
---
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/tuples/AbstractColumnTupleReference.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnTupleReference.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/ColumnAssembler.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/MergeColumnTupleReference.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnWithMetaTupleReference.java
5 files changed, 50 insertions(+), 0 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/63/18763/1
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/ColumnAssembler.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/ColumnAssembler.java
index e619ecf..82a9b63 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/ColumnAssembler.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/ColumnAssembler.java
@@ -110,6 +110,15 @@
}
public int skip(int count) throws HyracksDataException {
+ try {
+ return doSkip(count);
+ } catch (ColumnarValueException e) {
+ appendInformation(e);
+ throw e;
+ }
+ }
+
+ private int doSkip(int count) throws HyracksDataException {
if (numberOfTuples == 0 || count == 0) {
// Avoid advancing tupleIndex and numberOfSkips if a mega leaf
node is filtered out
return 0;
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/MergeColumnTupleReference.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/MergeColumnTupleReference.java
index 33126e8..8c434d7 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/MergeColumnTupleReference.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/MergeColumnTupleReference.java
@@ -60,6 +60,11 @@
}
@Override
+ protected void skipMegaLeafNode() {
+ // no-op
+ }
+
+ @Override
protected boolean startNewPage(ByteBuffer pageZero, int numberOfColumns,
int numberOfTuples) {
//Skip filters
pageZero.position(pageZero.position() + numberOfColumns *
AbstractColumnFilterWriter.FILTER_SIZE);
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnTupleReference.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnTupleReference.java
index 7ba0aae..e1dddf1 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnTupleReference.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnTupleReference.java
@@ -88,6 +88,11 @@
}
@Override
+ protected void skipMegaLeafNode() {
+ assembler.reset(0);
+ }
+
+ @Override
protected boolean startNewPage(ByteBuffer pageZero, int numberOfColumns,
int numberOfTuples)
throws HyracksDataException {
//Skip to filters
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnWithMetaTupleReference.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnWithMetaTupleReference.java
index 1e4aaea..e7402c3 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnWithMetaTupleReference.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnWithMetaTupleReference.java
@@ -91,6 +91,12 @@
}
@Override
+ protected void skipMegaLeafNode() {
+ assembler.reset(0);
+ metaAssembler.reset(0);
+ }
+
+ @Override
protected boolean startNewPage(ByteBuffer pageZero, int numberOfColumns,
int numberOfTuples)
throws HyracksDataException {
//Skip to filters
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/tuples/AbstractColumnTupleReference.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/tuples/AbstractColumnTupleReference.java
index 99dabfc..27b63aa 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/tuples/AbstractColumnTupleReference.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/tuples/AbstractColumnTupleReference.java
@@ -155,12 +155,19 @@
*/
skip(Math.max(skipCount, 0));
} else {
+ skipMegaLeafNode();
numOfSkippedMegaLeafNodes++;
}
totalNumberOfMegaLeafNodes++;
}
+ /**
+ * resetting numberOfTuples to zero, so that we avoid advancing tuples in
{@link ColumnAssembler.skip()}
+ * as the whole megaLeaf got filtered out.
+ */
+ protected abstract void skipMegaLeafNode();
+
@Override
public final void setAt(int startIndex) throws HyracksDataException {
if (tupleIndex == startIndex) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18763
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: goldfish
Gerrit-Change-Id: I5ec807992737a9b2f117478e96cfdd179ca10dd1
Gerrit-Change-Number: 18763
Gerrit-PatchSet: 1
Gerrit-Owner: Ritik Raj <[email protected]>
Gerrit-MessageType: newchange
