Repository: asterixdb Updated Branches: refs/heads/master 8ba594453 -> ae3daf6ef
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesExamplesTest.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/LSMRTreeWithAntiMatterTuplesExamplesTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesExamplesTest.java index 835ae64..ea90a43 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesExamplesTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesExamplesTest.java @@ -44,8 +44,8 @@ public class LSMRTreeWithAntiMatterTuplesExamplesTest extends AbstractLSMRTreeEx RTreePolicyType rtreePolicyType, int[] rtreeFields, int[] btreeFields, ITypeTraits[] filterTypeTraits, IBinaryComparatorFactory[] filterCmpFactories, int[] filterFields) throws HyracksDataException { return LSMRTreeUtils.createLSMTreeWithAntiMatterTuples(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), typeTraits, - rtreeCmpFactories, btreeCmpFactories, valueProviderFactories, rtreePolicyType, harness.getMergePolicy(), + harness.getFileReference(), harness.getDiskBufferCache(), typeTraits, rtreeCmpFactories, + btreeCmpFactories, valueProviderFactories, rtreePolicyType, harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), LSMRTreeUtils.proposeBestLinearizer(typeTraits, rtreeCmpFactories.length), rtreeFields, filterTypeTraits, filterCmpFactories, filterFields, true, false, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesInsertTest.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/LSMRTreeWithAntiMatterTuplesInsertTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesInsertTest.java index c881b39..abc9271 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesInsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesInsertTest.java @@ -57,10 +57,9 @@ public class LSMRTreeWithAntiMatterTuplesInsertTest extends AbstractRTreeInsertT IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { return LSMRTreeWithAntiMatterTuplesTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), - fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, harness.getMergePolicy(), - harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), harness - .getMetadataPageManagerFactory()); + harness.getFileReference(), harness.getDiskBufferCache(), 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/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesLifecycleTest.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/LSMRTreeWithAntiMatterTuplesLifecycleTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesLifecycleTest.java index acd40dd..cd8a465 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesLifecycleTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesLifecycleTest.java @@ -39,8 +39,8 @@ public class LSMRTreeWithAntiMatterTuplesLifecycleTest extends AbstractIndexLife 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,22 +66,16 @@ public class LSMRTreeWithAntiMatterTuplesLifecycleTest extends AbstractIndexLife @Override public void setup() throws Exception { harness.setUp(); - testCtx = LSMRTreeWithAntiMatterTuplesTestContext.create(harness.getIOManager(), harness - .getVirtualBufferCaches(), harness.getFileReference(), harness.getDiskBufferCache(), harness - .getDiskFileMapProvider(), fieldSerdes, valueProviderFactories, numKeys, RTreePolicyType.RTREE, - harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), harness - .getIOOperationCallback(), harness.getMetadataPageManagerFactory()); + testCtx = LSMRTreeWithAntiMatterTuplesTestContext.create(harness.getIOManager(), + harness.getVirtualBufferCaches(), harness.getFileReference(), harness.getDiskBufferCache(), fieldSerdes, + valueProviderFactories, numKeys, RTreePolicyType.RTREE, 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/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesMergeTest.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/LSMRTreeWithAntiMatterTuplesMergeTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesMergeTest.java index 59c64db..cdd60f9 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesMergeTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesMergeTest.java @@ -56,10 +56,9 @@ public class LSMRTreeWithAntiMatterTuplesMergeTest extends LSMRTreeMergeTestDriv IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { return LSMRTreeWithAntiMatterTuplesTestContext.create(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), - fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, harness.getMergePolicy(), - harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), - harness.getMetadataPageManagerFactory()); + harness.getFileReference(), harness.getDiskBufferCache(), 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/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeMultiThreadTest.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/multithread/LSMRTreeMultiThreadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeMultiThreadTest.java index e319d1d..91b38cb 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeMultiThreadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeMultiThreadTest.java @@ -61,10 +61,10 @@ public class LSMRTreeMultiThreadTest extends AbstractRTreeMultiThreadTest { IBinaryComparatorFactory[] btreeCmpFactories, IPrimitiveValueProviderFactory[] valueProviderFactories, RTreePolicyType rtreePolicyType, int[] btreeFields) throws HyracksDataException { return LSMRTreeUtils.createLSMTree(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), typeTraits, - rtreeCmpFactories, btreeCmpFactories, valueProviderFactories, rtreePolicyType, - harness.getBoomFilterFalsePositiveRate(), harness.getMergePolicy(), harness.getOperationTracker(), - harness.getIOScheduler(), harness.getIOOperationCallback(), + harness.getFileReference(), harness.getDiskBufferCache(), typeTraits, rtreeCmpFactories, + btreeCmpFactories, valueProviderFactories, rtreePolicyType, harness.getBoomFilterFalsePositiveRate(), + harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), + harness.getIOOperationCallback(), LSMRTreeUtils.proposeBestLinearizer(typeTraits, rtreeCmpFactories.length), null, btreeFields, null, null, null, true, false, harness.getMetadataPageManagerFactory()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeWithAntiMatterTuplesMultiThreadTest.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/multithread/LSMRTreeWithAntiMatterTuplesMultiThreadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeWithAntiMatterTuplesMultiThreadTest.java index 987e015..954538b 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeWithAntiMatterTuplesMultiThreadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/multithread/LSMRTreeWithAntiMatterTuplesMultiThreadTest.java @@ -62,8 +62,8 @@ public class LSMRTreeWithAntiMatterTuplesMultiThreadTest extends AbstractRTreeMu IBinaryComparatorFactory[] btreeCmpFactories, IPrimitiveValueProviderFactory[] valueProviderFactories, RTreePolicyType rtreePolicyType, int[] btreeFields) throws HyracksDataException { return LSMRTreeUtils.createLSMTreeWithAntiMatterTuples(harness.getIOManager(), harness.getVirtualBufferCaches(), - harness.getFileReference(), harness.getDiskBufferCache(), harness.getDiskFileMapProvider(), typeTraits, - rtreeCmpFactories, btreeCmpFactories, valueProviderFactories, rtreePolicyType, harness.getMergePolicy(), + harness.getFileReference(), harness.getDiskBufferCache(), typeTraits, rtreeCmpFactories, + btreeCmpFactories, valueProviderFactories, rtreePolicyType, harness.getMergePolicy(), harness.getOperationTracker(), harness.getIOScheduler(), harness.getIOOperationCallback(), LSMRTreeUtils.proposeBestLinearizer(typeTraits, rtreeCmpFactories.length), null, null, null, null, true, false, harness.getMetadataPageManagerFactory()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeTestContext.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/util/LSMRTreeTestContext.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeTestContext.java index d55daef..753fc93 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeTestContext.java @@ -43,7 +43,6 @@ import org.apache.hyracks.storage.am.rtree.AbstractRTreeTestContext; import org.apache.hyracks.storage.am.rtree.RTreeCheckTuple; import org.apache.hyracks.storage.am.rtree.frames.RTreePolicyType; import org.apache.hyracks.storage.common.buffercache.IBufferCache; -import org.apache.hyracks.storage.common.file.IFileMapProvider; @SuppressWarnings("rawtypes") public final class LSMRTreeTestContext extends AbstractRTreeTestContext { @@ -75,15 +74,14 @@ public final class LSMRTreeTestContext extends AbstractRTreeTestContext { } public static LSMRTreeTestContext create(IIOManager ioManager, List<IVirtualBufferCache> virtualBufferCaches, - FileReference file, - IBufferCache diskBufferCache, IFileMapProvider diskFileMapProvider, ISerializerDeserializer[] fieldSerdes, + FileReference file, IBufferCache diskBufferCache, ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeyFields, RTreePolicyType rtreePolicyType, double bloomFilterFalsePositiveRate, ILSMMergePolicy mergePolicy, ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallback ioOpCallback, IMetadataPageManagerFactory metadataPageManagerFactory) throws Exception { ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes); - IBinaryComparatorFactory[] rtreeCmpFactories = SerdeUtils.serdesToComparatorFactories(fieldSerdes, - numKeyFields); + IBinaryComparatorFactory[] rtreeCmpFactories = + SerdeUtils.serdesToComparatorFactories(fieldSerdes, numKeyFields); int numBtreeFields = fieldSerdes.length - numKeyFields; ISerializerDeserializer[] btreeFieldSerdes = new ISerializerDeserializer[numBtreeFields]; int[] btreeFields = new int[numBtreeFields]; @@ -91,11 +89,10 @@ public final class LSMRTreeTestContext extends AbstractRTreeTestContext { btreeFields[i] = numKeyFields + i; btreeFieldSerdes[i] = fieldSerdes[numKeyFields + i]; } - IBinaryComparatorFactory[] btreeCmpFactories = SerdeUtils.serdesToComparatorFactories(btreeFieldSerdes, - numBtreeFields); + IBinaryComparatorFactory[] btreeCmpFactories = + SerdeUtils.serdesToComparatorFactories(btreeFieldSerdes, numBtreeFields); LSMRTree lsmTree = LSMRTreeUtils.createLSMTree(ioManager, virtualBufferCaches, file, diskBufferCache, - diskFileMapProvider, typeTraits, rtreeCmpFactories, btreeCmpFactories, valueProviderFactories, - rtreePolicyType, + typeTraits, rtreeCmpFactories, btreeCmpFactories, valueProviderFactories, rtreePolicyType, bloomFilterFalsePositiveRate, mergePolicy, opTracker, ioScheduler, ioOpCallback, LSMRTreeUtils.proposeBestLinearizer(typeTraits, rtreeCmpFactories.length), null, btreeFields, null, null, null, true, false, metadataPageManagerFactory); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeTestHarness.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/util/LSMRTreeTestHarness.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeTestHarness.java index 1c459a1..4af7c6e 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeTestHarness.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeTestHarness.java @@ -48,7 +48,6 @@ 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; @@ -69,7 +68,6 @@ public class LSMRTreeTestHarness { protected IOManager ioManager; protected int ioDeviceId; protected IBufferCache diskBufferCache; - protected IFileMapProvider diskFileMapProvider; protected List<IVirtualBufferCache> virtualBufferCaches; protected IHyracksTaskContext ctx; protected ILSMIOOperationScheduler ioScheduler; @@ -109,7 +107,6 @@ public class LSMRTreeTestHarness { 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 = @@ -174,10 +171,6 @@ public class LSMRTreeTestHarness { return diskBufferCache; } - public IFileMapProvider getDiskFileMapProvider() { - return diskFileMapProvider; - } - public List<IVirtualBufferCache> getVirtualBufferCaches() { return virtualBufferCaches; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeWithAntiMatterTuplesTestContext.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/util/LSMRTreeWithAntiMatterTuplesTestContext.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeWithAntiMatterTuplesTestContext.java index 0653ddf..975a3d3 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeWithAntiMatterTuplesTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/util/LSMRTreeWithAntiMatterTuplesTestContext.java @@ -43,7 +43,6 @@ import org.apache.hyracks.storage.am.rtree.AbstractRTreeTestContext; import org.apache.hyracks.storage.am.rtree.RTreeCheckTuple; import org.apache.hyracks.storage.am.rtree.frames.RTreePolicyType; import org.apache.hyracks.storage.common.buffercache.IBufferCache; -import org.apache.hyracks.storage.common.file.IFileMapProvider; @SuppressWarnings("rawtypes") public final class LSMRTreeWithAntiMatterTuplesTestContext extends AbstractRTreeTestContext { @@ -75,26 +74,23 @@ public final class LSMRTreeWithAntiMatterTuplesTestContext extends AbstractRTree } public static LSMRTreeWithAntiMatterTuplesTestContext create(IIOManager ioManager, - List<IVirtualBufferCache> virtualBufferCaches, - FileReference file, IBufferCache diskBufferCache, IFileMapProvider diskFileMapProvider, + List<IVirtualBufferCache> virtualBufferCaches, FileReference file, IBufferCache diskBufferCache, ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeyFields, RTreePolicyType rtreePolicyType, ILSMMergePolicy mergePolicy, ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallback ioOpCallback, - IMetadataPageManagerFactory metadataPageManagerFactory) - throws Exception { + IMetadataPageManagerFactory metadataPageManagerFactory) throws Exception { ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes); - IBinaryComparatorFactory[] rtreeCmpFactories = SerdeUtils.serdesToComparatorFactories(fieldSerdes, - numKeyFields); - IBinaryComparatorFactory[] btreeCmpFactories = SerdeUtils.serdesToComparatorFactories(fieldSerdes, - fieldSerdes.length); + IBinaryComparatorFactory[] rtreeCmpFactories = + SerdeUtils.serdesToComparatorFactories(fieldSerdes, numKeyFields); + IBinaryComparatorFactory[] btreeCmpFactories = + SerdeUtils.serdesToComparatorFactories(fieldSerdes, fieldSerdes.length); LSMRTreeWithAntiMatterTuples lsmTree = LSMRTreeUtils.createLSMTreeWithAntiMatterTuples(ioManager, - virtualBufferCaches, - file, diskBufferCache, diskFileMapProvider, typeTraits, rtreeCmpFactories, btreeCmpFactories, + virtualBufferCaches, file, diskBufferCache, typeTraits, rtreeCmpFactories, btreeCmpFactories, valueProviderFactories, rtreePolicyType, mergePolicy, opTracker, ioScheduler, ioOpCallback, LSMRTreeUtils.proposeBestLinearizer(typeTraits, rtreeCmpFactories.length), null, null, null, null, true, false, metadataPageManagerFactory); - LSMRTreeWithAntiMatterTuplesTestContext testCtx = new LSMRTreeWithAntiMatterTuplesTestContext(fieldSerdes, - lsmTree); + LSMRTreeWithAntiMatterTuplesTestContext testCtx = + new LSMRTreeWithAntiMatterTuplesTestContext(fieldSerdes, lsmTree); return testCtx; } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeBulkLoadTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeBulkLoadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeBulkLoadTest.java index 4cc6c7d..6f934cd 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeBulkLoadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeBulkLoadTest.java @@ -54,9 +54,8 @@ public class RTreeBulkLoadTest extends AbstractRTreeBulkLoadTest { protected AbstractRTreeTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { - return RTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), - harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, - harness.getMetadataManagerFactory()); + return RTreeTestContext.create(harness.getBufferCache(), harness.getFileReference(), fieldSerdes, + valueProviderFactories, numKeys, rtreePolicyType, harness.getMetadataManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java index 803a130..ce1ba96 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java @@ -54,9 +54,8 @@ public class RTreeDeleteTest extends AbstractRTreeDeleteTest { protected AbstractRTreeTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { - return RTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), - harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, - harness.getMetadataManagerFactory()); + return RTreeTestContext.create(harness.getBufferCache(), harness.getFileReference(), fieldSerdes, + valueProviderFactories, numKeys, rtreePolicyType, harness.getMetadataManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeExamplesTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeExamplesTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeExamplesTest.java index ecc6fe4..999fd65 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeExamplesTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeExamplesTest.java @@ -53,9 +53,8 @@ public class RTreeExamplesTest extends AbstractRTreeExamplesTest { IBinaryComparatorFactory[] btreeCmpFactories, IPrimitiveValueProviderFactory[] valueProviderFactories, RTreePolicyType rtreePolicyType, int[] rtreeFields, int[] btreeFields, ITypeTraits[] filterTypeTraits, IBinaryComparatorFactory[] filterCmpFactories, int[] filterFields) throws HyracksDataException { - return RTreeUtils.createRTree(harness.getBufferCache(), harness.getFileMapProvider(), typeTraits, - valueProviderFactories, rtreeCmpFactories, rtreePolicyType, harness.getFileReference(), false, - harness.getMetadataManagerFactory()); + return RTreeUtils.createRTree(harness.getBufferCache(), typeTraits, valueProviderFactories, rtreeCmpFactories, + rtreePolicyType, harness.getFileReference(), false, harness.getMetadataManagerFactory()); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java index 57a2ac3..93be987 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java @@ -54,9 +54,8 @@ public class RTreeInsertTest extends AbstractRTreeInsertTest { protected AbstractRTreeTestContext createTestContext(ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { - return RTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), - harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, - harness.getMetadataManagerFactory()); + return RTreeTestContext.create(harness.getBufferCache(), harness.getFileReference(), fieldSerdes, + valueProviderFactories, numKeys, rtreePolicyType, harness.getMetadataManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeLifecycleTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeLifecycleTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeLifecycleTest.java index b7eb961..9745c08 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeLifecycleTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeLifecycleTest.java @@ -42,8 +42,8 @@ public class RTreeLifecycleTest 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; @SuppressWarnings("rawtypes") @@ -53,20 +53,13 @@ public class RTreeLifecycleTest extends AbstractIndexLifecycleTest { @Override public void setup() throws Exception { harness.setUp(); - testCtx = RTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), - harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, RTreePolicyType.RTREE, - harness.getMetadataManagerFactory()); + testCtx = RTreeTestContext.create(harness.getBufferCache(), harness.getFileReference(), fieldSerdes, + valueProviderFactories, numKeys, RTreePolicyType.RTREE, harness.getMetadataManagerFactory()); index = testCtx.getIndex(); } @Override public void tearDown() throws HyracksDataException { - try { - testCtx.getIndex().deactivate(); - } catch (Exception e) { - } finally { - testCtx.getIndex().destroy(); - } harness.tearDown(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/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 bdb6267..31d54ae 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 @@ -121,8 +121,8 @@ public class RTreeSearchCursorTest extends AbstractRTreeTest { IRTreeLeafFrame leafFrame = (IRTreeLeafFrame) leafFrameFactory.createFrame(); IMetadataPageManager freePageManager = new LinkedMetaDataPageManager(bufferCache, metaFrameFactory); - RTree rtree = new RTree(bufferCache, harness.getFileMapProvider(), freePageManager, interiorFrameFactory, - leafFrameFactory, cmpFactories, fieldCount, harness.getFileReference(), false); + RTree rtree = new RTree(bufferCache, freePageManager, interiorFrameFactory, leafFrameFactory, cmpFactories, + fieldCount, harness.getFileReference(), false); rtree.create(); rtree.activate(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeMultiThreadTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeMultiThreadTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeMultiThreadTest.java index 0a27be3..faa63c5 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeMultiThreadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/multithread/RTreeMultiThreadTest.java @@ -60,9 +60,8 @@ public class RTreeMultiThreadTest extends AbstractRTreeMultiThreadTest { protected ITreeIndex createTreeIndex(ITypeTraits[] typeTraits, IBinaryComparatorFactory[] rtreeCmpFactories, IBinaryComparatorFactory[] btreeCmpFactories, IPrimitiveValueProviderFactory[] valueProviderFactories, RTreePolicyType rtreePolicyType, int[] btreeFields) throws HyracksDataException { - return RTreeUtils.createRTree(harness.getBufferCache(), harness.getFileMapProvider(), typeTraits, - valueProviderFactories, rtreeCmpFactories, rtreePolicyType, harness.getFileReference(), false, - harness.getMetadataManagerFactory()); + return RTreeUtils.createRTree(harness.getBufferCache(), typeTraits, valueProviderFactories, rtreeCmpFactories, + rtreePolicyType, harness.getFileReference(), false, harness.getMetadataManagerFactory()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestContext.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestContext.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestContext.java index a738e2f..bf70dc1 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestContext.java @@ -33,7 +33,6 @@ import org.apache.hyracks.storage.am.rtree.frames.RTreePolicyType; import org.apache.hyracks.storage.am.rtree.impls.RTree; import org.apache.hyracks.storage.am.rtree.util.RTreeUtils; import org.apache.hyracks.storage.common.buffercache.IBufferCache; -import org.apache.hyracks.storage.common.file.IFileMapProvider; @SuppressWarnings("rawtypes") public class RTreeTestContext extends AbstractRTreeTestContext { @@ -54,15 +53,14 @@ public class RTreeTestContext extends AbstractRTreeTestContext { return rtree.getComparatorFactories(); } - public static RTreeTestContext create(IBufferCache bufferCache, IFileMapProvider fileMapProvider, - FileReference file, ISerializerDeserializer[] fieldSerdes, - IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeyFields, RTreePolicyType rtreePolicyType, - IPageManagerFactory pageManagerFactory) + public static RTreeTestContext create(IBufferCache bufferCache, FileReference file, + ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, + int numKeyFields, RTreePolicyType rtreePolicyType, IPageManagerFactory pageManagerFactory) throws Exception { ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes); IBinaryComparatorFactory[] cmpFactories = SerdeUtils.serdesToComparatorFactories(fieldSerdes, numKeyFields); - RTree rtree = RTreeUtils.createRTree(bufferCache, fileMapProvider, typeTraits, valueProviderFactories, - cmpFactories, rtreePolicyType, file, false, pageManagerFactory); + RTree rtree = RTreeUtils.createRTree(bufferCache, typeTraits, valueProviderFactories, cmpFactories, + rtreePolicyType, file, false, pageManagerFactory); RTreeTestContext testCtx = new RTreeTestContext(fieldSerdes, rtree); return testCtx; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestHarness.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestHarness.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestHarness.java index c9975cd..5ad777d 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestHarness.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/utils/RTreeTestHarness.java @@ -32,7 +32,6 @@ 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; @@ -47,7 +46,6 @@ public class RTreeTestHarness { protected IHyracksTaskContext ctx; protected IBufferCache bufferCache; - protected IFileMapProvider fileMapProvider; protected int treeFileId; protected final Random rnd = new Random(); @@ -78,7 +76,6 @@ public class RTreeTestHarness { file = ioManager.resolve(fileName); ctx = TestUtils.create(getHyracksFrameSize()); bufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx.getJobletContext().getServiceContext()); - fileMapProvider = TestStorageManagerComponentHolder.getFileMapProvider(); rnd.setSeed(RANDOM_SEED); } @@ -96,10 +93,6 @@ public class RTreeTestHarness { return bufferCache; } - public IFileMapProvider getFileMapProvider() { - return fileMapProvider; - } - public String getFileName() { return fileName; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheRegressionTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheRegressionTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheRegressionTest.java index cccbc5d..3a857cc 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheRegressionTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheRegressionTest.java @@ -34,10 +34,10 @@ import org.apache.hyracks.storage.common.buffercache.BufferCache; import org.apache.hyracks.storage.common.buffercache.IBufferCache; import org.apache.hyracks.storage.common.buffercache.ICachedPage; import org.apache.hyracks.storage.common.file.BufferedFileHandle; -import org.apache.hyracks.storage.common.file.IFileMapProvider; import org.apache.hyracks.test.support.TestStorageManagerComponentHolder; import org.apache.hyracks.test.support.TestUtils; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -73,7 +73,13 @@ public class BufferCacheRegressionTest { @Test public void testFlushBehaviorOnFileEviction() throws IOException { flushBehaviorTest(true); - flushBehaviorTest(false); + boolean exceptionCaught = false; + try { + flushBehaviorTest(false); + } catch (Exception e) { + exceptionCaught = true; + } + Assert.assertTrue(exceptionCaught); } private void flushBehaviorTest(boolean deleteFile) throws IOException { @@ -81,12 +87,10 @@ public class BufferCacheRegressionTest { IBufferCache bufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx.getJobletContext().getServiceContext()); - IFileMapProvider fmp = TestStorageManagerComponentHolder.getFileMapProvider(); IOManager ioManager = TestStorageManagerComponentHolder.getIOManager(); FileReference firstFileRef = ioManager.resolve(fileName); - bufferCache.createFile(firstFileRef); - int firstFileId = fmp.lookupFileId(firstFileRef); + int firstFileId = bufferCache.createFile(firstFileRef); bufferCache.openFile(firstFileId); // Fill the first page with known data and make it dirty by write @@ -104,13 +108,12 @@ public class BufferCacheRegressionTest { } bufferCache.closeFile(firstFileId); if (deleteFile) { - bufferCache.deleteFile(firstFileId, false); + bufferCache.deleteFile(firstFileId); } // Create a file with the same name. FileReference secondFileRef = ioManager.resolve(fileName); - bufferCache.createFile(secondFileRef); - int secondFileId = fmp.lookupFileId(secondFileRef); + int secondFileId = bufferCache.createFile(secondFileRef); // This open will replace the firstFileRef's slot in the BufferCache, // causing it's pages to be cleaned up. We want to make sure that those @@ -147,7 +150,7 @@ public class BufferCacheRegressionTest { ioManager.close(testFileHandle); bufferCache.closeFile(secondFileId); if (deleteFile) { - bufferCache.deleteFile(secondFileId, false); + bufferCache.deleteFile(secondFileId); } bufferCache.close(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheTest.java index 4a08881..e688ee5 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/BufferCacheTest.java @@ -35,7 +35,6 @@ import org.apache.hyracks.api.io.IIOManager; import org.apache.hyracks.storage.common.buffercache.IBufferCache; import org.apache.hyracks.storage.common.buffercache.ICachedPage; import org.apache.hyracks.storage.common.file.BufferedFileHandle; -import org.apache.hyracks.storage.common.file.IFileMapProvider; import org.apache.hyracks.test.support.TestStorageManagerComponentHolder; import org.apache.hyracks.test.support.TestUtils; import org.junit.AfterClass; @@ -65,12 +64,11 @@ public class BufferCacheTest { TestStorageManagerComponentHolder.init(PAGE_SIZE, NUM_PAGES, MAX_OPEN_FILES); IBufferCache bufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx.getJobletContext().getServiceContext()); - IFileMapProvider fmp = TestStorageManagerComponentHolder.getFileMapProvider(); + IIOManager ioManager = TestStorageManagerComponentHolder.getIOManager(); String fileName = getFileName(); FileReference file = ioManager.resolve(fileName); - bufferCache.createFile(file); - int fileId = fmp.lookupFileId(file); + int fileId = bufferCache.createFile(file); int num = 10; int testPageId = 0; @@ -148,7 +146,6 @@ public class BufferCacheTest { TestStorageManagerComponentHolder.init(PAGE_SIZE, NUM_PAGES, MAX_OPEN_FILES); IBufferCache bufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx.getJobletContext().getServiceContext()); - IFileMapProvider fmp = TestStorageManagerComponentHolder.getFileMapProvider(); IIOManager ioManager = TestStorageManagerComponentHolder.getIOManager(); List<Integer> fileIds = new ArrayList<>(); @@ -157,8 +154,7 @@ public class BufferCacheTest { String fileName = getFileName(); FileReference file = ioManager.resolve(fileName); - bufferCache.createFile(file); - int fileId = fmp.lookupFileId(file); + int fileId = bufferCache.createFile(file); bufferCache.openFile(fileId); fileIds.add(fileId); } @@ -169,8 +165,7 @@ public class BufferCacheTest { try { String fileName = getFileName(); FileReference file = ioManager.resolve(fileName); - bufferCache.createFile(file); - int fileId = fmp.lookupFileId(file); + int fileId = bufferCache.createFile(file); bufferCache.openFile(fileId); } catch (HyracksDataException e) { exceptionThrown = true; @@ -187,8 +182,7 @@ public class BufferCacheTest { try { String fileName = getFileName(); FileReference file = ioManager.resolve(fileName); - bufferCache.createFile(file); - int fileId = fmp.lookupFileId(file); + int fileId = bufferCache.createFile(file); bufferCache.openFile(fileId); fileIds.add(fileId); @@ -209,7 +203,6 @@ public class BufferCacheTest { TestStorageManagerComponentHolder.init(PAGE_SIZE, NUM_PAGES, MAX_OPEN_FILES); IBufferCache bufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx.getJobletContext().getServiceContext()); - IFileMapProvider fmp = TestStorageManagerComponentHolder.getFileMapProvider(); IIOManager ioManager = TestStorageManagerComponentHolder.getIOManager(); List<Integer> fileIds = new ArrayList<>(); @@ -221,8 +214,7 @@ public class BufferCacheTest { for (int i = 0; i < MAX_OPEN_FILES; i++) { String fileName = getFileName(); FileReference file = ioManager.resolve(fileName); - bufferCache.createFile(file); - int fileId = fmp.lookupFileId(file); + int fileId = bufferCache.createFile(file); bufferCache.openFile(fileId); fileIds.add(fileId); @@ -249,8 +241,7 @@ public class BufferCacheTest { try { String fileName = getFileName(); FileReference file = ioManager.resolve(fileName); - bufferCache.createFile(file); - int fileId = fmp.lookupFileId(file); + int fileId = bufferCache.createFile(file); bufferCache.openFile(fileId); } catch (HyracksDataException e) { exceptionThrown = true; @@ -271,8 +262,7 @@ public class BufferCacheTest { for (int i = 0; i < filesToClose; i++) { String fileName = getFileName(); FileReference file = ioManager.resolve(fileName); - bufferCache.createFile(file); - int fileId = fmp.lookupFileId(file); + int fileId = bufferCache.createFile(file); bufferCache.openFile(fileId); fileIds.add(fileId); } @@ -281,8 +271,7 @@ public class BufferCacheTest { try { String fileName = getFileName(); FileReference file = ioManager.resolve(fileName); - bufferCache.createFile(file); - int fileId = fmp.lookupFileId(file); + int fileId = bufferCache.createFile(file); bufferCache.openFile(fileId); } catch (HyracksDataException e) { exceptionThrown = true; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ae3daf6e/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/JSONUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/JSONUtil.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/JSONUtil.java index 7075417..0cb87dd 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/JSONUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/JSONUtil.java @@ -20,6 +20,8 @@ package org.apache.hyracks.util; import java.io.IOException; import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; import java.util.logging.Logger; import com.fasterxml.jackson.core.JsonProcessingException; @@ -174,4 +176,45 @@ public class JSONUtil { return null; } } + + /** + * Write map as a json string. if an object is a string and starts with a { or [ + * then it assumes that it is a json object or a json array and so it doesn't surround + * it with " + * + * @param map + * a map representing the json object + * @return + * a String representation of the json object + */ + public static String fromMap(Map<String, Object> map) { + StringBuilder aString = new StringBuilder(); + aString.append("{ "); + boolean first = true; + for (Entry<String, Object> entry : map.entrySet()) { + if (!first) { + aString.append(", "); + } + aString.append("\""); + aString.append(entry.getKey()); + aString.append("\""); + aString.append(" : "); + Object value = entry.getValue(); + if (value instanceof String) { + String strValue = (String) value; + if (strValue.startsWith("{") || strValue.startsWith("[")) { + aString.append(value); + } else { + aString.append("\""); + aString.append(value); + aString.append("\""); + } + } else { + aString.append(value); + } + first = false; + } + aString.append(" }"); + return aString.toString(); + } }
