Repository: asterixdb Updated Branches: refs/heads/master 69ab91aae -> 90cdbac7f
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/90cdbac7/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java ---------------------------------------------------------------------- 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 6dfeffd..b880a01 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 @@ -65,7 +65,7 @@ public class BTreeSearchCursorTest extends AbstractBTreeTest { private final int fieldCount = 2; private final ITypeTraits[] typeTraits = new ITypeTraits[fieldCount]; private final TypeAwareTupleWriterFactory tupleWriterFactory = new TypeAwareTupleWriterFactory(typeTraits); - private final ITreeIndexMetaDataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); + private final ITreeIndexMetadataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); private final Random rnd = new Random(50); @Before http://git-wip-us.apache.org/repos/asf/asterixdb/blob/90cdbac7/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchOperationCallbackTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchOperationCallbackTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchOperationCallbackTest.java index 2c82fab..797ee49 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchOperationCallbackTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchOperationCallbackTest.java @@ -22,7 +22,7 @@ import org.apache.hyracks.dataflow.common.util.SerdeUtils; import org.apache.hyracks.storage.am.btree.frames.BTreeLeafFrameType; import org.apache.hyracks.storage.am.btree.util.BTreeTestHarness; import org.apache.hyracks.storage.am.btree.util.BTreeUtils; -import org.apache.hyracks.storage.am.common.api.ITreeIndexMetaDataFrameFactory; +import org.apache.hyracks.storage.am.common.api.ITreeIndexMetadataFrameFactory; import org.apache.hyracks.storage.am.common.frames.LIFOMetaDataFrameFactory; import org.apache.hyracks.storage.am.common.freepage.LinkedMetaDataPageManager; @@ -35,7 +35,7 @@ public class BTreeSearchOperationCallbackTest extends AbstractSearchOperationCal @Override protected void createIndexInstance() throws Exception { - ITreeIndexMetaDataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); + ITreeIndexMetadataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); LinkedMetaDataPageManager freePageManager = new LinkedMetaDataPageManager(harness.getBufferCache(), metaFrameFactory); index = BTreeUtils.createBTree(harness.getBufferCache(), harness.getFileMapProvider(), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/90cdbac7/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeStatsTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeStatsTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeStatsTest.java index 489c2c7..e4c1449 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeStatsTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeStatsTest.java @@ -89,11 +89,11 @@ public class BTreeStatsTest extends AbstractBTreeTest { TypeAwareTupleWriterFactory tupleWriterFactory = new TypeAwareTupleWriterFactory(typeTraits); ITreeIndexFrameFactory leafFrameFactory = new BTreeNSMLeafFrameFactory(tupleWriterFactory); ITreeIndexFrameFactory interiorFrameFactory = new BTreeNSMInteriorFrameFactory(tupleWriterFactory); - ITreeIndexMetaDataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); + ITreeIndexMetadataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); IBTreeLeafFrame leafFrame = (IBTreeLeafFrame) leafFrameFactory.createFrame(); IBTreeInteriorFrame interiorFrame = (IBTreeInteriorFrame) interiorFrameFactory.createFrame(); - ITreeIndexMetaDataFrame metaFrame = metaFrameFactory.createFrame(); + ITreeIndexMetadataFrame metaFrame = metaFrameFactory.createFrame(); IMetadataPageManager freePageManager = new LinkedMetaDataPageManager(bufferCache, metaFrameFactory); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/90cdbac7/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java index 8f373c1..493a7ab 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java @@ -73,7 +73,7 @@ public class BTreeUpdateSearchTest extends AbstractBTreeTest { TypeAwareTupleWriterFactory tupleWriterFactory = new TypeAwareTupleWriterFactory(typeTraits); ITreeIndexFrameFactory leafFrameFactory = new BTreeNSMLeafFrameFactory(tupleWriterFactory); ITreeIndexFrameFactory interiorFrameFactory = new BTreeNSMInteriorFrameFactory(tupleWriterFactory); - ITreeIndexMetaDataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); + ITreeIndexMetadataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); IBTreeLeafFrame leafFrame = (IBTreeLeafFrame) leafFrameFactory.createFrame(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/90cdbac7/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreeRunner.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreeRunner.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreeRunner.java index 005b09a..5b84652 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreeRunner.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreeRunner.java @@ -26,7 +26,7 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.storage.am.btree.exceptions.BTreeException; import org.apache.hyracks.storage.am.btree.frames.BTreeLeafFrameType; import org.apache.hyracks.storage.am.btree.util.BTreeUtils; -import org.apache.hyracks.storage.am.common.api.ITreeIndexMetaDataFrameFactory; +import org.apache.hyracks.storage.am.common.api.ITreeIndexMetadataFrameFactory; import org.apache.hyracks.storage.am.common.frames.LIFOMetaDataFrameFactory; import org.apache.hyracks.storage.am.common.freepage.LinkedMetaDataPageManager; import org.apache.hyracks.storage.common.file.IFileMapProvider; @@ -49,7 +49,7 @@ public class BTreeRunner extends InMemoryBTreeRunner { TestStorageManagerComponentHolder.init(pageSize, numPages, MAX_OPEN_FILES); bufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx); IFileMapProvider fmp = TestStorageManagerComponentHolder.getFileMapProvider(ctx); - ITreeIndexMetaDataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); + ITreeIndexMetadataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); LinkedMetaDataPageManager freePageManager = new LinkedMetaDataPageManager(bufferCache, metaFrameFactory); btree = BTreeUtils.createBTree(bufferCache, fmp, typeTraits, cmpFactories, BTreeLeafFrameType.REGULAR_NSM, file, freePageManager); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/90cdbac7/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/ConcurrentSkipListRunner.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/ConcurrentSkipListRunner.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/ConcurrentSkipListRunner.java index 8748f44..8f1d02a 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/ConcurrentSkipListRunner.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/ConcurrentSkipListRunner.java @@ -135,7 +135,7 @@ public class ConcurrentSkipListRunner implements IExperimentRunner { for (int j = 0; j < batch.size(); j++) { // Copy the tuple to the buffer and set the pre-created tuple ref. tupleWriter.writeTuple(batch.get(j), tupleBuf.array(), tupleIndex * tupleSize); - tuples[tupleIndex].resetByTupleOffset(tupleBuf, tupleIndex * tupleSize); + tuples[tupleIndex].resetByTupleOffset(tupleBuf.array(), tupleIndex * tupleSize); skipList.add(tuples[tupleIndex]); tupleIndex++; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/90cdbac7/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java index ac8e836..1e960e0 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java @@ -95,7 +95,7 @@ public class InMemorySortRunner implements IExperimentRunner { for (int j = 0; j < batch.size(); j++) { // Copy the tuple to the buffer and set the pre-created tuple ref. tupleWriter.writeTuple(batch.get(j), tupleBuf.array(), tupleIndex * tupleSize); - tuples.get(tupleIndex).resetByTupleOffset(tupleBuf, tupleIndex * tupleSize); + tuples.get(tupleIndex).resetByTupleOffset(tupleBuf.array(), tupleIndex * tupleSize); tupleIndex++; } } @@ -150,7 +150,7 @@ public class InMemorySortRunner implements IExperimentRunner { for (int j = 0; j < batch.size(); j++) { // Copy the tuple to the buffer and set the pre-created tuple ref. tupleWriter.writeTuple(batch.get(j), tupleBuf.array(), tupleIndex * tupleSize); - tuples[tupleIndex].resetByTupleOffset(tupleBuf, tupleIndex * tupleSize); + tuples[tupleIndex].resetByTupleOffset(tupleBuf.array(), tupleIndex * tupleSize); skipList.add(tuples[tupleIndex]); tupleIndex++; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/90cdbac7/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java index 91467de..4743dee 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java @@ -103,22 +103,22 @@ public class LSMBTreeTuplesTest { for (int r = 0; r < 4; r++) { // Check matter tuple with lsmBTreeTuple. - lsmBTreeTuple.resetByTupleOffset(matterBuf, 0); + lsmBTreeTuple.resetByTupleOffset(matterBuf.array(), 0); checkTuple(lsmBTreeTuple, numFields, false, fieldSerdes, fields); // Create a copy using copyTupleWriter, and verify again. ByteBuffer copyMatterBuf = writeTuple(lsmBTreeTuple, copyTupleWriter); - lsmBTreeTuple.resetByTupleOffset(copyMatterBuf, 0); + lsmBTreeTuple.resetByTupleOffset(copyMatterBuf.array(), 0); checkTuple(lsmBTreeTuple, numFields, false, fieldSerdes, fields); // Check antimatter tuple with lsmBTreeTuple. - lsmBTreeTuple.resetByTupleOffset(antimatterBuf, 0); + lsmBTreeTuple.resetByTupleOffset(antimatterBuf.array(), 0); // Should only contain keys. checkTuple(lsmBTreeTuple, numKeyFields, true, fieldSerdes, fields); // Create a copy using copyTupleWriter, and verify again. ByteBuffer copyAntimatterBuf = writeTuple(lsmBTreeTuple, copyTupleWriter); - lsmBTreeTuple.resetByTupleOffset(copyAntimatterBuf, 0); + lsmBTreeTuple.resetByTupleOffset(copyAntimatterBuf.array(), 0); // Should only contain keys. checkTuple(lsmBTreeTuple, numKeyFields, true, fieldSerdes, fields); @@ -126,17 +126,17 @@ public class LSMBTreeTuplesTest { // We should be able to manually set a prefix of the fields // (the passed type traits in the tuple factory's constructor). maxLsmBTreeTuple.setFieldCount(numFields); - maxLsmBTreeTuple.resetByTupleOffset(matterBuf, 0); + maxLsmBTreeTuple.resetByTupleOffset(matterBuf.array(), 0); checkTuple(maxLsmBTreeTuple, numFields, false, fieldSerdes, fields); // Check antimatter tuple with maxLsmBTreeTuple. - maxLsmBTreeTuple.resetByTupleOffset(antimatterBuf, 0); + maxLsmBTreeTuple.resetByTupleOffset(antimatterBuf.array(), 0); // Should only contain keys. checkTuple(maxLsmBTreeTuple, numKeyFields, true, fieldSerdes, fields); // Resetting maxLsmBTreeTuple should set its field count to // maxFieldSerdes.length, based on the its type traits. - maxLsmBTreeTuple.resetByTupleOffset(maxMatterBuf, 0); + maxLsmBTreeTuple.resetByTupleOffset(maxMatterBuf.array(), 0); checkTuple(maxLsmBTreeTuple, maxFieldSerdes.length, false, maxFieldSerdes, maxFields); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/90cdbac7/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeSearchCursorTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeSearchCursorTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeSearchCursorTest.java index 96366b5..6064c1b 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeSearchCursorTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeSearchCursorTest.java @@ -38,7 +38,7 @@ import org.apache.hyracks.storage.am.common.api.IPrimitiveValueProviderFactory; import org.apache.hyracks.storage.am.common.api.ITreeIndexAccessor; import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor; import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory; -import org.apache.hyracks.storage.am.common.api.ITreeIndexMetaDataFrameFactory; +import org.apache.hyracks.storage.am.common.api.ITreeIndexMetadataFrameFactory; import org.apache.hyracks.storage.am.common.api.TreeIndexException; import org.apache.hyracks.storage.am.common.frames.LIFOMetaDataFrameFactory; import org.apache.hyracks.storage.am.common.freepage.LinkedMetaDataPageManager; @@ -110,7 +110,7 @@ public class RTreeSearchCursorTest extends AbstractRTreeTest { .createPrimitiveValueProviderFactories(cmpFactories.length, IntegerPointable.FACTORY); RTreeTypeAwareTupleWriterFactory tupleWriterFactory = new RTreeTypeAwareTupleWriterFactory(typeTraits); - ITreeIndexMetaDataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); + ITreeIndexMetadataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); ITreeIndexFrameFactory interiorFrameFactory = new RTreeNSMInteriorFrameFactory(tupleWriterFactory, valueProviderFactories, RTreePolicyType.RTREE, false);
