>From Wail Alkowaileet <[email protected]>:
Wail Alkowaileet has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17599 )
Change subject: [WIP] Fixes for handling anti-matters in columnar datasets
......................................................................
[WIP] Fixes for handling anti-matters in columnar datasets
Change-Id: If7dec034a2d75c80688523b19be6fdc38f077a65
---
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/PrimitiveValueAssembler.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/FlushColumnTupleWriter.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/PrimitiveColumnValuesReader.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/values/reader/value/key/LongKeyValueReader.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/AbstractColumnValuesWriter.java
M
asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/writer/DummyColumnValuesWriter.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/AbstractParquetValuesWriter.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/StringKeyValueReader.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/DoubleColumnValuesWriter.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnKeyValueReader.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/NullMissingColumnValuesWriter.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/merge/MergeColumnTupleWriter.java
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/LocalFSInputStream.java
R
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/stream/in/DummyBytesInputStream.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnValuesWriter.java
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
A
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/tuples/DummyColumnBufferProvider.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/RepeatedPrimitiveValueAssembler.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/ParquetPlainVariableLengthValuesWriter.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/EndOfRepeatedGroupAssembler.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/AbstractFixedLengthColumnKeyValueReader.java
M
asterixdb/asterix-column/src/test/java/org/apache/asterix/column/test/dummy/AssemblerTest.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerBuilderVisitor.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/QueryColumnMetadata.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/LSMColumnBTreeRangeSearchCursor.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AbstractPrimitiveValueAssembler.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/AbstractAsterixColumnTupleReference.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/StringColumnValuesWriter.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/QueryColumnWithMetaTupleReference.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/LongColumnValuesWriter.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/BooleanColumnValuesWriter.java
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/AbstractColumnValuesReader.java
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
34 files changed, 312 insertions(+), 53 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/99/17599/1
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AbstractPrimitiveValueAssembler.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AbstractPrimitiveValueAssembler.java
index 0d7c9c88..3c5d726 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AbstractPrimitiveValueAssembler.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AbstractPrimitiveValueAssembler.java
@@ -39,10 +39,6 @@
this.reader = reader;
}
- public final void reset(AbstractBytesInputStream in, int numberOfTuples)
throws HyracksDataException {
- reader.reset(in, numberOfTuples);
- }
-
@Override
public final IValueReference getValue() throws HyracksDataException {
return primitiveValueGetter.getValue(reader);
@@ -85,9 +81,13 @@
reader.skip(count);
}
- public boolean isEndOfGroupAssembler() {
- return false;
- }
+ /**
+ * Reset the assembler
+ *
+ * @param in stream for value reader
+ * @param numberOfTuples in the current mega leaf node
+ */
+ public abstract void reset(AbstractBytesInputStream in, int
numberOfTuples) throws HyracksDataException;
/**
* Move to the next primitive value assembler
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerBuilderVisitor.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerBuilderVisitor.java
index 1895404..5acfa08 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerBuilderVisitor.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerBuilderVisitor.java
@@ -21,7 +21,9 @@
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.asterix.column.assembler.value.IValueGetter;
import org.apache.asterix.column.assembler.value.IValueGetterFactory;
@@ -52,6 +54,7 @@
private final IColumnValuesReaderFactory readerFactory;
private final List<AbstractPrimitiveValueAssembler> valueAssemblers;
private final IValueGetterFactory valueGetterFactory;
+ private final Map<Integer, IColumnValuesReader> primaryKeyReaders;
private AbstractValueAssembler rootAssembler;
//Recursion info
@@ -66,6 +69,10 @@
this.valueGetterFactory = valueGetterFactory;
valueAssemblers = new ArrayList<>();
delimiters = new IntArrayList();
+ primaryKeyReaders = new HashMap<>();
+ for (IColumnValuesReader reader :
columnMetadata.getPrimaryKeyReaders()) {
+ primaryKeyReaders.put(reader.getColumnIndex(), reader);
+ }
}
public AbstractPrimitiveValueAssembler[]
createValueAssemblers(AbstractSchemaNode requestedSchema,
@@ -206,9 +213,15 @@
setDelegate(reader, (RepeatedPrimitiveValueAssembler) assembler);
} else {
- IColumnValuesReader reader =
readerFactory.createValueReader(primitiveNode.getTypeTag(),
- primitiveNode.getColumnIndex(), level,
primitiveNode.isPrimaryKey());
- assembler = new PrimitiveValueAssembler(level, info, reader,
valueGetter);
+ IColumnValuesReader reader;
+ boolean primaryKey = primitiveNode.isPrimaryKey();
+ if (primaryKey) {
+ reader = primaryKeyReaders.get(primitiveNode.getColumnIndex());
+ } else {
+ reader =
readerFactory.createValueReader(primitiveNode.getTypeTag(),
primitiveNode.getColumnIndex(),
+ level, false);
+ }
+ assembler = new PrimitiveValueAssembler(level, info, reader,
valueGetter, primaryKey);
}
valueAssemblers.add(assembler);
return assembler;
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/EndOfRepeatedGroupAssembler.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/EndOfRepeatedGroupAssembler.java
index d4c5cce..805f493 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/EndOfRepeatedGroupAssembler.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/EndOfRepeatedGroupAssembler.java
@@ -19,6 +19,7 @@
package org.apache.asterix.column.assembler;
import org.apache.asterix.column.assembler.value.MissingValueGetter;
+import org.apache.asterix.column.bytes.stream.in.AbstractBytesInputStream;
import org.apache.asterix.column.values.IColumnValuesReader;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -36,6 +37,11 @@
}
@Override
+ public void reset(AbstractBytesInputStream in, int numberOfTuples) throws
HyracksDataException {
+ // NoOp
+ }
+
+ @Override
public int next(AssemblerState state) throws HyracksDataException {
// Get the current delimiter index from the reader
int delimiterIndex = reader.getDelimiterIndex();
@@ -73,11 +79,6 @@
}
@Override
- public boolean isEndOfGroupAssembler() {
- return true;
- }
-
- @Override
public void skip(int count) throws HyracksDataException {
// noOp
}
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/PrimitiveValueAssembler.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/PrimitiveValueAssembler.java
index 8dcf024..40294f7 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/PrimitiveValueAssembler.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/PrimitiveValueAssembler.java
@@ -19,6 +19,7 @@
package org.apache.asterix.column.assembler;
import org.apache.asterix.column.assembler.value.IValueGetter;
+import org.apache.asterix.column.bytes.stream.in.AbstractBytesInputStream;
import org.apache.asterix.column.values.IColumnValuesReader;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import
org.apache.hyracks.storage.am.lsm.btree.column.error.ColumnarValueException;
@@ -26,15 +27,24 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
public class PrimitiveValueAssembler extends AbstractPrimitiveValueAssembler {
- int counter = 0;
+ private final boolean primaryKey;
- PrimitiveValueAssembler(int level, AssemblerInfo info, IColumnValuesReader
reader, IValueGetter primitiveValue) {
+ PrimitiveValueAssembler(int level, AssemblerInfo info, IColumnValuesReader
reader, IValueGetter primitiveValue,
+ boolean primaryKey) {
super(level, info, reader, primitiveValue);
+ this.primaryKey = primaryKey;
+ }
+
+ @Override
+ public void reset(AbstractBytesInputStream in, int numberOfTuples) throws
HyracksDataException {
+ if (!primaryKey) {
+ reader.reset(in, numberOfTuples);
+ }
}
@Override
public int next(AssemblerState state) throws HyracksDataException {
- if (!reader.next()) {
+ if (!primaryKey && !reader.next()) {
throw createException();
} else if (reader.isNull() && (isDelegate() || reader.getLevel() + 1
== level)) {
addNullToAncestor(reader.getLevel());
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/RepeatedPrimitiveValueAssembler.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/RepeatedPrimitiveValueAssembler.java
index 6588972..e4b18ec 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/RepeatedPrimitiveValueAssembler.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/RepeatedPrimitiveValueAssembler.java
@@ -19,6 +19,7 @@
package org.apache.asterix.column.assembler;
import org.apache.asterix.column.assembler.value.IValueGetter;
+import org.apache.asterix.column.bytes.stream.in.AbstractBytesInputStream;
import org.apache.asterix.column.values.IColumnValuesReader;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import
org.apache.hyracks.storage.am.lsm.btree.column.error.ColumnarValueException;
@@ -35,6 +36,11 @@
}
@Override
+ public void reset(AbstractBytesInputStream in, int numberOfTuples) throws
HyracksDataException {
+ reader.reset(in, numberOfTuples);
+ }
+
+ @Override
public int next(AssemblerState state) throws HyracksDataException {
/*
* Move to the next value if one of the following is true
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/AbstractParquetValuesWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/AbstractParquetValuesWriter.java
index b53ded2..97e5746 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/AbstractParquetValuesWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/AbstractParquetValuesWriter.java
@@ -42,9 +42,20 @@
*/
public abstract void close();
+ /**
+ * @return the current (mostly) overestimated size needed to flush this
writer
+ */
public abstract int getEstimatedSize();
/**
+ * @param length the length of value to be return
+ * @return (probably) an overestimated size needed to write a value with
the given length
+ */
+ public int calculateEstimatedSize(int length) {
+ return length;
+ }
+
+ /**
* @return the allocated size of the buffer
*/
public abstract int getAllocatedSize();
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/ParquetPlainVariableLengthValuesWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/ParquetPlainVariableLengthValuesWriter.java
index 63697bc..96c8bdc 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/ParquetPlainVariableLengthValuesWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/encoder/ParquetPlainVariableLengthValuesWriter.java
@@ -81,6 +81,12 @@
}
@Override
+ public int calculateEstimatedSize(int length) {
+ // length of the string + 4 bytes for its offset
+ return length + Integer.BYTES;
+ }
+
+ @Override
public int getAllocatedSize() {
return offsetStream.capacity() + valueStream.size();
}
diff --git
a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/common/buffer/DummyBytesInputStream.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/stream/in/DummyBytesInputStream.java
similarity index 94%
rename from
asterixdb/asterix-column/src/test/java/org/apache/asterix/column/common/buffer/DummyBytesInputStream.java
rename to
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/stream/in/DummyBytesInputStream.java
index 0fc8a26..3a7276d 100644
---
a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/common/buffer/DummyBytesInputStream.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/bytes/stream/in/DummyBytesInputStream.java
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.asterix.column.common.buffer;
+package org.apache.asterix.column.bytes.stream.in;
import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.asterix.column.bytes.stream.in.AbstractBytesInputStream;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.api.IPointable;
import
org.apache.hyracks.storage.am.lsm.btree.column.api.IColumnBufferProvider;
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/FlushColumnTupleWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/FlushColumnTupleWriter.java
index d0b228f..c5c1753 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/FlushColumnTupleWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/FlushColumnTupleWriter.java
@@ -20,6 +20,7 @@
import java.nio.ByteBuffer;
+import org.apache.asterix.column.values.IColumnValuesWriter;
import org.apache.asterix.column.values.writer.ColumnBatchWriter;
import
org.apache.asterix.column.values.writer.filters.AbstractColumnFilterWriter;
import org.apache.asterix.om.lazy.RecordLazyVisitablePointable;
@@ -38,6 +39,7 @@
private final ColumnTransformer transformer;
private final RecordLazyVisitablePointable pointable;
private final int maxNumberOfTuples;
+ private final IColumnValuesWriter[] primaryKeyWriters;
protected int primaryKeysEstimatedSize;
@@ -49,6 +51,12 @@
writer = new ColumnBatchWriter(columnMetadata.getMultiPageOpRef(),
pageSize, tolerance);
this.maxNumberOfTuples = maxNumberOfTuples;
pointable = new
TypedRecordLazyVisitablePointable(columnMetadata.getDatasetType());
+
+ int numberOfPrimaryKeys = columnMetadata.getNumberOfPrimaryKeys();
+ primaryKeyWriters = new IColumnValuesWriter[numberOfPrimaryKeys];
+ for (int i = 0; i < numberOfPrimaryKeys; i++) {
+ primaryKeyWriters[i] = columnMetadata.getWriter(i);
+ }
}
@Override
@@ -65,7 +73,7 @@
public final int bytesRequired(ITupleReference tuple) {
int primaryKeysSize = 0;
for (int i = 0; i < columnMetadata.getNumberOfPrimaryKeys(); i++) {
- primaryKeysSize += tuple.getFieldLength(i);
+ primaryKeysSize +=
primaryKeyWriters[i].getEstimatedSize(tuple.getFieldLength(i));
}
//Mostly it is an overestimated size
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/merge/MergeColumnTupleWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/merge/MergeColumnTupleWriter.java
index dfd7d6f..0df4aca 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/merge/MergeColumnTupleWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/merge/MergeColumnTupleWriter.java
@@ -77,7 +77,7 @@
public int bytesRequired(ITupleReference tuple) {
int primaryKeysSize = 0;
for (int i = 0; i < columnMetadata.getNumberOfPrimaryKeys(); i++) {
- primaryKeysSize += tuple.getFieldLength(i);
+ primaryKeysSize +=
primaryKeyWriters[i].getEstimatedSize(tuple.getFieldLength(i));
}
return primaryKeysSize;
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/QueryColumnMetadata.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/QueryColumnMetadata.java
index 97cc740..b8d9260 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/QueryColumnMetadata.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/QueryColumnMetadata.java
@@ -83,12 +83,13 @@
throws HyracksDataException {
super(datasetType, metaType, primaryKeyReaders.length,
serializedMetadata, -1);
this.fieldNamesDictionary = fieldNamesDictionary;
- this.assembler = new ColumnAssembler(root, datasetType, this,
readerFactory, valueGetterFactory);
this.primaryKeyReaders = primaryKeyReaders;
this.normalizedFilterEvaluator = normalizedFilterEvaluator;
this.filterValueAccessors = filterValueAccessors;
this.columnFilterEvaluator = columnFilterEvaluator;
this.filterColumnReaders = filterColumnReaders;
+ // Must be the last value to set as it depends on
'QueryColumnMetadata.this'
+ this.assembler = new ColumnAssembler(root, datasetType, this,
readerFactory, valueGetterFactory);
}
public final ColumnAssembler getAssembler() {
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/AbstractAsterixColumnTupleReference.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/AbstractAsterixColumnTupleReference.java
index 01e9742..eff82dd 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/AbstractAsterixColumnTupleReference.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/AbstractAsterixColumnTupleReference.java
@@ -25,6 +25,7 @@
import org.apache.asterix.column.assembler.value.ValueGetterFactory;
import org.apache.asterix.column.bytes.stream.in.AbstractBytesInputStream;
import org.apache.asterix.column.bytes.stream.in.ByteBufferInputStream;
+import org.apache.asterix.column.bytes.stream.in.DummyBytesInputStream;
import org.apache.asterix.column.bytes.stream.in.MultiByteBufferInputStream;
import org.apache.asterix.column.values.IColumnValuesReader;
import org.apache.asterix.column.values.reader.PrimitiveColumnValuesReader;
@@ -70,7 +71,7 @@
if (info.getColumnIndex(i) >= numberOfPrimaryKeys) {
columnStreams[i] = new MultiByteBufferInputStream();
} else {
- columnStreams[i] = new ByteBufferInputStream();
+ columnStreams[i] = DummyBytesInputStream.INSTANCE;
}
}
}
@@ -78,12 +79,12 @@
protected abstract PrimitiveColumnValuesReader[]
getPrimaryKeyReaders(IColumnProjectionInfo info);
@Override
- protected void setPrimaryKeysAt(int index, int skipCount) throws
HyracksDataException {
- for (int i = 0; i < primaryKeyReaders.length; i++) {
- PrimitiveColumnValuesReader reader = primaryKeyReaders[i];
- reader.reset(index, skipCount);
- primaryKeys[i].set(primaryKeysValueGetters[i].getValue(reader));
+ protected int setPrimaryKeysAt(int index, int skipCount) throws
HyracksDataException {
+ int numberOfSkippedAntiMatters = resetPrimaryKeyReader(0, index,
skipCount);
+ for (int i = 1; i < primaryKeyReaders.length; i++) {
+ resetPrimaryKeyReader(i, index, skipCount);
}
+ return skipCount - numberOfSkippedAntiMatters;
}
@Override
@@ -228,4 +229,12 @@
primaryKeys[i].set(primaryKeysValueGetters[i].getValue(reader));
}
}
+
+ private int resetPrimaryKeyReader(int i, int index, int skipCount) throws
HyracksDataException {
+ PrimitiveColumnValuesReader reader = primaryKeyReaders[i];
+ int numberOfSkippedAntiMatters = reader.reset(index, skipCount);
+ primaryKeys[i].set(primaryKeysValueGetters[i].getValue(reader));
+ // include the current ket if the current key is an anti-matter
+ return numberOfSkippedAntiMatters + (isAntimatter() ? 1 : 0);
+ }
}
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 32d25e3..fd89ec8 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
@@ -41,8 +41,12 @@
import
org.apache.hyracks.storage.am.lsm.btree.column.api.IColumnBufferProvider;
import
org.apache.hyracks.storage.am.lsm.btree.column.api.IColumnReadMultiPageOp;
import
org.apache.hyracks.storage.am.lsm.btree.column.api.projection.IColumnProjectionInfo;
+import
org.apache.hyracks.storage.am.lsm.btree.column.error.ColumnarValueException;
import
org.apache.hyracks.storage.am.lsm.btree.column.impls.btree.ColumnBTreeReadLeafFrame;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
public final class QueryColumnTupleReference extends
AbstractAsterixColumnTupleReference {
private final ColumnAssembler assembler;
private final IColumnFilterEvaluator normalizedFilterEvaluator;
@@ -123,7 +127,18 @@
}
public IValueReference getAssembledValue() throws HyracksDataException {
- return filterApplier.getTuple();
+ try {
+ return filterApplier.getTuple();
+ } catch (ColumnarValueException e) {
+ ObjectNode node = e.createNode(getClass().getSimpleName());
+ node.put("isAntiMatter", isAntimatter());
+ ArrayNode pkNodes = node.putArray("primaryKeyReaders");
+ for (IColumnValuesReader reader : primaryKeyReaders) {
+ reader.appendReaderInformation(pkNodes.addObject());
+ }
+ throw e;
+ }
+
}
private IFilterApplier createFilterApplier() {
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 e2858ae..76bde23 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
@@ -42,8 +42,12 @@
import
org.apache.hyracks.storage.am.lsm.btree.column.api.IColumnBufferProvider;
import
org.apache.hyracks.storage.am.lsm.btree.column.api.IColumnReadMultiPageOp;
import
org.apache.hyracks.storage.am.lsm.btree.column.api.projection.IColumnProjectionInfo;
+import
org.apache.hyracks.storage.am.lsm.btree.column.error.ColumnarValueException;
import
org.apache.hyracks.storage.am.lsm.btree.column.impls.btree.ColumnBTreeReadLeafFrame;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
public final class QueryColumnWithMetaTupleReference extends
AbstractAsterixColumnTupleReference {
private final ColumnAssembler assembler;
private final ColumnAssembler metaAssembler;
@@ -128,16 +132,39 @@
@Override
public void skip(int count) throws HyracksDataException {
+ if (isAntimatter()) {
+ System.err.println("Skipping " + count);
+ }
metaAssembler.skip(count);
columnFilterEvaluator.setAt(assembler.skip(count));
}
public IValueReference getAssembledValue() throws HyracksDataException {
- return filterApplier.getTuple();
+ try {
+ return filterApplier.getTuple();
+ } catch (ColumnarValueException e) {
+ ObjectNode node = e.createNode(getClass().getSimpleName());
+ node.put("isAntiMatter", isAntimatter());
+ ArrayNode pkNodes = node.putArray("primaryKeyReaders");
+ for (IColumnValuesReader reader : primaryKeyReaders) {
+ reader.appendReaderInformation(pkNodes.addObject());
+ }
+ throw e;
+ }
}
public IValueReference getMetaAssembledValue() throws HyracksDataException
{
- return metaAssembler.nextValue();
+ try {
+ return metaAssembler.nextValue();
+ } catch (ColumnarValueException e) {
+ ObjectNode node = e.createNode(getClass().getSimpleName());
+ node.put("isAntiMatter", isAntimatter());
+ ArrayNode pkNodes = node.putArray("primaryKeyReaders");
+ for (IColumnValuesReader reader : primaryKeyReaders) {
+ reader.appendReaderInformation(pkNodes.addObject());
+ }
+ throw e;
+ }
}
private IFilterApplier createFilterApplier() {
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnKeyValueReader.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnKeyValueReader.java
index 4ee2780..ae2178a 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnKeyValueReader.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnKeyValueReader.java
@@ -29,8 +29,9 @@
* Reset the reader at the given index
*
* @param startIndex start index
+ * @return return the number of encountered anti-matters
*/
- void reset(int startIndex, int skipCount) throws HyracksDataException;
+ int reset(int startIndex, int skipCount) throws HyracksDataException;
/**
* Returns the value of the key at the given index
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnValuesWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnValuesWriter.java
index d4e6099..2e2aa9e 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnValuesWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnValuesWriter.java
@@ -98,6 +98,12 @@
int getEstimatedSize();
/**
+ * @param length the length of value to be return
+ * @return (probably) an overestimated size needed to write a value with
the given length
+ */
+ int getEstimatedSize(int length);
+
+ /**
* @return the allocated space in bytes
*/
int getAllocatedSpace();
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/AbstractColumnValuesReader.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/AbstractColumnValuesReader.java
index 7fd206a..81156d9 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/AbstractColumnValuesReader.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/AbstractColumnValuesReader.java
@@ -41,6 +41,7 @@
protected final int maxLevel;
protected final ParquetRunLengthBitPackingHybridDecoder definitionLevels;
protected final AbstractBytesInputStream valuesStream;
+ private final boolean primaryKey;
protected int level;
protected int valueCount;
protected int valueIndex;
@@ -48,8 +49,6 @@
private int nullBitMask;
private boolean nullLevel;
private boolean allMissing;
-
- // Logging members
private int numberOfEncounteredMissing;
private int numberOfEncounteredNull;
@@ -59,6 +58,7 @@
this.maxLevel = maxLevel;
definitionLevels = new
ParquetRunLengthBitPackingHybridDecoder(ColumnValuesUtil.getBitWidth(maxLevel));
valuesStream = primaryKey ? new ByteBufferInputStream() : new
MultiByteBufferInputStream();
+ this.primaryKey = primaryKey;
}
final void nextLevel() throws HyracksDataException {
@@ -170,8 +170,17 @@
@Override
public void skip(int count) throws HyracksDataException {
- for (int i = 0; i < count; i++) {
- next();
+ if (primaryKey) {
+ for (int i = 0; i < count; i++) {
+ while (level < maxLevel) {
+ // skip anti-matter indicators
+ next();
+ }
+ }
+ } else {
+ for (int i = 0; i < count; i++) {
+ next();
+ }
}
}
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/PrimitiveColumnValuesReader.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/PrimitiveColumnValuesReader.java
index c6d2b1e..8015616 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/PrimitiveColumnValuesReader.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/PrimitiveColumnValuesReader.java
@@ -116,12 +116,17 @@
}
@Override
- public void reset(int startIndex, int skipCount) throws
HyracksDataException {
+ public int reset(int startIndex, int skipCount) throws
HyracksDataException {
((IColumnKeyValueReader) valueReader).reset(startIndex, skipCount);
+ // first item (index = 0)
nextLevel();
- for (int i = 1; i < skipCount; i++) {
+ int numberOfAntiMatters = level < maxLevel ? 1 : 0;
+ for (int i = 0; i < skipCount; i++) {
+ // we should skip to index+=skipCount
nextLevel();
+ numberOfAntiMatters += level < maxLevel ? 1 : 0;
}
+ return numberOfAntiMatters;
}
@Override
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/AbstractFixedLengthColumnKeyValueReader.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/AbstractFixedLengthColumnKeyValueReader.java
index fc458f3..28415f8 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/AbstractFixedLengthColumnKeyValueReader.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/AbstractFixedLengthColumnKeyValueReader.java
@@ -45,8 +45,9 @@
}
@Override
- public void reset(int startIndex, int skipCount) {
+ public int reset(int startIndex, int skipCount) {
getValue(startIndex);
+ return 0;
}
@Override
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/LongKeyValueReader.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/LongKeyValueReader.java
index a981dca..8ae8335 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/LongKeyValueReader.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/LongKeyValueReader.java
@@ -23,6 +23,8 @@
import org.apache.hyracks.data.std.primitive.LongPointable;
public final class LongKeyValueReader extends
AbstractFixedLengthColumnKeyValueReader {
+ private long lastLong;
+
@Override
public ATypeTag getTypeTag() {
return ATypeTag.BIGINT;
@@ -35,7 +37,11 @@
@Override
public long getLong() {
- return LongPointable.getLong(value.getByteArray(),
value.getStartOffset());
+ lastLong = LongPointable.getLong(value.getByteArray(),
value.getStartOffset());
+ if (77219L == lastLong) {
+ System.err.println("jhfgsdjfgksd");
+ }
+ return lastLong;
}
@Override
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/StringKeyValueReader.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/StringKeyValueReader.java
index d6d7c4c..17225b9 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/StringKeyValueReader.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/value/key/StringKeyValueReader.java
@@ -51,8 +51,9 @@
}
@Override
- public void reset(int startIndex, int skipCount) {
+ public int reset(int startIndex, int skipCount) {
getValue(startIndex);
+ return 0;
}
@Override
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/AbstractColumnValuesWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/AbstractColumnValuesWriter.java
index 87eda82..5e5d6e4 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/AbstractColumnValuesWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/AbstractColumnValuesWriter.java
@@ -38,6 +38,8 @@
import org.apache.parquet.bytes.BytesUtils;
public abstract class AbstractColumnValuesWriter implements
IColumnValuesWriter {
+ // For 3 integers (count, defSize, and valueSize)
+ private static final int COUNT_DEF_SIZE_VALUE_SIZE = Integer.BYTES * 3;
protected final AbstractColumnFilterWriter filterWriter;
protected final ParquetRunLengthBitPackingHybridEncoder definitionLevels;
protected final int level;
@@ -65,7 +67,13 @@
@Override
public final int getEstimatedSize() {
- return definitionLevels.getEstimatedSize() + getValuesEstimatedSize();
+ return definitionLevels.getEstimatedSize() + getValuesEstimatedSize()
+ COUNT_DEF_SIZE_VALUE_SIZE;
+ }
+
+ @Override
+ public int getEstimatedSize(int length) {
+ // + 1 byte for the definition level
+ return Byte.BYTES + calculateEstimatedSize(length);
}
@Override
@@ -234,6 +242,8 @@
protected abstract int getValuesEstimatedSize();
+ protected abstract int calculateEstimatedSize(int length);
+
protected abstract int getValuesAllocatedSize();
protected abstract AbstractColumnFilterWriter createFilter();
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/BooleanColumnValuesWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/BooleanColumnValuesWriter.java
index 0058f18..4bd6e27 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/BooleanColumnValuesWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/BooleanColumnValuesWriter.java
@@ -59,6 +59,11 @@
}
@Override
+ protected int calculateEstimatedSize(int length) {
+ return 1;
+ }
+
+ @Override
protected int getValuesAllocatedSize() {
return booleanWriter.getAllocatedSize();
}
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/DoubleColumnValuesWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/DoubleColumnValuesWriter.java
index 5963d23..9e6f906 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/DoubleColumnValuesWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/DoubleColumnValuesWriter.java
@@ -87,6 +87,11 @@
}
@Override
+ protected int calculateEstimatedSize(int length) {
+ return doubleWriter.calculateEstimatedSize(length);
+ }
+
+ @Override
protected int getValuesAllocatedSize() {
return doubleWriter.getAllocatedSize();
}
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/LongColumnValuesWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/LongColumnValuesWriter.java
index e6ada55..6e41af7 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/LongColumnValuesWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/LongColumnValuesWriter.java
@@ -84,6 +84,11 @@
}
@Override
+ protected int calculateEstimatedSize(int length) {
+ return longWriter.calculateEstimatedSize(length);
+ }
+
+ @Override
protected int getValuesAllocatedSize() {
return longWriter.getAllocatedSize();
}
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/NullMissingColumnValuesWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/NullMissingColumnValuesWriter.java
index edc9fe2..2d9f5bf 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/NullMissingColumnValuesWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/NullMissingColumnValuesWriter.java
@@ -76,6 +76,11 @@
}
@Override
+ protected int calculateEstimatedSize(int length) {
+ return 0;
+ }
+
+ @Override
protected int getValuesAllocatedSize() {
return 0;
}
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/StringColumnValuesWriter.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/StringColumnValuesWriter.java
index b0d5a93..5b1977f 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/StringColumnValuesWriter.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/writer/StringColumnValuesWriter.java
@@ -72,6 +72,11 @@
}
@Override
+ protected int calculateEstimatedSize(int length) {
+ return stringWriter.calculateEstimatedSize(length);
+ }
+
+ @Override
protected final int getValuesAllocatedSize() {
return stringWriter.getAllocatedSize();
}
diff --git
a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/test/dummy/AssemblerTest.java
b/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/test/dummy/AssemblerTest.java
index fcb228f..f336103 100644
---
a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/test/dummy/AssemblerTest.java
+++
b/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/test/dummy/AssemblerTest.java
@@ -31,7 +31,7 @@
import org.apache.asterix.column.assembler.value.DummyValueGetterFactory;
import org.apache.asterix.column.bytes.stream.in.AbstractBytesInputStream;
-import org.apache.asterix.column.common.buffer.DummyBytesInputStream;
+import org.apache.asterix.column.bytes.stream.in.DummyBytesInputStream;
import org.apache.asterix.column.common.test.TestCase;
import org.apache.asterix.column.filter.NoOpColumnFilterEvaluatorFactory;
import org.apache.asterix.column.operation.query.ColumnAssembler;
diff --git
a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/writer/DummyColumnValuesWriter.java
b/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/writer/DummyColumnValuesWriter.java
index 2e1dec9..d287417 100644
---
a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/writer/DummyColumnValuesWriter.java
+++
b/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/writer/DummyColumnValuesWriter.java
@@ -109,6 +109,11 @@
}
@Override
+ public int getEstimatedSize(int length) {
+ return length;
+ }
+
+ @Override
public int getAllocatedSpace() {
return 0;
}
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/LocalFSInputStream.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/LocalFSInputStream.java
index b6cfc54..1c2f69b 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/LocalFSInputStream.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/LocalFSInputStream.java
@@ -40,6 +40,7 @@
private final FileSystemWatcher watcher;
private File currentFile;
private String lastFileName = "";
+ private int fileNo;
public LocalFSInputStream(FileSystemWatcher watcher) {
this.watcher = watcher;
@@ -82,6 +83,7 @@
if (logManager != null) {
logManager.endPartition(currentFile.getAbsolutePath());
}
+ LOGGER.info(fileNo++);
try {
in.close();
} finally {
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
index 23c168e..5b54fb3 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
@@ -80,7 +80,13 @@
}
public static void validateAndAdd(Path path, String expression, List<File>
files) {
- if ((expression == null || Pattern.matches(expression,
path.toString())) && fileNotExistsInList(files, path)) {
+ if (expression != null && expression.startsWith("repeat")) {
+ final int rep = Integer.parseInt(expression.split(",")[1]);
+ for (int i = 0; i < rep; i++) {
+ files.add(new File(path.toString()));
+ }
+ } else if ((expression == null || Pattern.matches(expression,
path.toString()))
+ && fileNotExistsInList(files, path)) {
files.add(new File(path.toString()));
}
}
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/LSMColumnBTreeRangeSearchCursor.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/LSMColumnBTreeRangeSearchCursor.java
index 75b2c72..1402c69 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/LSMColumnBTreeRangeSearchCursor.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/LSMColumnBTreeRangeSearchCursor.java
@@ -75,7 +75,11 @@
return;
}
IColumnTupleIterator columnTuple = (IColumnTupleIterator) e.getTuple();
- columnTuple.skip(1);
+ if (!columnTuple.isAntimatter()) {
+ columnTuple.skip(1);
+ } else {
+ System.err.println("jhfdsgjfsdlf");
+ }
}
@Override
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 d3b4673..a3a82bb 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
@@ -82,7 +82,7 @@
if (columnIndex >= numberOfPrimaryKeys) {
buffersProviders[i] = new
ColumnMultiBufferProvider(columnIndex, multiPageOp);
} else {
- buffersProviders[i] = new
ColumnSingleBufferProvider(columnIndex);
+ buffersProviders[i] = DummyColumnBufferProvider.INSTANCE;
}
}
totalNumberOfMegaLeafNodes = 0;
@@ -114,7 +114,7 @@
int numberOfTuples = frame.getTupleCount();
//Start new page and check whether we should skip reading non-key
columns or not
boolean readColumnPages = startNewPage(pageZero,
frame.getNumberOfColumns(), numberOfTuples);
- setPrimaryKeysAt(startIndex, startIndex);
+ int skipCount = setPrimaryKeysAt(startIndex, startIndex);
if (readColumnPages) {
for (int i = 0; i < filterBufferProviders.length; i++) {
IColumnBufferProvider provider = filterBufferProviders[i];
@@ -134,7 +134,7 @@
startColumn(provider, i, numberOfTuples);
}
// Skip until before startIndex (i.e. stop at startIndex - 1)
- skip(startIndex);
+ skip(Math.max(skipCount, 0));
} else {
numOfSkippedMegaLeafNodes++;
}
@@ -143,14 +143,14 @@
@Override
public final void setAt(int startIndex) throws HyracksDataException {
- int skipCount = startIndex - tupleIndex;
+ int skipCount = startIndex - tupleIndex - 1;
tupleIndex = startIndex;
- setPrimaryKeysAt(startIndex, skipCount);
+ skipCount = setPrimaryKeysAt(startIndex, skipCount);
// -1 because next would be called for all columns
- skip(skipCount - 1);
+ skip(skipCount);
}
- protected abstract void setPrimaryKeysAt(int index, int skipCount) throws
HyracksDataException;
+ protected abstract int setPrimaryKeysAt(int index, int skipCount) throws
HyracksDataException;
protected abstract boolean startNewPage(ByteBuffer pageZero, int
numberOfColumns, int numberOfTuples)
throws HyracksDataException;
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/DummyColumnBufferProvider.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/DummyColumnBufferProvider.java
new file mode 100644
index 0000000..f99ed21
--- /dev/null
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/tuples/DummyColumnBufferProvider.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.storage.am.lsm.btree.column.impls.lsm.tuples;
+
+import java.nio.ByteBuffer;
+import java.util.Queue;
+
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import
org.apache.hyracks.storage.am.lsm.btree.column.api.IColumnBufferProvider;
+import
org.apache.hyracks.storage.am.lsm.btree.column.impls.btree.ColumnBTreeReadLeafFrame;
+
+public class DummyColumnBufferProvider implements IColumnBufferProvider {
+ public static final IColumnBufferProvider INSTANCE = new
DummyColumnBufferProvider();
+
+ private DummyColumnBufferProvider() {
+ }
+
+ @Override
+ public void reset(ColumnBTreeReadLeafFrame frame) throws
HyracksDataException {
+
+ }
+
+ @Override
+ public void readAll(Queue<ByteBuffer> buffers) throws HyracksDataException
{
+
+ }
+
+ @Override
+ public void releaseAll() throws HyracksDataException {
+
+ }
+
+ @Override
+ public ByteBuffer getBuffer() {
+ return null;
+ }
+
+ @Override
+ public int getLength() {
+ return 0;
+ }
+
+ @Override
+ public int getColumnIndex() {
+ return 0;
+ }
+}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17599
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: If7dec034a2d75c80688523b19be6fdc38f077a65
Gerrit-Change-Number: 17599
Gerrit-PatchSet: 1
Gerrit-Owner: Wail Alkowaileet <[email protected]>
Gerrit-MessageType: newchange
