Ian Maxon has submitted this change and it was merged. Change subject: Hyracks Unit tests for LSM Filters ......................................................................
Hyracks Unit tests for LSM Filters Basic tests for filter behaviors in LSMBTrees. Simply uses the PK as the filtering attribute for now. Change-Id: Ie0e79c0a25d5d6be727b9ebad841801024c00e94 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1704 Tested-by: Jenkins <[email protected]> BAD: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Jianfeng Jia <[email protected]> Reviewed-by: Taewoo Kim <[email protected]> --- M hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TupleUtils.java A hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/StubIOOperationCallback.java M hyracks-fullstack/hyracks/hyracks-test-support/pom.xml M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexInsertTest.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestContext.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.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/btree/OrderedIndexUpdateTest.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.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/AbstractRTreeTestContext.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestDriver.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeBulkLoadTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeDeleteTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeInsertTest.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/BTreeSortedInsertTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpsertTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestContext.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeBulkLoadTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeDeleteTest.java A hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTest.java A hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTestDriver.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeInsertTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTestDriver.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMultiBulkLoadTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestContext.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/LSMComponentFilterReferenceTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestContext.java 38 files changed, 566 insertions(+), 116 deletions(-) Approvals: Taewoo Kim: Looks good to me, approved Jianfeng Jia: Looks good to me, but someone else must approve Jenkins: Verified; No violations found; Verified Objections: Jenkins: Violations found diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TupleUtils.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TupleUtils.java index 500cee7..52bf893 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TupleUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TupleUtils.java @@ -36,7 +36,8 @@ public class TupleUtils { @SuppressWarnings("unchecked") public static void createTuple(ArrayTupleBuilder tupleBuilder, ArrayTupleReference tuple, - ISerializerDeserializer[] fieldSerdes, final Object... fields) throws HyracksDataException { + ISerializerDeserializer[] fieldSerdes, boolean filtered, final Object... fields) + throws HyracksDataException { DataOutput dos = tupleBuilder.getDataOutput(); tupleBuilder.reset(); int numFields = Math.min(tupleBuilder.getFieldEndOffsets().length, fields.length); @@ -44,7 +45,17 @@ fieldSerdes[i].serialize(fields[i], dos); tupleBuilder.addFieldEndOffset(); } + if (filtered) { + fieldSerdes[0].serialize(fields[0], dos); + tupleBuilder.addFieldEndOffset(); + } tuple.reset(tupleBuilder.getFieldEndOffsets(), tupleBuilder.getByteArray()); + } + + public static void createTuple(ArrayTupleBuilder tupleBuilder, ArrayTupleReference tuple, + ISerializerDeserializer[] fieldSerdes, final Object... fields) throws HyracksDataException { + createTuple(tupleBuilder, tuple, fieldSerdes, false, fields); + } public static ITupleReference createTuple(ISerializerDeserializer[] fieldSerdes, final Object... fields) @@ -55,22 +66,37 @@ return tuple; } - public static void createIntegerTuple(ArrayTupleBuilder tupleBuilder, ArrayTupleReference tuple, - final int... fields) throws HyracksDataException { + public static void createIntegerTuple(ArrayTupleBuilder tupleBuilder, ArrayTupleReference tuple, boolean filtered, + final int... fields) throws HyracksDataException { DataOutput dos = tupleBuilder.getDataOutput(); tupleBuilder.reset(); for (final int i : fields) { IntegerSerializerDeserializer.INSTANCE.serialize(i, dos); tupleBuilder.addFieldEndOffset(); } + if (filtered) { + IntegerSerializerDeserializer.INSTANCE.serialize(fields[0], dos); + tupleBuilder.addFieldEndOffset(); + } tuple.reset(tupleBuilder.getFieldEndOffsets(), tupleBuilder.getByteArray()); } - public static ITupleReference createIntegerTuple(final int... fields) throws HyracksDataException { - ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fields.length); + public static void createIntegerTuple(ArrayTupleBuilder tupleBuilder, ArrayTupleReference tuple, + final int... fields) throws HyracksDataException { + createIntegerTuple(tupleBuilder, tuple, false, fields); + } + + public static ITupleReference createIntegerTuple(boolean filtered, final int... fields) + throws HyracksDataException { + ArrayTupleBuilder tupleBuilder = filtered ? new ArrayTupleBuilder(fields.length + 1) + : new ArrayTupleBuilder(fields.length); ArrayTupleReference tuple = new ArrayTupleReference(); createIntegerTuple(tupleBuilder, tuple, fields); return tuple; + } + + public static ITupleReference createIntegerTuple(final int... fields) throws HyracksDataException { + return createIntegerTuple(false, fields); } public static void createDoubleTuple(ArrayTupleBuilder tupleBuilder, ArrayTupleReference tuple, @@ -131,7 +157,8 @@ return tupleCopy; } - public static void copyTuple(ArrayTupleBuilder tupleBuilder, ITupleReference tuple, int numFields) throws HyracksDataException { + public static void copyTuple(ArrayTupleBuilder tupleBuilder, ITupleReference tuple, int numFields) + throws HyracksDataException { tupleBuilder.reset(); for (int i = 0; i < numFields; i++) { tupleBuilder.addField(tuple.getFieldData(i), tuple.getFieldStart(i), tuple.getFieldLength(i)); diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/StubIOOperationCallback.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/StubIOOperationCallback.java new file mode 100644 index 0000000..0f9052f --- /dev/null +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/StubIOOperationCallback.java @@ -0,0 +1,69 @@ +/* + * 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.common.impls; + +import java.util.List; + +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback; +import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType; + +/** + * This class is for testing. It's basically a way to get the new/old component info from the + * harness callback simply. + */ + +public class StubIOOperationCallback implements ILSMIOOperationCallback { + + private List<ILSMComponent> oldComponents = null; + private ILSMDiskComponent newComponent = null; + + @Override + public void beforeOperation(LSMOperationType opType) throws HyracksDataException { + //Not interested in this + } + + @Override + public void afterOperation(LSMOperationType opType, List<ILSMComponent> oldComponents, + ILSMDiskComponent newComponent) throws HyracksDataException { + this.oldComponents = oldComponents; + this.newComponent = newComponent; + } + + @Override + public synchronized void afterFinalize(LSMOperationType opType, ILSMDiskComponent newComponent) + throws HyracksDataException { + //Redundant info from after + } + + @Override + public void setNumOfMutableComponents(int count) { + //Not interested in this + } + + public List<ILSMComponent> getLastOldComponents() { + return oldComponents; + } + + public ILSMDiskComponent getLastNewComponent() { + return newComponent; + } +} diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml index 0d30d9c..32e1338 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml @@ -105,5 +105,10 @@ <artifactId>hyracks-util</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.5</version> + </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java index dd03eae..cd6ea2e 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java @@ -41,7 +41,7 @@ protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) throws Exception { - OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType); + OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); for (int i = 0; i < bulkLoadRounds; i++) { diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java index ede66ca..7378cf1 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java @@ -41,9 +41,9 @@ @Override protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, - ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) - throws Exception { - OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType); + ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, + ITupleReference prefixHighKey) throws Exception { + OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); for (int i = 0; i < numInsertRounds; i++) { @@ -52,7 +52,7 @@ if (fieldSerdes[0] instanceof IntegerSerializerDeserializer) { orderedIndexTestUtils.insertIntTuples(ctx, numTuplesToInsert, getRandom()); } else if (fieldSerdes[0] instanceof UTF8StringSerializerDeserializer) { - orderedIndexTestUtils.insertStringTuples(ctx, numTuplesToInsert, getRandom()); + orderedIndexTestUtils.insertStringTuples(ctx, numTuplesToInsert, false, getRandom()); } int numTuplesPerDeleteRound = (int) Math .ceil((float) ctx.getCheckTuples().size() / (float) numDeleteRounds); diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexInsertTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexInsertTest.java index ce67e5c..ecf92d4 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexInsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexInsertTest.java @@ -45,9 +45,9 @@ @Override protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, - ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) - throws Exception { - OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType); + ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, + ITupleReference prefixHighKey) throws Exception { + OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); // We assume all fieldSerdes are of the same type. Check the first one @@ -55,7 +55,7 @@ if (fieldSerdes[0] instanceof IntegerSerializerDeserializer) { orderedIndexTestUtils.insertIntTuples(ctx, numTuplesToInsert, getRandom()); } else if (fieldSerdes[0] instanceof UTF8StringSerializerDeserializer) { - orderedIndexTestUtils.insertStringTuples(ctx, numTuplesToInsert, getRandom()); + orderedIndexTestUtils.insertStringTuples(ctx, numTuplesToInsert, false, getRandom()); } orderedIndexTestUtils.checkPointSearches(ctx); diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java index 3dbc392..9a08401 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java @@ -47,7 +47,7 @@ protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) throws Exception { - OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType); + OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); // We assume all fieldSerdes are of the same type. Check the first one diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestContext.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestContext.java index 84f2353..6b46edf 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestContext.java @@ -33,8 +33,9 @@ protected final TreeSet<CheckTuple> checkTuples = new TreeSet<CheckTuple>(); - public OrderedIndexTestContext(ISerializerDeserializer[] fieldSerdes, IIndex index) throws HyracksDataException { - super(fieldSerdes, index); + public OrderedIndexTestContext(ISerializerDeserializer[] fieldSerdes, IIndex index, boolean filtered) + throws HyracksDataException { + super(fieldSerdes, index, filtered); } public void upsertCheckTuple(CheckTuple checkTuple, Collection<CheckTuple> checkTuples) { diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.java index 3aab8ef..84a5df6 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.java @@ -40,13 +40,13 @@ protected static final int numTuplesToInsert = AccessMethodTestsConfig.BTREE_NUM_TUPLES_TO_INSERT; protected abstract OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception; + BTreeLeafFrameType leafType, boolean filtered) throws Exception; protected abstract Random getRandom(); protected abstract void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, - ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) - throws Exception; + ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, + ITupleReference prefixHighKey) throws Exception; protected abstract String getTestOpName(); 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 970f49d..d57cb9e 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 @@ -31,6 +31,9 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.commons.lang3.tuple.MutablePair; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.hyracks.api.dataflow.value.IBinaryComparator; import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; import org.apache.hyracks.api.exceptions.ErrorCode; import org.apache.hyracks.api.exceptions.HyracksDataException; @@ -57,8 +60,8 @@ private static void compareActualAndExpected(ITupleReference actual, CheckTuple expected, ISerializerDeserializer[] fieldSerdes) throws HyracksDataException { for (int i = 0; i < fieldSerdes.length; i++) { - ByteArrayInputStream inStream = - new ByteArrayInputStream(actual.getFieldData(i), actual.getFieldStart(i), actual.getFieldLength(i)); + ByteArrayInputStream inStream = new ByteArrayInputStream(actual.getFieldData(i), actual.getFieldStart(i), + actual.getFieldLength(i)); DataInput dataIn = new DataInputStream(inStream); Object actualObj = fieldSerdes[i].deserialize(dataIn); if (!actualObj.equals(expected.getField(i))) { @@ -98,20 +101,20 @@ MultiComparator lowKeyCmp = BTreeUtils.getSearchMultiComparator(ctx.getComparatorFactories(), lowKey); MultiComparator highKeyCmp = BTreeUtils.getSearchMultiComparator(ctx.getComparatorFactories(), highKey); IIndexCursor searchCursor = ctx.getIndexAccessor().createSearchCursor(false); - RangePredicate rangePred = - new RangePredicate(lowKey, highKey, lowKeyInclusive, highKeyInclusive, lowKeyCmp, highKeyCmp); + RangePredicate rangePred = new RangePredicate(lowKey, highKey, lowKeyInclusive, highKeyInclusive, lowKeyCmp, + highKeyCmp); ctx.getIndexAccessor().search(searchCursor, rangePred); // Get the subset of elements from the expected set within given key // range. CheckTuple lowKeyCheck = createCheckTupleFromTuple(lowKey, ctx.getFieldSerdes(), lowKeyCmp.getKeyFieldCount()); - CheckTuple highKeyCheck = - createCheckTupleFromTuple(highKey, ctx.getFieldSerdes(), highKeyCmp.getKeyFieldCount()); + CheckTuple highKeyCheck = createCheckTupleFromTuple(highKey, ctx.getFieldSerdes(), + highKeyCmp.getKeyFieldCount()); SortedSet<CheckTuple> expectedSubset = null; if (lowKeyCmp.getKeyFieldCount() < ctx.getKeyFieldCount() || highKeyCmp.getKeyFieldCount() < ctx.getKeyFieldCount()) { // Searching on a key prefix (low key or high key or both). - expectedSubset = - getPrefixExpectedSubset((TreeSet<CheckTuple>) ctx.getCheckTuples(), lowKeyCheck, highKeyCheck); + expectedSubset = getPrefixExpectedSubset((TreeSet<CheckTuple>) ctx.getCheckTuples(), lowKeyCheck, + highKeyCheck); } else { // Searching on all key fields. expectedSubset = ((TreeSet<CheckTuple>) ctx.getCheckTuples()).subSet(lowKeyCheck, lowKeyInclusive, @@ -238,9 +241,15 @@ public static void insertCheckTuples(IIndexTestContext ctx, Collection<CheckTuple> checkTuples) throws HyracksDataException { + insertCheckTuples(ctx, checkTuples, false); + } + + public static void insertCheckTuples(IIndexTestContext ctx, Collection<CheckTuple> checkTuples, boolean filtered) + throws HyracksDataException { int fieldCount = ctx.getFieldCount(); int numTuples = checkTuples.size(); - ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount); + ArrayTupleBuilder tupleBuilder = filtered ? new ArrayTupleBuilder(fieldCount + 1) + : new ArrayTupleBuilder(fieldCount); ArrayTupleReference tuple = new ArrayTupleReference(); int c = 1; @@ -250,17 +259,24 @@ LOGGER.info("Inserting Tuple " + c + "/" + numTuples); } } - createTupleFromCheckTuple(checkTuple, tupleBuilder, tuple, ctx.getFieldSerdes()); + createTupleFromCheckTuple(checkTuple, tupleBuilder, tuple, ctx.getFieldSerdes(), filtered); ctx.getIndexAccessor().insert(tuple); c++; } } + public Pair<ITupleReference, ITupleReference> insertStringTuples(IIndexTestContext ctx, int numTuples, Random rnd) + throws Exception { + return insertStringTuples(ctx, numTuples, false, rnd); + } + @SuppressWarnings("unchecked") - public void insertStringTuples(IIndexTestContext ctx, int numTuples, Random rnd) throws Exception { + public Pair<ITupleReference, ITupleReference> insertStringTuples(IIndexTestContext ctx, int numTuples, + boolean filtered, Random rnd) throws Exception { int fieldCount = ctx.getFieldCount(); int numKeyFields = ctx.getKeyFieldCount(); String[] fieldValues = new String[fieldCount]; + MutablePair<ITupleReference, ITupleReference> minMax = null; for (int i = 0; i < numTuples; i++) { if (LOGGER.isLoggable(Level.INFO)) { if ((i + 1) % (numTuples / Math.min(10, numTuples)) == 0) { @@ -276,12 +292,16 @@ for (int j = numKeyFields; j < fieldCount; j++) { fieldValues[j] = getRandomString(5, rnd); } - TupleUtils.createTuple(ctx.getTupleBuilder(), ctx.getTuple(), ctx.getFieldSerdes(), (Object[]) fieldValues); + TupleUtils.createTuple(ctx.getTupleBuilder(), ctx.getTuple(), ctx.getFieldSerdes(), filtered, + (Object[]) fieldValues); try { ctx.getIndexAccessor().insert(ctx.getTuple()); // Set expected values. Do this only after insertion succeeds // because we ignore duplicate keys. ctx.insertCheckTuple(createStringCheckTuple(fieldValues, ctx.getKeyFieldCount()), ctx.getCheckTuples()); + if (filtered) { + addFilterField(ctx,minMax); + } } catch (HyracksDataException e) { // Ignore duplicate key insertions. if (e.getErrorCode() != ErrorCode.DUPLICATE_KEY) { @@ -289,6 +309,7 @@ } } } + return minMax; } public void upsertStringTuples(IIndexTestContext ictx, int numTuples, Random rnd) throws Exception { @@ -317,8 +338,13 @@ } } - @SuppressWarnings("unchecked") public void bulkLoadStringTuples(IIndexTestContext ctx, int numTuples, Random rnd) throws Exception { + bulkLoadStringTuples(ctx, numTuples, false, rnd); + } + + @SuppressWarnings("unchecked") + public void bulkLoadStringTuples(IIndexTestContext ctx, int numTuples, boolean filtered, Random rnd) + throws Exception { int fieldCount = ctx.getFieldCount(); int numKeyFields = ctx.getKeyFieldCount(); String[] fieldValues = new String[fieldCount]; @@ -337,7 +363,7 @@ // for bulk loading. ctx.insertCheckTuple(createStringCheckTuple(fieldValues, ctx.getKeyFieldCount()), tmpCheckTuples); } - bulkLoadCheckTuples(ctx, tmpCheckTuples); + bulkLoadCheckTuples(ctx, tmpCheckTuples, filtered); // Add tmpCheckTuples to ctx check tuples for comparing searches. for (CheckTuple checkTuple : tmpCheckTuples) { diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpdateTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpdateTest.java index eb1a81e..9d17c6a 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpdateTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpdateTest.java @@ -40,13 +40,13 @@ @Override protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, - ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) - throws Exception { + ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, + ITupleReference prefixHighKey) throws Exception { // This is a noop because we can only update non-key fields. if (fieldSerdes.length == numKeys) { return; } - OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType); + OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); // We assume all fieldSerdes are of the same type. Check the first one @@ -54,7 +54,7 @@ if (fieldSerdes[0] instanceof IntegerSerializerDeserializer) { orderedIndexTestUtils.insertIntTuples(ctx, numTuplesToInsert, getRandom()); } else if (fieldSerdes[0] instanceof UTF8StringSerializerDeserializer) { - orderedIndexTestUtils.insertStringTuples(ctx, numTuplesToInsert, getRandom()); + orderedIndexTestUtils.insertStringTuples(ctx, numTuplesToInsert, false, getRandom()); } int numTuplesPerDeleteRound = (int) Math.ceil((float) ctx.getCheckTuples().size() / (float) numUpdateRounds); for (int j = 0; j < numUpdateRounds; j++) { diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java index 0b72ec3..2118f8c 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java @@ -47,7 +47,7 @@ protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) throws Exception { - OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType); + OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); // We assume all fieldSerdes are of the same type. Check the first one diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java index 8761fe3..20d81dc 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java @@ -36,12 +36,14 @@ protected final ArrayTupleReference tuple = new ArrayTupleReference(); protected final IIndexAccessor indexAccessor; - public IndexTestContext(ISerializerDeserializer[] fieldSerdes, IIndex index) throws HyracksDataException { + public IndexTestContext(ISerializerDeserializer[] fieldSerdes, IIndex index, boolean filtered) + throws HyracksDataException { this.fieldSerdes = fieldSerdes; this.index = index; this.indexAccessor = (IIndexAccessor) index.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE); - this.tupleBuilder = new ArrayTupleBuilder(fieldSerdes.length); + this.tupleBuilder = filtered ? new ArrayTupleBuilder(fieldSerdes.length + 1) + : new ArrayTupleBuilder(fieldSerdes.length); } @Override 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 b801715..4cd4402 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 @@ -31,7 +31,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; +import org.apache.commons.lang3.tuple.MutablePair; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.hyracks.api.dataflow.value.*; import org.apache.hyracks.api.exceptions.ErrorCode; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder; @@ -68,14 +70,30 @@ protected abstract boolean checkDiskOrderScanResult(ITupleReference tuple, CheckTuple checkTuple, IIndexTestContext ctx) throws HyracksDataException; - @SuppressWarnings("unchecked") + public static int compareFilterTuples(ITupleReference lhs, ITupleReference rhs, IBinaryComparator comp) + throws HyracksDataException { + return comp.compare(lhs.getFieldData(0), lhs.getFieldStart(0), lhs.getFieldLength(0), rhs.getFieldData(0), + rhs.getFieldStart(0), rhs.getFieldLength(0)); + } + public static void createTupleFromCheckTuple(CheckTuple checkTuple, ArrayTupleBuilder tupleBuilder, ArrayTupleReference tuple, ISerializerDeserializer[] fieldSerdes) throws HyracksDataException { + createTupleFromCheckTuple(checkTuple, tupleBuilder, tuple, fieldSerdes, false); + } + + @SuppressWarnings("unchecked") + public static void createTupleFromCheckTuple(CheckTuple checkTuple, ArrayTupleBuilder tupleBuilder, + ArrayTupleReference tuple, ISerializerDeserializer[] fieldSerdes, boolean filtered) + throws HyracksDataException { int fieldCount = tupleBuilder.getFieldEndOffsets().length; DataOutput dos = tupleBuilder.getDataOutput(); tupleBuilder.reset(); - for (int i = 0; i < fieldCount; i++) { + for (int i = 0; i < (filtered ? fieldCount - 1 : fieldCount); i++) { fieldSerdes[i].serialize(checkTuple.getField(i), dos); + tupleBuilder.addFieldEndOffset(); + } + if (filtered) { + fieldSerdes[0].serialize(checkTuple.getField(0), dos); tupleBuilder.addFieldEndOffset(); } tuple.reset(tupleBuilder.getFieldEndOffsets(), tupleBuilder.getByteArray()); @@ -87,8 +105,8 @@ CheckTuple checkTuple = createCheckTuple(fieldSerdes.length, numKeys); int fieldCount = Math.min(fieldSerdes.length, tuple.getFieldCount()); for (int i = 0; i < fieldCount; i++) { - ByteArrayInputStream inStream = - new ByteArrayInputStream(tuple.getFieldData(i), tuple.getFieldStart(i), tuple.getFieldLength(i)); + ByteArrayInputStream inStream = new ByteArrayInputStream(tuple.getFieldData(i), tuple.getFieldStart(i), + tuple.getFieldLength(i)); DataInput dataIn = new DataInputStream(inStream); Comparable fieldObj = (Comparable) fieldSerdes[i].deserialize(dataIn); checkTuple.appendField(fieldObj); @@ -121,8 +139,8 @@ while (diskOrderCursor.hasNext()) { diskOrderCursor.next(); ITupleReference tuple = diskOrderCursor.getTuple(); - CheckTuple checkTuple = - createCheckTupleFromTuple(tuple, ctx.getFieldSerdes(), ctx.getKeyFieldCount()); + CheckTuple checkTuple = createCheckTupleFromTuple(tuple, ctx.getFieldSerdes(), + ctx.getKeyFieldCount()); if (!checkDiskOrderScanResult(tuple, checkTuple, ctx)) { fail("Disk-order scan returned unexpected answer: " + checkTuple.toString()); } @@ -159,7 +177,14 @@ } @SuppressWarnings("unchecked") - public void insertIntTuples(IIndexTestContext ctx, int numTuples, Random rnd) throws Exception { + + public Pair<ITupleReference, ITupleReference> insertIntTuples(IIndexTestContext ctx, int numTuples, Random rnd) + throws Exception { + return insertIntTuples(ctx, numTuples, false, rnd); + } + + public Pair<ITupleReference, ITupleReference> insertIntTuples(IIndexTestContext ctx, int numTuples, + boolean filtered, Random rnd) throws Exception { int fieldCount = ctx.getFieldCount(); int numKeyFields = ctx.getKeyFieldCount(); int[] fieldValues = new int[ctx.getFieldCount()]; @@ -167,12 +192,13 @@ // For example, for 2 keys we want the square root of numTuples, for 3 // keys the cube root of numTuples, etc. int maxValue = (int) Math.ceil(Math.pow(numTuples, 1.0 / numKeyFields)); + MutablePair<ITupleReference, ITupleReference> minMax = null; for (int i = 0; i < numTuples; i++) { // Set keys. setIntKeyFields(fieldValues, numKeyFields, maxValue, rnd); // Set values. setIntPayloadFields(fieldValues, numKeyFields, fieldCount); - TupleUtils.createIntegerTuple(ctx.getTupleBuilder(), ctx.getTuple(), fieldValues); + TupleUtils.createIntegerTuple(ctx.getTupleBuilder(), ctx.getTuple(), filtered, fieldValues); if (LOGGER.isLoggable(Level.INFO)) { if ((i + 1) % (numTuples / Math.min(10, numTuples)) == 0) { LOGGER.info("Inserting Tuple " + (i + 1) + "/" + numTuples); @@ -181,6 +207,9 @@ try { ctx.getIndexAccessor().insert(ctx.getTuple()); ctx.insertCheckTuple(createIntCheckTuple(fieldValues, ctx.getKeyFieldCount()), ctx.getCheckTuples()); + if (filtered) { + addFilterField(ctx, minMax); + } } catch (HyracksDataException e) { // We set expected values only after insertion succeeds because // we ignore duplicate keys. @@ -188,6 +217,27 @@ throw e; } } + } + return minMax; + } + + protected void addFilterField(IIndexTestContext ctx, MutablePair<ITupleReference, ITupleReference> minMax) + throws HyracksDataException { + //Duplicate the PK field as a filter field at the end of the tuple to be inserted. + int filterField = ctx.getFieldCount(); + ITupleReference currTuple = ctx.getTuple(); + ArrayTupleBuilder filterBuilder = new ArrayTupleBuilder(1); + filterBuilder.addField(currTuple.getFieldData(filterField), currTuple.getFieldStart(filterField), + currTuple.getFieldLength(filterField)); + IBinaryComparator comparator = ctx.getComparatorFactories()[0].createBinaryComparator(); + ArrayTupleReference filterOnlyTuple = new ArrayTupleReference(); + filterOnlyTuple.reset(filterBuilder.getFieldEndOffsets(), filterBuilder.getByteArray()); + if (minMax == null) { + minMax = MutablePair.of(filterOnlyTuple, filterOnlyTuple); + } else if (compareFilterTuples(minMax.getLeft(), filterOnlyTuple, comparator) > 0) { + minMax.setLeft(filterOnlyTuple); + } else if (compareFilterTuples(minMax.getRight(), filterOnlyTuple, comparator) < 0) { + minMax.setRight(filterOnlyTuple); } } @@ -224,8 +274,12 @@ } } - @SuppressWarnings("unchecked") public void bulkLoadIntTuples(IIndexTestContext ctx, int numTuples, Random rnd) throws Exception { + bulkLoadIntTuples(ctx, numTuples, false, rnd); + } + + @SuppressWarnings("unchecked") + public void bulkLoadIntTuples(IIndexTestContext ctx, int numTuples, boolean filter, Random rnd) throws Exception { int fieldCount = ctx.getFieldCount(); int numKeyFields = ctx.getKeyFieldCount(); int[] fieldValues = new int[ctx.getFieldCount()]; @@ -241,7 +295,7 @@ // for ordered indexes bulk loading). ctx.insertCheckTuple(createIntCheckTuple(fieldValues, ctx.getKeyFieldCount()), tmpCheckTuples); } - bulkLoadCheckTuples(ctx, tmpCheckTuples); + bulkLoadCheckTuples(ctx, tmpCheckTuples, filter); // Add tmpCheckTuples to ctx check tuples for comparing searches. for (CheckTuple checkTuple : tmpCheckTuples) { @@ -251,9 +305,15 @@ public static void bulkLoadCheckTuples(IIndexTestContext ctx, Collection<CheckTuple> checkTuples) throws HyracksDataException { + bulkLoadCheckTuples(ctx, checkTuples, false); + } + + public static void bulkLoadCheckTuples(IIndexTestContext ctx, Collection<CheckTuple> checkTuples, boolean filtered) + throws HyracksDataException { int fieldCount = ctx.getFieldCount(); int numTuples = checkTuples.size(); - ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount); + ArrayTupleBuilder tupleBuilder = filtered ? new ArrayTupleBuilder(fieldCount + 1) + : new ArrayTupleBuilder(fieldCount); ArrayTupleReference tuple = new ArrayTupleReference(); // Perform bulk load. IIndexBulkLoader bulkLoader = ctx.getIndex().createBulkLoader(0.7f, false, numTuples, false); @@ -264,7 +324,7 @@ LOGGER.info("Bulk Loading Tuple " + c + "/" + numTuples); //} } - createTupleFromCheckTuple(checkTuple, tupleBuilder, tuple, ctx.getFieldSerdes()); + createTupleFromCheckTuple(checkTuple, tupleBuilder, tuple, ctx.getFieldSerdes(), filtered); bulkLoader.add(tuple); c++; } diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestContext.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestContext.java index de846ed..9135959 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestContext.java @@ -33,7 +33,7 @@ public AbstractRTreeTestContext(ISerializerDeserializer[] fieldSerdes, ITreeIndex treeIndex) throws HyracksDataException { - super(fieldSerdes, treeIndex); + super(fieldSerdes, treeIndex, false); } @Override diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestDriver.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestDriver.java index 87f70fd..17e4c09 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestDriver.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestDriver.java @@ -72,8 +72,8 @@ IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }; int numKeys = 4; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils.createPrimitiveValueProviderFactories( - numKeys, IntegerPointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils + .createPrimitiveValueProviderFactories(numKeys, IntegerPointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000, -1000 // and the top right coordinates are 1000, 1000 ITupleReference key = TupleUtils.createIntegerTuple(-1000, -1000, 1000, 1000); @@ -93,8 +93,8 @@ DoubleSerializerDeserializer.INSTANCE, DoubleSerializerDeserializer.INSTANCE }; int numKeys = 4; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils.createPrimitiveValueProviderFactories( - numKeys, DoublePointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils + .createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000.0, // -1000.0 and the top right coordinates are 1000.0, 1000.0 ITupleReference key = TupleUtils.createDoubleTuple(-1000.0, -1000.0, 1000.0, 1000.0); @@ -116,8 +116,8 @@ DoubleSerializerDeserializer.INSTANCE, DoubleSerializerDeserializer.INSTANCE }; int numKeys = 8; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils.createPrimitiveValueProviderFactories( - numKeys, DoublePointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils + .createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000.0, // -1000.0, -1000.0, -1000.0 and the top right coordinates are 1000.0, // 1000.0, 1000.0, 1000.0 @@ -144,8 +144,8 @@ IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }; int numKeys = 4; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils.createPrimitiveValueProviderFactories( - numKeys, IntegerPointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils + .createPrimitiveValueProviderFactories(numKeys, IntegerPointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000, -1000 // and the top right coordinates are 1000, 1000 ITupleReference key = TupleUtils.createIntegerTuple(-1000, -1000, 1000, 1000); @@ -171,8 +171,8 @@ DoubleSerializerDeserializer.INSTANCE, DoubleSerializerDeserializer.INSTANCE }; int numKeys = 4; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils.createPrimitiveValueProviderFactories( - numKeys, DoublePointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils + .createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000.0, // -1000.0 and the top right coordinates are 1000.0, 1000.0 ITupleReference key = TupleUtils.createDoubleTuple(-1000.0, -1000.0, 1000.0, 1000.0); @@ -200,8 +200,8 @@ DoubleSerializerDeserializer.INSTANCE, DoubleSerializerDeserializer.INSTANCE }; int numKeys = 8; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils.createPrimitiveValueProviderFactories( - numKeys, DoublePointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils + .createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000.0, // -1000.0, -1000.0, -1000.0 and the top right coordinates are 1000.0, // 1000.0, 1000.0, 1000.0 diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeBulkLoadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeBulkLoadTest.java index 35ea99f..76a9078 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeBulkLoadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeBulkLoadTest.java @@ -50,7 +50,7 @@ @SuppressWarnings("rawtypes") @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return BTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), harness.getFileReference(), fieldSerdes, numKeys, leafType, harness.getPageManagerFactory() .createPageManager(harness.getBufferCache())); diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeDeleteTest.java index 5a62853..905fd22 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeDeleteTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeDeleteTest.java @@ -50,7 +50,7 @@ @SuppressWarnings("rawtypes") @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return BTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), harness.getFileReference(), fieldSerdes, numKeys, leafType, harness.getPageManagerFactory() .createPageManager(harness.getBufferCache())); diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeInsertTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeInsertTest.java index 6b442cd..14810a7 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeInsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeInsertTest.java @@ -59,7 +59,7 @@ @SuppressWarnings("rawtypes") @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return BTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), harness.getFileReference(), fieldSerdes, numKeys, leafType, harness.getPageManagerFactory() .createPageManager(harness.getBufferCache())); 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 f44dee2..da75fc9 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 @@ -106,8 +106,8 @@ ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount); ArrayTupleReference tuple = new ArrayTupleReference(); - ITreeIndexAccessor indexAccessor = - btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE); + ITreeIndexAccessor indexAccessor = btree.createAccessor(TestOperationCallback.INSTANCE, + TestOperationCallback.INSTANCE); // generate keys int numKeys = 50; @@ -182,8 +182,8 @@ ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount); ArrayTupleReference tuple = new ArrayTupleReference(); - ITreeIndexAccessor indexAccessor = - btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE); + ITreeIndexAccessor indexAccessor = btree.createAccessor(TestOperationCallback.INSTANCE, + TestOperationCallback.INSTANCE); // generate keys int numKeys = 50; @@ -255,8 +255,8 @@ ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount); ArrayTupleReference tuple = new ArrayTupleReference(); - ITreeIndexAccessor indexAccessor = - btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE); + ITreeIndexAccessor indexAccessor = btree.createAccessor(TestOperationCallback.INSTANCE, + TestOperationCallback.INSTANCE); // generate keys int numKeys = 50; @@ -302,15 +302,15 @@ throws HyracksDataException { // create tuplereferences for search keys - ITupleReference lowKey = TupleUtils.createIntegerTuple(lk); - ITupleReference highKey = TupleUtils.createIntegerTuple(hk); + ITupleReference lowKey = TupleUtils.createIntegerTuple(false, lk); + ITupleReference highKey = TupleUtils.createIntegerTuple(false, hk); IBinaryComparator[] searchCmps = new IBinaryComparator[1]; searchCmps[0] = PointableBinaryComparatorFactory.of(IntegerPointable.FACTORY).createBinaryComparator(); MultiComparator searchCmp = new MultiComparator(searchCmps); - RangePredicate rangePred = - new RangePredicate(lowKey, highKey, lowKeyInclusive, highKeyInclusive, searchCmp, searchCmp); + RangePredicate rangePred = new RangePredicate(lowKey, highKey, lowKeyInclusive, highKeyInclusive, searchCmp, + searchCmp); return rangePred; } @@ -356,8 +356,8 @@ ITreeIndexCursor rangeCursor = new BTreeRangeSearchCursor(leafFrame, false); RangePredicate rangePred = createRangePredicate(lowKey, highKey, lowKeyInclusive, highKeyInclusive); - ITreeIndexAccessor indexAccessor = - btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE); + ITreeIndexAccessor indexAccessor = btree.createAccessor(TestOperationCallback.INSTANCE, + TestOperationCallback.INSTANCE); indexAccessor.search(rangeCursor, rangePred); try { diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSortedInsertTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSortedInsertTest.java index e0684ff..164f699 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSortedInsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSortedInsertTest.java @@ -59,7 +59,7 @@ @SuppressWarnings("rawtypes") @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return BTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), harness.getFileReference(), fieldSerdes, numKeys, leafType, harness.getPageManagerFactory() .createPageManager(harness.getBufferCache())); diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateTest.java index b8f1691..a8567e4 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateTest.java @@ -50,7 +50,7 @@ @SuppressWarnings("rawtypes") @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return BTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), harness.getFileReference(), fieldSerdes, numKeys, leafType, harness.getPageManagerFactory() .createPageManager(harness.getBufferCache())); diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpsertTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpsertTest.java index 2a14be7..2d10a25 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpsertTest.java @@ -59,7 +59,7 @@ @SuppressWarnings("rawtypes") @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return BTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), harness.getFileReference(), fieldSerdes, numKeys, leafType, harness.getPageManagerFactory() .createPageManager(harness.getBufferCache())); diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestContext.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestContext.java index 440261a..2abd547 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestContext.java @@ -37,7 +37,7 @@ public class BTreeTestContext extends OrderedIndexTestContext { public BTreeTestContext(ISerializerDeserializer[] fieldSerdes, ITreeIndex treeIndex) throws HyracksDataException { - super(fieldSerdes, treeIndex); + super(fieldSerdes, treeIndex, false); } @Override diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml index 77eac3a..63f5594 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml @@ -98,5 +98,10 @@ <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.5</version> + </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeBulkLoadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeBulkLoadTest.java index ed893ca..f96dd90 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeBulkLoadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeBulkLoadTest.java @@ -52,12 +52,12 @@ @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness .getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, numKeys, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory()); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), false); } @Override diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeDeleteTest.java index e4605e1..0d2159b 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeDeleteTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeDeleteTest.java @@ -52,12 +52,12 @@ @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness .getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, numKeys, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory()); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), false); } @Override diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTest.java new file mode 100644 index 0000000..96f29e4 --- /dev/null +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTest.java @@ -0,0 +1,66 @@ +/* + * 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; + +import java.util.Random; + +import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.storage.am.btree.OrderedIndexTestContext; +import org.apache.hyracks.storage.am.btree.frames.BTreeLeafFrameType; +import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeTestContext; +import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeTestHarness; +import org.junit.After; +import org.junit.Before; + +@SuppressWarnings("rawtypes") +public class LSMBTreeFilterMergeTest extends LSMBTreeFilterMergeTestDriver { + + public LSMBTreeFilterMergeTest() { + super(LSMBTreeTestHarness.LEAF_FRAMES_TO_TEST); + } + + private final LSMBTreeTestHarness harness = new LSMBTreeTestHarness(); + + @Before + public void setUp() throws HyracksDataException { + harness.setUp(); + } + + @After + public void tearDown() throws HyracksDataException { + harness.tearDown(); + } + + @Override + protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, + BTreeLeafFrameType leafType, boolean filtered) throws Exception { + return LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness + .getFileReference(), + harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, numKeys, + harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), filtered); + } + + @Override + protected Random getRandom() { + return harness.getRandom(); + } +} diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTestDriver.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTestDriver.java new file mode 100644 index 0000000..96a9589 --- /dev/null +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTestDriver.java @@ -0,0 +1,172 @@ +/* + * 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; + +import junit.framework.Assert; +import org.apache.commons.lang3.tuple.MutablePair; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.hyracks.api.dataflow.value.IBinaryComparator; +import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder; +import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference; +import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference; +import org.apache.hyracks.dataflow.common.data.marshalling.IntegerSerializerDeserializer; +import org.apache.hyracks.dataflow.common.data.marshalling.UTF8StringSerializerDeserializer; +import org.apache.hyracks.storage.am.btree.OrderedIndexTestContext; +import org.apache.hyracks.storage.am.btree.OrderedIndexTestDriver; +import org.apache.hyracks.storage.am.btree.OrderedIndexTestUtils; +import org.apache.hyracks.storage.am.btree.frames.BTreeLeafFrameType; +import org.apache.hyracks.storage.am.common.TreeIndexTestUtils; +import org.apache.hyracks.storage.am.config.AccessMethodTestsConfig; +import org.apache.hyracks.storage.am.lsm.btree.impls.LSMBTree; +import org.apache.hyracks.storage.am.lsm.common.api.*; +import org.apache.hyracks.storage.am.lsm.common.impls.BlockingIOOperationCallbackWrapper; +import org.apache.hyracks.storage.am.lsm.common.impls.NoOpIOOperationCallback; +import org.apache.hyracks.storage.am.lsm.common.impls.StubIOOperationCallback; + +import java.util.List; + +/** + * This test is the LSMBTreeMergeTest but using a filter, and at each step of the filter's lifecycle its value is + * checked against computed min/maxes from the check tuples. + */ + +@SuppressWarnings("rawtypes") +public abstract class LSMBTreeFilterMergeTestDriver extends OrderedIndexTestDriver { + + private final OrderedIndexTestUtils orderedIndexTestUtils; + + public LSMBTreeFilterMergeTestDriver(BTreeLeafFrameType[] leafFrameTypesToTest) { + super(leafFrameTypesToTest); + this.orderedIndexTestUtils = new OrderedIndexTestUtils(); + } + + private Pair<ITupleReference, ITupleReference> filterToMinMax(ILSMComponentFilter f) throws HyracksDataException { + ArrayTupleBuilder builder = new ArrayTupleBuilder(1); + builder.addField(f.getMinTuple().getFieldData(0), f.getMinTuple().getFieldStart(0), + f.getMinTuple().getFieldLength(0)); + ArrayTupleReference minCopy = new ArrayTupleReference(); + minCopy.reset(builder.getFieldEndOffsets(), builder.getByteArray()); + builder = new ArrayTupleBuilder(1); + builder.addField(f.getMaxTuple().getFieldData(0), f.getMaxTuple().getFieldStart(0), + f.getMaxTuple().getFieldLength(0)); + ArrayTupleReference maxCopy = new ArrayTupleReference(); + maxCopy.reset(builder.getFieldEndOffsets(), builder.getByteArray()); + builder.reset(); + return Pair.of(minCopy, maxCopy); + } + + @Override + protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, + ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, + ITupleReference prefixHighKey) throws Exception { + OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, true); + ctx.getIndex().create(); + ctx.getIndex().activate(); + // Start off with one tree bulk loaded. + // We assume all fieldSerdes are of the same type. Check the first one + // to determine which field types to generate. + if (fieldSerdes[0] instanceof IntegerSerializerDeserializer) { + orderedIndexTestUtils.bulkLoadIntTuples(ctx, numTuplesToInsert, true, getRandom()); + } else if (fieldSerdes[0] instanceof UTF8StringSerializerDeserializer) { + orderedIndexTestUtils.bulkLoadStringTuples(ctx, numTuplesToInsert, true, getRandom()); + } + + int maxTreesToMerge = AccessMethodTestsConfig.LSM_BTREE_MAX_TREES_TO_MERGE; + ILSMIndexAccessor accessor = (ILSMIndexAccessor) ctx.getIndexAccessor(); + IBinaryComparator comp = ctx.getComparatorFactories()[0].createBinaryComparator(); + for (int i = 0; i < maxTreesToMerge; i++) { + int flushed = 0; + for (; flushed < i; flushed++) { + Pair<ITupleReference, ITupleReference> minMax = null; + if (fieldSerdes[0] instanceof IntegerSerializerDeserializer) { + minMax = orderedIndexTestUtils.insertIntTuples(ctx, numTuplesToInsert, true, getRandom()); + } else { + minMax = orderedIndexTestUtils.insertStringTuples(ctx, numTuplesToInsert, true, getRandom()); + } + if (minMax != null) { + ILSMComponentFilter f = ((LSMBTree) ctx.getIndex()).getCurrentMemoryComponent() + .getLSMComponentFilter(); + Pair<ITupleReference, ITupleReference> obsMinMax = filterToMinMax(f); + Assert.assertEquals(0, + TreeIndexTestUtils.compareFilterTuples(obsMinMax.getLeft(), minMax.getLeft(), comp)); + Assert.assertEquals(0, + TreeIndexTestUtils.compareFilterTuples(obsMinMax.getRight(), minMax.getRight(), comp)); + } + + StubIOOperationCallback stub = new StubIOOperationCallback(); + BlockingIOOperationCallbackWrapper waiter = new BlockingIOOperationCallbackWrapper(stub); + accessor.scheduleFlush(waiter); + waiter.waitForIO(); + if (minMax != null) { + Pair<ITupleReference, ITupleReference> obsMinMax = filterToMinMax( + stub.getLastNewComponent().getLSMComponentFilter()); + Assert.assertEquals(0, + TreeIndexTestUtils.compareFilterTuples(obsMinMax.getLeft(), minMax.getLeft(), comp)); + Assert.assertEquals(0, + TreeIndexTestUtils.compareFilterTuples(obsMinMax.getRight(), minMax.getRight(), comp)); + } + } + + List<ILSMDiskComponent> flushedComponents = ((LSMBTree) ctx.getIndex()).getImmutableComponents(); + MutablePair<ITupleReference, ITupleReference> expectedMergeMinMax = null; + for (ILSMDiskComponent f : flushedComponents) { + Pair<ITupleReference, ITupleReference> componentMinMax = filterToMinMax(f.getLSMComponentFilter()); + if (expectedMergeMinMax == null) { + expectedMergeMinMax = MutablePair.of(componentMinMax.getLeft(), componentMinMax.getRight()); + } + if (TreeIndexTestUtils.compareFilterTuples(expectedMergeMinMax.getLeft(), componentMinMax.getLeft(), + comp) > 0) { + expectedMergeMinMax.setLeft(componentMinMax.getLeft()); + } + if (TreeIndexTestUtils.compareFilterTuples(expectedMergeMinMax.getRight(), componentMinMax.getRight(), + comp) < 0) { + expectedMergeMinMax.setRight(componentMinMax.getRight()); + } + } + accessor.scheduleMerge(NoOpIOOperationCallback.INSTANCE, + ((LSMBTree) ctx.getIndex()).getImmutableComponents()); + + flushedComponents = ((LSMBTree) ctx.getIndex()).getImmutableComponents(); + Pair<ITupleReference, ITupleReference> mergedMinMax = filterToMinMax( + flushedComponents.get(0).getLSMComponentFilter()); + Assert.assertEquals(0, TreeIndexTestUtils.compareFilterTuples(expectedMergeMinMax.getLeft(), + mergedMinMax.getLeft(), comp)); + Assert.assertEquals(0, TreeIndexTestUtils.compareFilterTuples(expectedMergeMinMax.getRight(), + mergedMinMax.getRight(), comp)); + + orderedIndexTestUtils.checkPointSearches(ctx); + orderedIndexTestUtils.checkScan(ctx); + orderedIndexTestUtils.checkDiskOrderScan(ctx); + orderedIndexTestUtils.checkRangeSearch(ctx, lowKey, highKey, true, true); + if (prefixLowKey != null && prefixHighKey != null) { + orderedIndexTestUtils.checkRangeSearch(ctx, prefixLowKey, prefixHighKey, true, true); + } + } + ctx.getIndex().deactivate(); + ctx.getIndex().destroy(); + } + + @Override + protected String getTestOpName() { + return "LSM Merge"; + } +} diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeInsertTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeInsertTest.java index 0b42910..fe1082f 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeInsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeInsertTest.java @@ -52,12 +52,12 @@ @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness .getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, numKeys, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness .getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), harness - .getMetadataPageManagerFactory()); + .getMetadataPageManagerFactory(), false); } @Override diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.java index 96bd462..adeb67d 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.java @@ -60,7 +60,7 @@ .getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, fieldSerdes.length, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory()); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), false); index = testCtx.getIndex(); } diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTest.java index 40e23be..76ff003 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTest.java @@ -51,12 +51,12 @@ @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness .getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, numKeys, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory()); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), filtered); } @Override diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTestDriver.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTestDriver.java index d41d5d8..685215a 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTestDriver.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTestDriver.java @@ -46,7 +46,7 @@ protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) throws Exception { - OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType); + OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); // Start off with one tree bulk loaded. diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMultiBulkLoadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMultiBulkLoadTest.java index 9b6c4ae..ea16368 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMultiBulkLoadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMultiBulkLoadTest.java @@ -53,12 +53,12 @@ @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness .getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, numKeys, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory()); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), false); } @Override diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateTest.java index cf20ddb..fdd1ec3 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateTest.java @@ -52,12 +52,12 @@ @Override protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, - BTreeLeafFrameType leafType) throws Exception { + BTreeLeafFrameType leafType, boolean filtered) throws Exception { return LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness .getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, numKeys, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness .getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), harness - .getMetadataPageManagerFactory()); + .getMetadataPageManagerFactory(), false); } @Override diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestContext.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestContext.java index d474c02..d8d6e5c 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestContext.java @@ -46,8 +46,8 @@ @SuppressWarnings("rawtypes") public final class LSMBTreeTestContext extends OrderedIndexTestContext { - public LSMBTreeTestContext(ISerializerDeserializer[] fieldSerdes, ITreeIndex treeIndex) throws HyracksDataException { - super(fieldSerdes, treeIndex); + public LSMBTreeTestContext(ISerializerDeserializer[] fieldSerdes, ITreeIndex treeIndex, boolean filtered) throws HyracksDataException { + super(fieldSerdes, treeIndex, filtered); } @Override @@ -71,11 +71,11 @@ } public static LSMBTreeTestContext create(IIOManager ioManager, List<IVirtualBufferCache> virtualBufferCaches, - FileReference file, IBufferCache diskBufferCache, IFileMapProvider diskFileMapProvider, - ISerializerDeserializer[] fieldSerdes, - int numKeyFields, double bloomFilterFalsePositiveRate, ILSMMergePolicy mergePolicy, - ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallback ioOpCallback, - IMetadataPageManagerFactory metadataPageManagerFactory) + FileReference file, IBufferCache diskBufferCache, IFileMapProvider diskFileMapProvider, + ISerializerDeserializer[] fieldSerdes, + int numKeyFields, double bloomFilterFalsePositiveRate, ILSMMergePolicy mergePolicy, + ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallback ioOpCallback, + IMetadataPageManagerFactory metadataPageManagerFactory, boolean filtered) throws Exception { ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes); IBinaryComparatorFactory[] cmpFactories = SerdeUtils.serdesToComparatorFactories(fieldSerdes, numKeyFields); @@ -83,11 +83,28 @@ for (int i = 0; i < numKeyFields; ++i) { bloomFilterKeyFields[i] = i; } - LSMBTree lsmTree = LSMBTreeUtil.createLSMTree(ioManager, virtualBufferCaches, file, diskBufferCache, - diskFileMapProvider, typeTraits, cmpFactories, bloomFilterKeyFields, bloomFilterFalsePositiveRate, - mergePolicy, opTracker, ioScheduler, ioOpCallback, true, null, null, null, null, true, - metadataPageManagerFactory); - LSMBTreeTestContext testCtx = new LSMBTreeTestContext(fieldSerdes, lsmTree); + LSMBTree lsmTree; + if(filtered) { + ITypeTraits[] filterTypeTraits = new ITypeTraits[1]; + filterTypeTraits[0] = typeTraits[0]; + int[] btreefields = new int[typeTraits.length]; + for (int i = 0; i < btreefields.length; i++) { + btreefields[i] = i; + } + int[] filterfields = {btreefields.length}; + IBinaryComparatorFactory[] filterCmp = {cmpFactories[0]}; + lsmTree = LSMBTreeUtil.createLSMTree(ioManager, virtualBufferCaches, file, diskBufferCache, + diskFileMapProvider, typeTraits, cmpFactories, bloomFilterKeyFields, bloomFilterFalsePositiveRate, + mergePolicy, opTracker, ioScheduler, ioOpCallback, true, filterTypeTraits, filterCmp, btreefields, filterfields, true, + metadataPageManagerFactory); + } + else{ + lsmTree = LSMBTreeUtil.createLSMTree(ioManager, virtualBufferCaches, file, diskBufferCache, + diskFileMapProvider, typeTraits, cmpFactories, bloomFilterKeyFields, bloomFilterFalsePositiveRate, + mergePolicy, opTracker, ioScheduler, ioOpCallback, true, null,null,null,null, true, + metadataPageManagerFactory); + } + LSMBTreeTestContext testCtx = new LSMBTreeTestContext(fieldSerdes, lsmTree, filtered); return testCtx; } } diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/LSMComponentFilterReferenceTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/LSMComponentFilterReferenceTest.java index fcc0a48..0257bad 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/LSMComponentFilterReferenceTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/LSMComponentFilterReferenceTest.java @@ -39,11 +39,11 @@ new TypeAwareTupleWriter(new ITypeTraits[] { IntegerPointable.TYPE_TRAITS })); Assert.assertEquals(filter.getLength(), 0); Assert.assertFalse(filter.isMaxTupleSet() || filter.isMinTupleSet()); - filter.writeMaxTuple(TupleUtils.createIntegerTuple(Integer.MAX_VALUE)); + filter.writeMaxTuple(TupleUtils.createIntegerTuple(false, Integer.MAX_VALUE)); Assert.assertFalse(filter.isMinTupleSet()); Assert.assertTrue(filter.isMaxTupleSet()); Assert.assertTrue(filter.getLength() == 11); - filter.writeMinTuple(TupleUtils.createIntegerTuple(Integer.MIN_VALUE)); + filter.writeMinTuple(TupleUtils.createIntegerTuple(false, Integer.MIN_VALUE)); Assert.assertTrue(filter.isMinTupleSet() && filter.isMaxTupleSet()); Assert.assertTrue(filter.getLength() == 20); byte[] serFilter = filter.getByteArray(); 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/LSMInvertedIndexTestContext.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestContext.java index 6e17fff..8181309 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestContext.java @@ -67,7 +67,7 @@ public LSMInvertedIndexTestContext(ISerializerDeserializer[] fieldSerdes, IIndex index, IBinaryTokenizerFactory tokenizerFactory, InvertedIndexType invIndexType, InvertedIndexTokenizingTupleIterator indexTupleIter) throws HyracksDataException { - super(fieldSerdes, index); + super(fieldSerdes, index, false); invIndex = (IInvertedIndex) index; this.tokenizerFactory = tokenizerFactory; this.invIndexType = invIndexType; -- To view, visit https://asterix-gerrit.ics.uci.edu/1704 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0e79c0a25d5d6be727b9ebad841801024c00e94 Gerrit-PatchSet: 11 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Jianfeng Jia <[email protected]> Gerrit-Reviewer: Taewoo Kim <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
