Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8BD09200BD4 for ; Fri, 16 Dec 2016 08:49:45 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8A617160B3C; Fri, 16 Dec 2016 07:49:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 12DF4160AF6 for ; Fri, 16 Dec 2016 08:49:43 +0100 (CET) Received: (qmail 90707 invoked by uid 500); 16 Dec 2016 07:49:43 -0000 Mailing-List: contact commits-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list commits@asterixdb.apache.org Received: (qmail 90694 invoked by uid 99); 16 Dec 2016 07:49:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2016 07:49:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1618FE0772; Fri, 16 Dec 2016 07:49:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: amoudi@apache.org To: commits@asterixdb.apache.org Date: Fri, 16 Dec 2016 07:49:43 -0000 Message-Id: <73d271e678ec4ea6afec85b492c75e57@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/9] asterixdb git commit: Remove Append Only Flag archived-at: Fri, 16 Dec 2016 07:49:45 -0000 Repository: asterixdb Updated Branches: refs/heads/master 87fa4d83e -> bc3d1b05c http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 1d53f5a..5a5913b 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 @@ -33,6 +33,8 @@ 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.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.ILSMIOOperationScheduler; @@ -74,6 +76,8 @@ public class LSMRTreeTestHarness { protected ILSMIOOperationCallback ioOpCallback; protected ILSMMergePolicy mergePolicy; protected ILSMOperationTracker opTracker; + protected IMetadataPageManagerFactory metadataPageManagerFactory = + new AppendOnlyLinkedMetadataPageManagerFactory(); protected final Random rnd = new Random(); protected final static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("ddMMyy-hhmmssSS"); @@ -213,4 +217,8 @@ public class LSMRTreeTestHarness { public ILSMIOOperationCallback getIOOperationCallback() { return ioOpCallback; } + + public IMetadataPageManagerFactory getMetadataPageManagerFactory() { + return metadataPageManagerFactory; + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 d3c82ff..5c6f6b7 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 @@ -29,6 +29,7 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.io.FileReference; import org.apache.hyracks.api.io.IIOManager; import org.apache.hyracks.dataflow.common.util.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; @@ -78,7 +79,8 @@ public final class LSMRTreeWithAntiMatterTuplesTestContext extends AbstractRTree FileReference file, IBufferCache diskBufferCache, IFileMapProvider diskFileMapProvider, ISerializerDeserializer[] fieldSerdes, IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeyFields, RTreePolicyType rtreePolicyType, ILSMMergePolicy mergePolicy, - ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallback ioOpCallback) + ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallback ioOpCallback, + IMetadataPageManagerFactory metadataPageManagerFactory) throws Exception { ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes); IBinaryComparatorFactory[] rtreeCmpFactories = SerdeUtils.serdesToComparatorFactories(fieldSerdes, @@ -90,7 +92,7 @@ public final class LSMRTreeWithAntiMatterTuplesTestContext extends AbstractRTree file, diskBufferCache, diskFileMapProvider, typeTraits, rtreeCmpFactories, btreeCmpFactories, valueProviderFactories, rtreePolicyType, mergePolicy, opTracker, ioScheduler, ioOpCallback, LSMRTreeUtils.proposeBestLinearizer(typeTraits, rtreeCmpFactories.length), null, null, null, null, true, - false); + false, metadataPageManagerFactory); LSMRTreeWithAntiMatterTuplesTestContext testCtx = new LSMRTreeWithAntiMatterTuplesTestContext(fieldSerdes, lsmTree); return testCtx; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 00154d8..4cc6c7d 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 @@ -55,7 +55,8 @@ public class RTreeBulkLoadTest extends AbstractRTreeBulkLoadTest { IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { return RTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), - harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType); + harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, + harness.getMetadataManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 4e13ceb..803a130 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 @@ -55,7 +55,8 @@ public class RTreeDeleteTest extends AbstractRTreeDeleteTest { IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { return RTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), - harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType); + harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, + harness.getMetadataManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 6fb5b5f..30ab9c2 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 @@ -55,7 +55,8 @@ public class RTreeExamplesTest extends AbstractRTreeExamplesTest { RTreePolicyType rtreePolicyType, int[] rtreeFields, int[] btreeFields, ITypeTraits[] filterTypeTraits, IBinaryComparatorFactory[] filterCmpFactories, int[] filterFields) throws TreeIndexException { return RTreeUtils.createRTree(harness.getBufferCache(), harness.getFileMapProvider(), typeTraits, - valueProviderFactories, rtreeCmpFactories, rtreePolicyType, harness.getFileReference(), true, false); + valueProviderFactories, rtreeCmpFactories, rtreePolicyType, harness.getFileReference(), false, + harness.getMetadataManagerFactory()); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 4382603..57a2ac3 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 @@ -55,7 +55,8 @@ public class RTreeInsertTest extends AbstractRTreeInsertTest { IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeys, RTreePolicyType rtreePolicyType) throws Exception { return RTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), - harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType); + harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, rtreePolicyType, + harness.getMetadataManagerFactory()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 631ebad..b7eb961 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 @@ -54,7 +54,8 @@ public class RTreeLifecycleTest extends AbstractIndexLifecycleTest { public void setup() throws Exception { harness.setUp(); testCtx = RTreeTestContext.create(harness.getBufferCache(), harness.getFileMapProvider(), - harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, RTreePolicyType.RTREE); + harness.getFileReference(), fieldSerdes, valueProviderFactories, numKeys, RTreePolicyType.RTREE, + harness.getMetadataManagerFactory()); index = testCtx.getIndex(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 9ed65df..96366b5 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 @@ -33,7 +33,7 @@ import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder; import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference; import org.apache.hyracks.dataflow.common.data.marshalling.IntegerSerializerDeserializer; import org.apache.hyracks.dataflow.common.util.TupleUtils; -import org.apache.hyracks.storage.am.common.api.IMetaDataPageManager; +import org.apache.hyracks.storage.am.common.api.IMetadataPageManager; import org.apache.hyracks.storage.am.common.api.IPrimitiveValueProviderFactory; import org.apache.hyracks.storage.am.common.api.ITreeIndexAccessor; import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor; @@ -119,7 +119,7 @@ public class RTreeSearchCursorTest extends AbstractRTreeTest { IRTreeInteriorFrame interiorFrame = (IRTreeInteriorFrame) interiorFrameFactory.createFrame(); IRTreeLeafFrame leafFrame = (IRTreeLeafFrame) leafFrameFactory.createFrame(); - IMetaDataPageManager freePageManager = new LinkedMetaDataPageManager(bufferCache, metaFrameFactory); + IMetadataPageManager freePageManager = new LinkedMetaDataPageManager(bufferCache, metaFrameFactory); RTree rtree = new RTree(bufferCache, harness.getFileMapProvider(), freePageManager, interiorFrameFactory, leafFrameFactory, cmpFactories, fieldCount, harness.getFileReference(), false); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 e4b5bcd..c8fec8c 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 @@ -62,7 +62,8 @@ public class RTreeMultiThreadTest extends AbstractRTreeMultiThreadTest { IBinaryComparatorFactory[] btreeCmpFactories, IPrimitiveValueProviderFactory[] valueProviderFactories, RTreePolicyType rtreePolicyType, int[] btreeFields) throws TreeIndexException { return RTreeUtils.createRTree(harness.getBufferCache(), harness.getFileMapProvider(), typeTraits, - valueProviderFactories, rtreeCmpFactories, rtreePolicyType, harness.getFileReference(), true, false); + valueProviderFactories, rtreeCmpFactories, rtreePolicyType, harness.getFileReference(), false, + harness.getMetadataManagerFactory()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 ca9cc32..fcfa811 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 @@ -25,6 +25,7 @@ import org.apache.hyracks.api.dataflow.value.ITypeTraits; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.io.FileReference; import org.apache.hyracks.dataflow.common.util.SerdeUtils; +import org.apache.hyracks.storage.am.common.api.IPageManagerFactory; import org.apache.hyracks.storage.am.common.api.IPrimitiveValueProviderFactory; import org.apache.hyracks.storage.am.common.api.ITreeIndex; import org.apache.hyracks.storage.am.rtree.AbstractRTreeTestContext; @@ -55,12 +56,13 @@ public class RTreeTestContext extends AbstractRTreeTestContext { public static RTreeTestContext create(IBufferCache bufferCache, IFileMapProvider fileMapProvider, FileReference file, ISerializerDeserializer[] fieldSerdes, - IPrimitiveValueProviderFactory[] valueProviderFactories, int numKeyFields, RTreePolicyType rtreePolicyType) + 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, true, false); + cmpFactories, rtreePolicyType, file, false, pageManagerFactory); RTreeTestContext testCtx = new RTreeTestContext(fieldSerdes, rtree); return testCtx; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 0d43ef6..288e81e 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 @@ -28,6 +28,8 @@ import org.apache.hyracks.api.context.IHyracksTaskContext; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.io.FileReference; import org.apache.hyracks.api.io.IIOManager; +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; @@ -50,11 +52,11 @@ public class RTreeTestHarness { protected final Random rnd = new Random(); protected final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("ddMMyy-hhmmssSS"); - protected final String tmpDir = System.getProperty("java.io.tmpdir"); - protected final String sep = System.getProperty("file.separator"); protected String fileName; protected FileReference file; + private IPageManagerFactory metadataPageManagerFactory = new LinkedMetadataPageManagerFactory(); + public RTreeTestHarness() { this.pageSize = AccessMethodTestsConfig.RTREE_PAGE_SIZE; this.numPages = AccessMethodTestsConfig.RTREE_NUM_PAGES; @@ -72,8 +74,8 @@ public class RTreeTestHarness { public void setUp() throws HyracksDataException { TestStorageManagerComponentHolder.init(pageSize, numPages, maxOpenFiles); IIOManager ioManager = TestStorageManagerComponentHolder.getIOManager(); - fileName = tmpDir + sep + simpleDateFormat.format(new Date()); - file = ioManager.resolveAbsolutePath(fileName); + fileName = simpleDateFormat.format(new Date()); + file = ioManager.resolve(fileName); ctx = TestUtils.create(getHyracksFrameSize()); bufferCache = TestStorageManagerComponentHolder.getBufferCache(ctx); fileMapProvider = TestStorageManagerComponentHolder.getFileMapProvider(ctx); @@ -82,7 +84,7 @@ public class RTreeTestHarness { public void tearDown() throws HyracksDataException { bufferCache.close(); - File f = new File(fileName); + File f = file.getFile(); f.deleteOnExit(); } @@ -125,4 +127,8 @@ public class RTreeTestHarness { public FileReference getFileReference() { return file; } + + public IPageManagerFactory getMetadataManagerFactory() { + return metadataPageManagerFactory; + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 7174a07..69f4a3c 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 @@ -42,11 +42,7 @@ import org.junit.Before; import org.junit.Test; public class BufferCacheRegressionTest { - protected static final String tmpDir = System.getProperty("java.io.tmpdir"); - protected static final String sep = System.getProperty("file.separator"); - - protected String fileName = tmpDir + sep + "flushTestFile"; - + protected String fileName = "flushTestFile"; private static final int PAGE_SIZE = 256; private static final int HYRACKS_FRAME_SIZE = PAGE_SIZE; private IHyracksTaskContext ctx = TestUtils.create(HYRACKS_FRAME_SIZE); @@ -83,7 +79,7 @@ public class BufferCacheRegressionTest { IFileMapProvider fmp = TestStorageManagerComponentHolder.getFileMapProvider(ctx); IOManager ioManager = TestStorageManagerComponentHolder.getIOManager(); - FileReference firstFileRef = ioManager.resolveAbsolutePath(fileName); + FileReference firstFileRef = ioManager.resolve(fileName); bufferCache.createFile(firstFileRef); int firstFileId = fmp.lookupFileId(firstFileRef); bufferCache.openFile(firstFileId); @@ -107,7 +103,7 @@ public class BufferCacheRegressionTest { } // Create a file with the same name. - FileReference secondFileRef = ioManager.resolveAbsolutePath(fileName); + FileReference secondFileRef = ioManager.resolve(fileName); bufferCache.createFile(secondFileRef); int secondFileId = fmp.lookupFileId(secondFileRef); @@ -123,7 +119,7 @@ public class BufferCacheRegressionTest { // ask the BufferCache to pin the page, because it would return the same // physical memory again, and for performance reasons pages are never // reset with 0's. - FileReference testFileRef = ioManager.resolveAbsolutePath(fileName); + FileReference testFileRef = ioManager.resolve(fileName); IFileHandle testFileHandle = ioManager.open(testFileRef, FileReadWriteMode.READ_ONLY, FileSyncMode.METADATA_SYNC_DATA_SYNC); ByteBuffer testBuffer = ByteBuffer.allocate(PAGE_SIZE + BufferCache.RESERVED_HEADER_BYTES); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/bc3d1b05/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 3cf3186..ed651bb 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 @@ -32,7 +32,6 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.exceptions.HyracksException; import org.apache.hyracks.api.io.FileReference; import org.apache.hyracks.api.io.IIOManager; -import org.apache.hyracks.control.nc.io.IOManager; import org.apache.hyracks.storage.common.buffercache.IBufferCache; import org.apache.hyracks.storage.common.buffercache.ICachedPage; import org.apache.hyracks.storage.common.file.BufferedFileHandle; @@ -46,8 +45,6 @@ import org.junit.Test; public class BufferCacheTest { protected static final List openedFiles = new ArrayList<>(); protected static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("ddMMyy-hhmmssSS"); - protected static final String tmpDir = System.getProperty("java.io.tmpdir"); - protected static final String sep = System.getProperty("file.separator"); private static final int PAGE_SIZE = 256; private static final int NUM_PAGES = 10; @@ -58,7 +55,7 @@ public class BufferCacheTest { private static final Random rnd = new Random(50); private String getFileName() { - String fileName = tmpDir + sep + simpleDateFormat.format(new Date()) + openedFiles.size(); + String fileName = simpleDateFormat.format(new Date()) + openedFiles.size(); openedFiles.add(fileName); return fileName; } @@ -70,7 +67,7 @@ public class BufferCacheTest { IFileMapProvider fmp = TestStorageManagerComponentHolder.getFileMapProvider(ctx); IIOManager ioManager = TestStorageManagerComponentHolder.getIOManager(); String fileName = getFileName(); - FileReference file = ioManager.resolveAbsolutePath(fileName); + FileReference file = ioManager.resolve(fileName); bufferCache.createFile(file); int fileId = fmp.lookupFileId(file); int num = 10; @@ -157,7 +154,7 @@ public class BufferCacheTest { for (int i = 0; i < MAX_OPEN_FILES; i++) { String fileName = getFileName(); - FileReference file = ioManager.resolveAbsolutePath(fileName); + FileReference file = ioManager.resolve(fileName); bufferCache.createFile(file); int fileId = fmp.lookupFileId(file); bufferCache.openFile(fileId); @@ -169,7 +166,7 @@ public class BufferCacheTest { // since all files are open, next open should fail try { String fileName = getFileName(); - FileReference file = ioManager.resolveAbsolutePath(fileName); + FileReference file = ioManager.resolve(fileName); bufferCache.createFile(file); int fileId = fmp.lookupFileId(file); bufferCache.openFile(fileId); @@ -187,7 +184,7 @@ public class BufferCacheTest { exceptionThrown = false; try { String fileName = getFileName(); - FileReference file = ioManager.resolveAbsolutePath(fileName); + FileReference file = ioManager.resolve(fileName); bufferCache.createFile(file); int fileId = fmp.lookupFileId(file); bufferCache.openFile(fileId); @@ -220,7 +217,7 @@ public class BufferCacheTest { // open max number of files and write some stuff into their first page for (int i = 0; i < MAX_OPEN_FILES; i++) { String fileName = getFileName(); - FileReference file = ioManager.resolveAbsolutePath(fileName); + FileReference file = ioManager.resolve(fileName); bufferCache.createFile(file); int fileId = fmp.lookupFileId(file); bufferCache.openFile(fileId); @@ -248,7 +245,7 @@ public class BufferCacheTest { // since all files are open, next open should fail try { String fileName = getFileName(); - FileReference file = ioManager.resolveAbsolutePath(fileName); + FileReference file = ioManager.resolve(fileName); bufferCache.createFile(file); int fileId = fmp.lookupFileId(file); bufferCache.openFile(fileId); @@ -270,7 +267,7 @@ public class BufferCacheTest { // now open a few new files for (int i = 0; i < filesToClose; i++) { String fileName = getFileName(); - FileReference file = ioManager.resolveAbsolutePath(fileName); + FileReference file = ioManager.resolve(fileName); bufferCache.createFile(file); int fileId = fmp.lookupFileId(file); bufferCache.openFile(fileId); @@ -280,7 +277,7 @@ public class BufferCacheTest { // since all files are open, next open should fail try { String fileName = getFileName(); - FileReference file = ioManager.resolveAbsolutePath(fileName); + FileReference file = ioManager.resolve(fileName); bufferCache.createFile(file); int fileId = fmp.lookupFileId(file); bufferCache.openFile(fileId);