http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestHarness.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestHarness.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestHarness.java index 230e247..f40d536 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestHarness.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/util/BTreeTestHarness.java @@ -32,6 +32,7 @@ import org.apache.hyracks.storage.am.common.api.IPageManagerFactory; import org.apache.hyracks.storage.am.common.freepage.LinkedMetadataPageManagerFactory; import org.apache.hyracks.storage.am.config.AccessMethodTestsConfig; import org.apache.hyracks.storage.common.buffercache.IBufferCache; +import org.apache.hyracks.storage.common.file.IFileMapProvider; import org.apache.hyracks.test.support.TestStorageManagerComponentHolder; import org.apache.hyracks.test.support.TestUtils; @@ -48,6 +49,7 @@ public class BTreeTestHarness { protected IHyracksTaskContext ctx; protected IBufferCache bufferCache; + protected IFileMapProvider fileMapProvider; protected FileReference file; protected IMetadataPageManagerFactory pageManagerFactory; @@ -74,6 +76,7 @@ public class BTreeTestHarness { ctx = TestUtils.create(getHyracksFrameSize()); TestStorageManagerComponentHolder.init(pageSize, numPages, maxOpenFiles); bufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx.getJobletContext().getServiceContext()); + fileMapProvider = TestStorageManagerComponentHolder.getFileMapProvider(); file = ctx.getIoManager().getFileReference(0, simpleDateFormat.format(new Date())); pageManagerFactory = new LinkedMetadataPageManagerFactory(); rnd.setSeed(RANDOM_SEED); @@ -92,6 +95,10 @@ public class BTreeTestHarness { return bufferCache; } + public IFileMapProvider getFileMapProvider() { + return fileMapProvider; + } + public FileReference getFileReference() { return file; }
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeBulkLoadTest.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/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 52279b8..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 @@ public class LSMBTreeBulkLoadTest extends OrderedIndexBulkLoadTest { @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(), fieldSerdes, 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(), - false); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), false); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeDeleteTest.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/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 2be956d..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 @@ public class LSMBTreeDeleteTest extends OrderedIndexDeleteTest { @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(), fieldSerdes, 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(), - false); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), false); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeExamplesTest.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/LSMBTreeExamplesTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeExamplesTest.java index 4b82349..f246047 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeExamplesTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeExamplesTest.java @@ -49,8 +49,8 @@ public class LSMBTreeExamplesTest extends OrderedIndexExamplesTest { int[] bloomFilterKeyFields, ITypeTraits[] filterTypeTraits, IBinaryComparatorFactory[] filterCmpFactories, int[] btreeFields, int[] filterFields) throws HyracksDataException { return LSMBTreeUtil.createLSMTree(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), typeTraits, cmpFactories, - bloomFilterKeyFields, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), + harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), typeTraits, + cmpFactories, bloomFilterKeyFields, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), true, filterTypeTraits, filterCmpFactories, btreeFields, filterFields, true, harness.getMetadataPageManagerFactory()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFileManagerTest.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/LSMBTreeFileManagerTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFileManagerTest.java index 282623c..c8aaaab3 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFileManagerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFileManagerTest.java @@ -18,8 +18,6 @@ */ package org.apache.hyracks.storage.am.lsm.btree; -import java.io.File; - import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder; @@ -36,6 +34,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.File; + public class LSMBTreeFileManagerTest { private final LSMBTreeTestHarness harness = new LSMBTreeTestHarness(); @@ -53,11 +53,12 @@ public class LSMBTreeFileManagerTest { @Test public void deleteOrphanedFilesTest() throws Exception { ISerializerDeserializer[] fieldSerdes = { IntegerSerializerDeserializer.INSTANCE }; - LSMBTreeTestContext ctx = LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, 1, - harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), - false); + LSMBTreeTestContext ctx = + LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness + .getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), + fieldSerdes, 1, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness + .getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), + harness.getMetadataPageManagerFactory(), false); ctx.getIndex().create(); ctx.getIndex().activate(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTest.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/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 index 29259c0..96f29e4 100644 --- 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 @@ -51,12 +51,12 @@ public class LSMBTreeFilterMergeTest extends LSMBTreeFilterMergeTestDriver { @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(), fieldSerdes, 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); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), filtered); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeInsertTest.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/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 28eedd0..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 @@ public class LSMBTreeInsertTest extends OrderedIndexInsertTest { @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(), fieldSerdes, numKeys, - harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), - false); + 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(), false); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeLifecycleTest.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/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 98c5fb0..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 @@ -32,8 +32,7 @@ import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeTestHarness; public class LSMBTreeLifecycleTest extends AbstractIndexLifecycleTest { @SuppressWarnings("rawtypes") - private final ISerializerDeserializer[] fieldSerdes = - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }; + private final ISerializerDeserializer[] fieldSerdes = new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }; private final LSMBTreeTestHarness harness = new LSMBTreeTestHarness(); private final TreeIndexTestUtils titu = new OrderedIndexTestUtils(); @@ -57,16 +56,22 @@ public class LSMBTreeLifecycleTest extends AbstractIndexLifecycleTest { @Override public void setup() throws Exception { harness.setUp(); - testCtx = LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, fieldSerdes.length, + testCtx = LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness + .getFileReference(), + harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, fieldSerdes.length, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), - false); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), false); index = testCtx.getIndex(); } @Override public void tearDown() throws Exception { + try { + index.deactivate(); + } catch (Exception e) { + } finally { + index.destroy(); + } harness.tearDown(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMergeTest.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/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 f24db13..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 @@ public class LSMBTreeMergeTest extends LSMBTreeMergeTestDriver { @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(), fieldSerdes, 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); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), filtered); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.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/LSMBTreeModificationOperationCallbackTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java index 3f6e74a..27b012e 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java @@ -47,7 +47,8 @@ public class LSMBTreeModificationOperationCallbackTest extends AbstractModificat @Override protected void createIndexInstance() throws Exception { index = LSMBTreeUtil.createLSMTree(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), SerdeUtils.serdesToTypeTraits(keySerdes), + harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), + SerdeUtils.serdesToTypeTraits(keySerdes), SerdeUtils.serdesToComparatorFactories(keySerdes, keySerdes.length), bloomFilterKeyFields, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), NoOpOperationTrackerFactory.INSTANCE.getOperationTracker(null), harness.getIOScheduler(), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeMultiBulkLoadTest.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/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 0ce9051..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 @@ public class LSMBTreeMultiBulkLoadTest extends OrderedIndexBulkLoadTest { @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(), fieldSerdes, 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(), - false); + harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), false); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeScanDiskComponentsTest.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/LSMBTreeScanDiskComponentsTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeScanDiskComponentsTest.java index cb20b81..3ba53dd 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeScanDiskComponentsTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeScanDiskComponentsTest.java @@ -19,7 +19,7 @@ package org.apache.hyracks.storage.am.lsm.btree; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.io.ByteArrayInputStream; import java.io.DataInput; @@ -78,10 +78,10 @@ public class LSMBTreeScanDiskComponentsTest extends OrderedIndexTestDriver { protected OrderedIndexTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, boolean filtered) throws Exception { return LSMBTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, numKeys, - harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), - false); + harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, + numKeys, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), + harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), + harness.getMetadataPageManagerFactory(), false); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.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/LSMBTreeSearchOperationCallbackTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java index f841d99..0b260b4 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java @@ -52,13 +52,15 @@ public class LSMBTreeSearchOperationCallbackTest extends AbstractSearchOperation @Override protected void createIndexInstance() throws Exception { - index = LSMBTreeUtil.createLSMTree(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), SerdeUtils.serdesToTypeTraits(keySerdes), + index = LSMBTreeUtil.createLSMTree(harness.getIOManager(), harness.getVirtualBufferCaches(), harness + .getFileReference(), + harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), + SerdeUtils.serdesToTypeTraits(keySerdes), SerdeUtils.serdesToComparatorFactories(keySerdes, keySerdes.length), bloomFilterKeyFields, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), NoOpOperationTrackerFactory.INSTANCE.getOperationTracker(null), harness.getIOScheduler(), - harness.getIOOperationCallback(), true, null, null, null, null, true, - harness.getMetadataPageManagerFactory()); + harness.getIOOperationCallback(), true, null, null, null, null, true, harness + .getMetadataPageManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateTest.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/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 7a4af94..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 @@ public class LSMBTreeUpdateTest extends OrderedIndexUpdateTest { @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(), fieldSerdes, numKeys, - harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory(), - false); + 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(), false); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/multithread/LSMBTreeMultiThreadTest.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/multithread/LSMBTreeMultiThreadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/multithread/LSMBTreeMultiThreadTest.java index 531a4fd..9abc321 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/multithread/LSMBTreeMultiThreadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/multithread/LSMBTreeMultiThreadTest.java @@ -53,8 +53,8 @@ public class LSMBTreeMultiThreadTest extends OrderedIndexMultiThreadTest { protected ITreeIndex createIndex(ITypeTraits[] typeTraits, IBinaryComparatorFactory[] cmpFactories, int[] bloomFilterKeyFields) throws HyracksDataException { return LSMBTreeUtil.createLSMTree(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), typeTraits, cmpFactories, - bloomFilterKeyFields, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), + harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), typeTraits, + cmpFactories, bloomFilterKeyFields, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), true, null, null, null, null, true, harness.getMetadataPageManagerFactory()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/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 df6558c..0a36548 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 @@ -28,6 +28,7 @@ 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.frames.LIFOMetaDataFrameFactory; import org.apache.hyracks.storage.am.common.freepage.LinkedMetaDataPageManager; +import org.apache.hyracks.storage.common.file.IFileMapProvider; import org.apache.hyracks.test.support.TestStorageManagerComponentHolder; import org.apache.hyracks.test.support.TestUtils; @@ -46,9 +47,10 @@ public class BTreeRunner extends InMemoryBTreeRunner { IHyracksTaskContext ctx = TestUtils.create(HYRACKS_FRAME_SIZE); TestStorageManagerComponentHolder.init(pageSize, numPages, MAX_OPEN_FILES); bufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx.getJobletContext().getServiceContext()); + IFileMapProvider fmp = TestStorageManagerComponentHolder.getFileMapProvider(); ITreeIndexMetadataFrameFactory metaFrameFactory = new LIFOMetaDataFrameFactory(); LinkedMetaDataPageManager freePageManager = new LinkedMetaDataPageManager(bufferCache, metaFrameFactory); - btree = BTreeUtils.createBTree(bufferCache, typeTraits, cmpFactories, BTreeLeafFrameType.REGULAR_NSM, file, + btree = BTreeUtils.createBTree(bufferCache, fmp, typeTraits, cmpFactories, BTreeLeafFrameType.REGULAR_NSM, file, freePageManager); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemoryBTreeRunner.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/InMemoryBTreeRunner.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemoryBTreeRunner.java index d0b798a..9ae5aae 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemoryBTreeRunner.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemoryBTreeRunner.java @@ -41,6 +41,7 @@ import org.apache.hyracks.storage.am.lsm.common.freepage.VirtualFreePageManager; import org.apache.hyracks.storage.am.lsm.common.impls.VirtualBufferCache; import org.apache.hyracks.storage.common.buffercache.HeapBufferAllocator; import org.apache.hyracks.storage.common.buffercache.IBufferCache; +import org.apache.hyracks.storage.common.file.TransientFileMapManager; import org.apache.hyracks.test.support.TestStorageManagerComponentHolder; public class InMemoryBTreeRunner extends Thread implements IExperimentRunner { @@ -72,8 +73,8 @@ public class InMemoryBTreeRunner extends Thread implements IExperimentRunner { ITreeIndexFrameFactory leafFrameFactory = new BTreeNSMLeafFrameFactory(tupleWriterFactory); ITreeIndexFrameFactory interiorFrameFactory = new BTreeNSMInteriorFrameFactory(tupleWriterFactory); IPageManager freePageManager = new VirtualFreePageManager(bufferCache); - btree = new BTree(bufferCache, freePageManager, interiorFrameFactory, leafFrameFactory, cmpFactories, - typeTraits.length, file); + btree = new BTree(bufferCache, new TransientFileMapManager(), freePageManager, interiorFrameFactory, + leafFrameFactory, cmpFactories, typeTraits.length, file); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/LSMTreeRunner.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/LSMTreeRunner.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/LSMTreeRunner.java index 0c31795..15f2821 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/LSMTreeRunner.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/LSMTreeRunner.java @@ -46,6 +46,7 @@ import org.apache.hyracks.storage.am.lsm.common.impls.VirtualBufferCache; import org.apache.hyracks.storage.common.IIndexAccessor; import org.apache.hyracks.storage.common.buffercache.HeapBufferAllocator; import org.apache.hyracks.storage.common.buffercache.IBufferCache; +import org.apache.hyracks.storage.common.file.IFileMapProvider; import org.apache.hyracks.test.support.TestStorageManagerComponentHolder; import org.apache.hyracks.test.support.TestUtils; @@ -94,6 +95,7 @@ public class LSMTreeRunner implements IExperimentRunner { ioDeviceId = 0; file = ioManager.resolveAbsolutePath(onDiskDir); + IFileMapProvider fmp = TestStorageManagerComponentHolder.getFileMapProvider(); List<IVirtualBufferCache> virtualBufferCaches = new ArrayList<>(); for (int i = 0; i < 2; i++) { @@ -105,7 +107,7 @@ public class LSMTreeRunner implements IExperimentRunner { this.ioScheduler = AsynchronousScheduler.INSTANCE; AsynchronousScheduler.INSTANCE.init(threadFactory); - lsmtree = LSMBTreeUtil.createLSMTree(ioManager, virtualBufferCaches, file, bufferCache, typeTraits, + lsmtree = LSMBTreeUtil.createLSMTree(ioManager, virtualBufferCaches, file, bufferCache, fmp, typeTraits, cmpFactories, bloomFilterKeyFields, bloomFilterFalsePositiveRate, new NoMergePolicy(), new ThreadCountingTracker(), ioScheduler, NoOpIOOperationCallbackFactory.INSTANCE.createIoOpCallback(), true, null, null, null, null, true, TestStorageManagerComponentHolder.getMetadataPageManagerFactory()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestContext.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/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 8667d85..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 @@ -41,12 +41,12 @@ import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy; import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; import org.apache.hyracks.storage.am.lsm.common.api.IVirtualBufferCache; import org.apache.hyracks.storage.common.buffercache.IBufferCache; +import org.apache.hyracks.storage.common.file.IFileMapProvider; @SuppressWarnings("rawtypes") public final class LSMBTreeTestContext extends OrderedIndexTestContext { - public LSMBTreeTestContext(ISerializerDeserializer[] fieldSerdes, ITreeIndex treeIndex, boolean filtered) - throws HyracksDataException { + public LSMBTreeTestContext(ISerializerDeserializer[] fieldSerdes, ITreeIndex treeIndex, boolean filtered) throws HyracksDataException { super(fieldSerdes, treeIndex, filtered); } @@ -71,10 +71,12 @@ public final class LSMBTreeTestContext extends OrderedIndexTestContext { } public static LSMBTreeTestContext create(IIOManager ioManager, List<IVirtualBufferCache> virtualBufferCaches, - FileReference file, IBufferCache diskBufferCache, ISerializerDeserializer[] fieldSerdes, int numKeyFields, - double bloomFilterFalsePositiveRate, ILSMMergePolicy mergePolicy, ILSMOperationTracker opTracker, - ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallback ioOpCallback, - IMetadataPageManagerFactory metadataPageManagerFactory, boolean filtered) throws Exception { + 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); int[] bloomFilterKeyFields = new int[numKeyFields]; @@ -82,23 +84,25 @@ public final class LSMBTreeTestContext extends OrderedIndexTestContext { bloomFilterKeyFields[i] = i; } LSMBTree lsmTree; - if (filtered) { + 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, typeTraits, - cmpFactories, bloomFilterKeyFields, bloomFilterFalsePositiveRate, mergePolicy, opTracker, - ioScheduler, ioOpCallback, true, filterTypeTraits, filterCmp, btreefields, filterfields, true, + 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); - } else { - lsmTree = LSMBTreeUtil.createLSMTree(ioManager, virtualBufferCaches, file, diskBufferCache, typeTraits, - cmpFactories, bloomFilterKeyFields, bloomFilterFalsePositiveRate, mergePolicy, opTracker, - ioScheduler, ioOpCallback, true, null, null, null, null, true, metadataPageManagerFactory); } LSMBTreeTestContext testCtx = new LSMBTreeTestContext(fieldSerdes, lsmTree, filtered); return testCtx; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestHarness.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/util/LSMBTreeTestHarness.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestHarness.java index 95a979f..2b5b4fb 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestHarness.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/util/LSMBTreeTestHarness.java @@ -49,6 +49,7 @@ import org.apache.hyracks.storage.am.lsm.common.impls.ThreadCountingTracker; import org.apache.hyracks.storage.am.lsm.common.impls.VirtualBufferCache; import org.apache.hyracks.storage.common.buffercache.HeapBufferAllocator; import org.apache.hyracks.storage.common.buffercache.IBufferCache; +import org.apache.hyracks.storage.common.file.IFileMapProvider; import org.apache.hyracks.test.support.TestStorageManagerComponentHolder; import org.apache.hyracks.test.support.TestUtils; @@ -72,6 +73,7 @@ public class LSMBTreeTestHarness { protected IOManager ioManager; protected int ioDeviceId; protected IBufferCache diskBufferCache; + protected IFileMapProvider diskFileMapProvider; protected List<IVirtualBufferCache> virtualBufferCaches; protected IHyracksTaskContext ctx; protected ILSMIOOperationScheduler ioScheduler; @@ -111,6 +113,7 @@ public class LSMBTreeTestHarness { TestStorageManagerComponentHolder.init(diskPageSize, diskNumPages, diskMaxOpenFiles); file = ioManager.resolveAbsolutePath(onDiskDir); diskBufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx.getJobletContext().getServiceContext()); + diskFileMapProvider = TestStorageManagerComponentHolder.getFileMapProvider(); virtualBufferCaches = new ArrayList<>(); for (int i = 0; i < numMutableComponents; i++) { IVirtualBufferCache virtualBufferCache = @@ -176,6 +179,10 @@ public class LSMBTreeTestHarness { return diskBufferCache; } + public IFileMapProvider getDiskFileMapProvider() { + return diskFileMapProvider; + } + public List<IVirtualBufferCache> getVirtualBufferCaches() { return virtualBufferCaches; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/component/TestLsmIndexFileManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/component/TestLsmIndexFileManager.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/component/TestLsmIndexFileManager.java index 1c75387..9d8f208 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/component/TestLsmIndexFileManager.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/component/TestLsmIndexFileManager.java @@ -29,11 +29,12 @@ import org.apache.hyracks.api.io.IIOManager; import org.apache.hyracks.storage.am.common.api.ITreeIndex; import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndexFileManager; import org.apache.hyracks.storage.am.lsm.common.impls.TreeIndexFactory; +import org.apache.hyracks.storage.common.file.IFileMapProvider; public class TestLsmIndexFileManager extends AbstractLSMIndexFileManager { - public TestLsmIndexFileManager(IIOManager ioManager, FileReference file) { - super(ioManager, file, null); + public TestLsmIndexFileManager(IIOManager ioManager, IFileMapProvider fileMapProvider, FileReference file) { + super(ioManager, fileMapProvider, file, null); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMIndexFileManagerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMIndexFileManagerTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMIndexFileManagerTest.java index 56618e7..67a6f69 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMIndexFileManagerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMIndexFileManagerTest.java @@ -36,12 +36,12 @@ import java.util.concurrent.Executors; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.io.FileReference; import org.apache.hyracks.api.io.IODeviceHandle; -import org.apache.hyracks.api.util.IoUtil; import org.apache.hyracks.control.nc.io.DefaultDeviceResolver; import org.apache.hyracks.control.nc.io.IOManager; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexFileManager; import org.apache.hyracks.storage.am.lsm.common.component.TestLsmIndexFileManager; import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentFileReferences; +import org.apache.hyracks.storage.common.file.IFileMapProvider; import org.apache.hyracks.test.support.TestStorageManagerComponentHolder; import org.junit.After; import org.junit.Before; @@ -55,6 +55,7 @@ public class LSMIndexFileManagerTest { protected final static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("ddMMyy-hhmmssSS"); protected final static String sep = System.getProperty("file.separator"); protected IOManager ioManager; + protected IFileMapProvider fileMapProvider; protected String baseDir; protected FileReference file; @@ -62,6 +63,7 @@ public class LSMIndexFileManagerTest { public void setUp() throws HyracksDataException { TestStorageManagerComponentHolder.init(DEFAULT_PAGE_SIZE, DEFAULT_NUM_PAGES, DEFAULT_MAX_OPEN_FILES); ioManager = TestStorageManagerComponentHolder.getIOManager(); + fileMapProvider = TestStorageManagerComponentHolder.getFileMapProvider(); baseDir = ioManager.getIODevices().get(DEFAULT_IO_DEVICE_ID).getMount() + sep + "lsm_tree" + simpleDateFormat.format(new Date()) + sep; File f = new File(baseDir); @@ -76,7 +78,7 @@ public class LSMIndexFileManagerTest { } public void sortOrderTest(boolean testFlushFileName) throws InterruptedException, HyracksDataException { - ILSMIndexFileManager fileManager = new TestLsmIndexFileManager(ioManager, file); + ILSMIndexFileManager fileManager = new TestLsmIndexFileManager(ioManager, fileMapProvider, file); LinkedList<String> fileNames = new LinkedList<>(); int numFileNames = 100; @@ -119,11 +121,9 @@ public class LSMIndexFileManagerTest { String dirPath = ioManager.getIODevices().get(DEFAULT_IO_DEVICE_ID).getMount() + sep + "lsm_tree" + simpleDateFormat.format(new Date()) + sep; File f = new File(dirPath); - if (f.exists()) { - IoUtil.delete(f); - } + f.mkdirs(); FileReference file = ioManager.resolveAbsolutePath(f.getAbsolutePath()); - ILSMIndexFileManager fileManager = new TestLsmIndexFileManager(ioManager, file); + ILSMIndexFileManager fileManager = new TestLsmIndexFileManager(ioManager, fileMapProvider, file); fileManager.createDirs(); List<FileReference> flushFiles = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualBufferCacheTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualBufferCacheTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualBufferCacheTest.java index 5ff5a11..59afa19 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualBufferCacheTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualBufferCacheTest.java @@ -121,7 +121,7 @@ public class VirtualBufferCacheTest { private void deleteFiles() throws Exception { for (int i = 0; i < NUM_FILES; i++) { - vbc.deleteFile(fileStates[i].fileId); + vbc.deleteFile(fileStates[i].fileId, false); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/common/LSMInvertedIndexTestHarness.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/common/LSMInvertedIndexTestHarness.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/common/LSMInvertedIndexTestHarness.java index 51fbb58..daf400f 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/common/LSMInvertedIndexTestHarness.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/common/LSMInvertedIndexTestHarness.java @@ -48,6 +48,7 @@ import org.apache.hyracks.storage.am.lsm.common.impls.ThreadCountingTracker; import org.apache.hyracks.storage.am.lsm.common.impls.VirtualBufferCache; import org.apache.hyracks.storage.common.buffercache.HeapBufferAllocator; import org.apache.hyracks.storage.common.buffercache.IBufferCache; +import org.apache.hyracks.storage.common.file.IFileMapProvider; import org.apache.hyracks.test.support.TestStorageManagerComponentHolder; import org.apache.hyracks.test.support.TestUtils; @@ -67,6 +68,7 @@ public class LSMInvertedIndexTestHarness { protected IOManager ioManager; protected int ioDeviceId; protected IBufferCache diskBufferCache; + protected IFileMapProvider diskFileMapProvider; protected List<IVirtualBufferCache> virtualBufferCaches; protected IHyracksTaskContext ctx; protected ILSMIOOperationScheduler ioScheduler; @@ -107,6 +109,7 @@ public class LSMInvertedIndexTestHarness { ctx = TestUtils.create(getHyracksFrameSize()); TestStorageManagerComponentHolder.init(diskPageSize, diskNumPages, diskMaxOpenFiles); diskBufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx.getJobletContext().getServiceContext()); + diskFileMapProvider = TestStorageManagerComponentHolder.getFileMapProvider(); virtualBufferCaches = new ArrayList<>(); for (int i = 0; i < numMutableComponents; i++) { IVirtualBufferCache virtualBufferCache = new MultitenantVirtualBufferCache( @@ -181,6 +184,10 @@ public class LSMInvertedIndexTestHarness { return diskBufferCache; } + public IFileMapProvider getDiskFileMapProvider() { + return diskFileMapProvider; + } + public List<IVirtualBufferCache> getVirtualBufferCaches() { return virtualBufferCaches; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexLifecycleTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexLifecycleTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexLifecycleTest.java index 0db06e5..b05b838 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexLifecycleTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexLifecycleTest.java @@ -53,22 +53,29 @@ public class OnDiskInvertedIndexLifecycleTest extends AbstractIndexLifecycleTest public void setup() throws Exception { harness.setUp(); ITypeTraits[] tokenTypeTraits = new ITypeTraits[] { UTF8StringPointable.TYPE_TRAITS }; - IBinaryComparatorFactory[] tokenCmpFactories = - new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY) }; + IBinaryComparatorFactory[] tokenCmpFactories = new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory + .of(UTF8StringPointable.FACTORY) }; ITypeTraits[] invListTypeTraits = new ITypeTraits[] { IntegerPointable.TYPE_TRAITS }; - IBinaryComparatorFactory[] invListCmpFactories = - new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory.of(IntegerPointable.FACTORY) }; + IBinaryComparatorFactory[] invListCmpFactories = new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory + .of(IntegerPointable.FACTORY) }; IInvertedListBuilder invListBuilder = new FixedSizeElementInvertedListBuilder(invListTypeTraits); - FileReference btreeFile = harness.getIOManager() - .resolveAbsolutePath(harness.getInvListsFileRef().getFile().getAbsolutePath() + "_btree"); - index = new OnDiskInvertedIndex(harness.getDiskBufferCache(), invListBuilder, invListTypeTraits, - invListCmpFactories, tokenTypeTraits, tokenCmpFactories, harness.getInvListsFileRef(), btreeFile, - harness.getMetadataPageManagerFactory()); + FileReference btreeFile = harness.getIOManager().resolveAbsolutePath(harness.getInvListsFileRef().getFile() + .getAbsolutePath() + + "_btree"); + index = new OnDiskInvertedIndex(harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), invListBuilder, + invListTypeTraits, invListCmpFactories, tokenTypeTraits, tokenCmpFactories, + harness.getInvListsFileRef(), btreeFile, harness.getMetadataPageManagerFactory()); } @Override public void tearDown() throws Exception { + try { + index.deactivate(); + } catch (Exception e) { + } finally { + index.destroy(); + } harness.tearDown(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestContext.java ---------------------------------------------------------------------- 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 d868118..dcc9064 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 @@ -143,29 +143,20 @@ public class LSMInvertedIndexTestContext extends OrderedIndexTestContext { } case ONDISK: { invIndex = InvertedIndexUtils.createOnDiskInvertedIndex(ioManager, harness.getDiskBufferCache(), - invListTypeTraits, invListCmpFactories, tokenTypeTraits, tokenCmpFactories, - harness.getInvListsFileRef(), harness.getMetadataPageManagerFactory()); + harness.getDiskFileMapProvider(), invListTypeTraits, invListCmpFactories, tokenTypeTraits, + tokenCmpFactories, harness.getInvListsFileRef(), harness.getMetadataPageManagerFactory()); break; } case PARTITIONED_ONDISK: { invIndex = InvertedIndexUtils.createPartitionedOnDiskInvertedIndex(ioManager, - harness.getDiskBufferCache(), invListTypeTraits, invListCmpFactories, tokenTypeTraits, - tokenCmpFactories, harness.getInvListsFileRef(), harness.getMetadataPageManagerFactory()); + harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), invListTypeTraits, + invListCmpFactories, tokenTypeTraits, tokenCmpFactories, harness.getInvListsFileRef(), + harness.getMetadataPageManagerFactory()); break; } case LSM: { invIndex = InvertedIndexUtils.createLSMInvertedIndex(ioManager, harness.getVirtualBufferCaches(), - invListTypeTraits, invListCmpFactories, tokenTypeTraits, tokenCmpFactories, tokenizerFactory, - harness.getDiskBufferCache(), harness.getOnDiskDir(), harness.getBoomFilterFalsePositiveRate(), - harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), - harness.getIOOperationCallback(), invertedIndexFields, filterTypeTraits, filterCmpFactories, - filterFields, filterFieldsForNonBulkLoadOps, invertedIndexFieldsForNonBulkLoadOps, true, - harness.getMetadataPageManagerFactory()); - break; - } - case PARTITIONED_LSM: { - invIndex = InvertedIndexUtils.createPartitionedLSMInvertedIndex(ioManager, - harness.getVirtualBufferCaches(), invListTypeTraits, invListCmpFactories, tokenTypeTraits, + harness.getDiskFileMapProvider(), invListTypeTraits, invListCmpFactories, tokenTypeTraits, tokenCmpFactories, tokenizerFactory, harness.getDiskBufferCache(), harness.getOnDiskDir(), harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), @@ -174,6 +165,17 @@ public class LSMInvertedIndexTestContext extends OrderedIndexTestContext { harness.getMetadataPageManagerFactory()); break; } + case PARTITIONED_LSM: { + invIndex = InvertedIndexUtils.createPartitionedLSMInvertedIndex(ioManager, + harness.getVirtualBufferCaches(), harness.getDiskFileMapProvider(), invListTypeTraits, + invListCmpFactories, tokenTypeTraits, tokenCmpFactories, tokenizerFactory, + harness.getDiskBufferCache(), harness.getOnDiskDir(), harness.getBoomFilterFalsePositiveRate(), + harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), + harness.getIOOperationCallback(), invertedIndexFields, filterTypeTraits, filterCmpFactories, + filterFields, filterFieldsForNonBulkLoadOps, invertedIndexFieldsForNonBulkLoadOps, true, + harness.getMetadataPageManagerFactory()); + break; + } default: { throw HyracksDataException.create(ErrorCode.UNKNOWN_INVERTED_INDEX_TYPE, invIndexType); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeBulkLoadTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeBulkLoadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeBulkLoadTest.java index 8b8da4a..85070a8 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeBulkLoadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeBulkLoadTest.java @@ -56,9 +56,10 @@ public class LSMRTreeBulkLoadTest extends AbstractRTreeBulkLoadTest { protected AbstractRTreeTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { - return LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, valueProviderFactories, numKeys, - rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), + return LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness + .getFileReference(), + harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, valueProviderFactories, + numKeys, rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeDeleteTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeDeleteTest.java index 1cb0155..5437713 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeDeleteTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeDeleteTest.java @@ -56,11 +56,12 @@ public class LSMRTreeDeleteTest extends AbstractRTreeDeleteTest { protected AbstractRTreeTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { - return LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, valueProviderFactories, numKeys, - rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), - harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), - harness.getMetadataPageManagerFactory()); + return LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness + .getFileReference(), + harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, valueProviderFactories, + numKeys, rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), + harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), harness + .getMetadataPageManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeExamplesTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeExamplesTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeExamplesTest.java index 90e805d..00cb223 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeExamplesTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeExamplesTest.java @@ -44,10 +44,10 @@ public class LSMRTreeExamplesTest extends AbstractLSMRTreeExamplesTest { RTreePolicyType rtreePolicyType, int[] rtreeFields, int[] btreeFields, ITypeTraits[] filterTypeTraits, IBinaryComparatorFactory[] filterCmpFactories, int[] filterFields) throws HyracksDataException { return LSMRTreeUtils.createLSMTree(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), typeTraits, rtreeCmpFactories, - btreeCmpFactories, valueProviderFactories, rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), - harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), - harness.getIOOperationCallback(), + harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), typeTraits, + rtreeCmpFactories, btreeCmpFactories, valueProviderFactories, rtreePolicyType, + harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), + harness.getIOScheduler(), harness.getIOOperationCallback(), LSMRTreeUtils.proposeBestLinearizer(typeTraits, rtreeCmpFactories.length), rtreeFields, btreeFields, filterTypeTraits, filterCmpFactories, filterFields, true, false, harness.getMetadataPageManagerFactory()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeInsertTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeInsertTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeInsertTest.java index fa8de56..7b112c6 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeInsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeInsertTest.java @@ -56,11 +56,12 @@ public class LSMRTreeInsertTest extends AbstractRTreeInsertTest { protected AbstractRTreeTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { - return LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, valueProviderFactories, numKeys, - rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), - harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), - harness.getMetadataPageManagerFactory()); + return LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness + .getFileReference(), + harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, valueProviderFactories, + numKeys, rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), + harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), harness + .getMetadataPageManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeLifecycleTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeLifecycleTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeLifecycleTest.java index 6a7106b..d49e709 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeLifecycleTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeLifecycleTest.java @@ -39,8 +39,8 @@ public class LSMRTreeLifecycleTest extends AbstractIndexLifecycleTest { private final ISerializerDeserializer[] fieldSerdes = { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }; - private final IPrimitiveValueProviderFactory[] valueProviderFactories = - RTreeUtils.createPrimitiveValueProviderFactories(4, IntegerPointable.FACTORY); + private final IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils + .createPrimitiveValueProviderFactories(4, IntegerPointable.FACTORY); private final int numKeys = 4; private final LSMRTreeTestHarness harness = new LSMRTreeTestHarness(); @@ -66,16 +66,23 @@ public class LSMRTreeLifecycleTest extends AbstractIndexLifecycleTest { @Override public void setup() throws Exception { harness.setUp(); - testCtx = LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, valueProviderFactories, numKeys, - RTreePolicyType.RTREE, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), - harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), - harness.getMetadataPageManagerFactory()); + testCtx = LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness + .getFileReference(), + harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, valueProviderFactories, + numKeys, RTreePolicyType.RTREE, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), + harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), harness + .getMetadataPageManagerFactory()); index = testCtx.getIndex(); } @Override public void tearDown() throws Exception { + try { + index.deactivate(); + } catch (Exception e) { + } finally { + index.destroy(); + } harness.tearDown(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeMergeTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeMergeTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeMergeTest.java index 04ec368..feed391 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeMergeTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeMergeTest.java @@ -55,11 +55,11 @@ public class LSMRTreeMergeTest extends LSMRTreeMergeTestDriver { protected AbstractRTreeTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { - return LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, valueProviderFactories, numKeys, - rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), - harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), - harness.getMetadataPageManagerFactory()); + return LSMRTreeTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), harness + .getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), fieldSerdes, + valueProviderFactories, numKeys, rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), harness + .getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), harness + .getIOOperationCallback(), harness.getMetadataPageManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesBulkLoadTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesBulkLoadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesBulkLoadTest.java index 42b4f68..91fc323 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesBulkLoadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesBulkLoadTest.java @@ -57,9 +57,10 @@ public class LSMRTreeWithAntiMatterTuplesBulkLoadTest extends AbstractRTreeBulkL IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { return LSMRTreeWithAntiMatterTuplesTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, valueProviderFactories, numKeys, - rtreePolicyType, harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), - harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory()); + harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), + fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, harness.getMergePolicy(), + harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), + harness.getMetadataPageManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d9000469/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesDeleteTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesDeleteTest.java index d643b1c..6ab4967 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesDeleteTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesDeleteTest.java @@ -57,9 +57,10 @@ public class LSMRTreeWithAntiMatterTuplesDeleteTest extends AbstractRTreeDeleteT IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { return LSMRTreeWithAntiMatterTuplesTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, valueProviderFactories, numKeys, - rtreePolicyType, harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), - harness.getIOOperationCallback(), harness.getMetadataPageManagerFactory()); + harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), + fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, harness.getMergePolicy(), + harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), + harness.getMetadataPageManagerFactory()); } @Override
