Repository: asterixdb Updated Branches: refs/heads/release-0.9.3-pre-rc 76d24d490 -> e32cb6765
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e32cb676/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 4af7c6e..fd910e1 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 @@ -36,7 +36,7 @@ import org.apache.hyracks.control.nc.io.IOManager; import org.apache.hyracks.storage.am.common.api.IMetadataPageManagerFactory; import org.apache.hyracks.storage.am.common.freepage.AppendOnlyLinkedMetadataPageManagerFactory; import org.apache.hyracks.storage.am.config.AccessMethodTestsConfig; -import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler; import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy; import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; @@ -71,7 +71,7 @@ public class LSMRTreeTestHarness { protected List<IVirtualBufferCache> virtualBufferCaches; protected IHyracksTaskContext ctx; protected ILSMIOOperationScheduler ioScheduler; - protected ILSMIOOperationCallback ioOpCallback; + protected ILSMIOOperationCallbackFactory ioOpCallbackFactory; protected ILSMMergePolicy mergePolicy; protected ILSMOperationTracker opTracker; protected IMetadataPageManagerFactory metadataPageManagerFactory = @@ -94,7 +94,7 @@ public class LSMRTreeTestHarness { this.ioScheduler = SynchronousScheduler.INSTANCE; this.mergePolicy = new NoMergePolicy(); this.opTracker = new ThreadCountingTracker(); - this.ioOpCallback = NoOpIOOperationCallbackFactory.INSTANCE.createIoOpCallback(); + this.ioOpCallbackFactory = NoOpIOOperationCallbackFactory.INSTANCE; this.numMutableComponents = AccessMethodTestsConfig.LSM_RTREE_NUM_MUTABLE_COMPONENTS; } @@ -207,8 +207,8 @@ public class LSMRTreeTestHarness { return mergePolicy; } - public ILSMIOOperationCallback getIOOperationCallback() { - return ioOpCallback; + public ILSMIOOperationCallbackFactory getIOOperationCallbackFactory() { + return ioOpCallbackFactory; } public IMetadataPageManagerFactory getMetadataPageManagerFactory() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e32cb676/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 975a3d3..fcb00ed 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 @@ -32,7 +32,7 @@ import org.apache.hyracks.dataflow.common.utils.SerdeUtils; import org.apache.hyracks.storage.am.common.api.IMetadataPageManagerFactory; import org.apache.hyracks.storage.am.common.api.IPrimitiveValueProviderFactory; import org.apache.hyracks.storage.am.common.api.ITreeIndex; -import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback; +import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler; import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy; import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; @@ -77,8 +77,9 @@ public final class LSMRTreeWithAntiMatterTuplesTestContext extends AbstractRTree 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 { + ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler, + ILSMIOOperationCallbackFactory ioOpCallbackFactory, IMetadataPageManagerFactory metadataPageManagerFactory) + throws Exception { ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes); IBinaryComparatorFactory[] rtreeCmpFactories = SerdeUtils.serdesToComparatorFactories(fieldSerdes, numKeyFields); @@ -86,7 +87,7 @@ public final class LSMRTreeWithAntiMatterTuplesTestContext extends AbstractRTree SerdeUtils.serdesToComparatorFactories(fieldSerdes, fieldSerdes.length); LSMRTreeWithAntiMatterTuples lsmTree = LSMRTreeUtils.createLSMTreeWithAntiMatterTuples(ioManager, virtualBufferCaches, file, diskBufferCache, typeTraits, rtreeCmpFactories, btreeCmpFactories, - valueProviderFactories, rtreePolicyType, mergePolicy, opTracker, ioScheduler, ioOpCallback, + valueProviderFactories, rtreePolicyType, mergePolicy, opTracker, ioScheduler, ioOpCallbackFactory, LSMRTreeUtils.proposeBestLinearizer(typeTraits, rtreeCmpFactories.length), null, null, null, null, true, false, metadataPageManagerFactory); LSMRTreeWithAntiMatterTuplesTestContext testCtx =
