You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2021/07/28 07:02:22 UTC

[jackrabbit-oak] branch trunk updated: OAK-9434 - MongoDB indexing: implement parallel chunk download (#330)

This is an automated email from the ASF dual-hosted git repository.

amrverma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 1621b9d  OAK-9434 - MongoDB indexing: implement parallel chunk download (#330)
1621b9d is described below

commit 1621b9d56434ee4a6f2cd19863f94d963d68ac91
Author: Amrit Verma <av...@users.noreply.github.com>
AuthorDate: Wed Jul 28 12:31:56 2021 +0530

    OAK-9434 - MongoDB indexing: implement parallel chunk download (#330)
    
    * Using constant for flat-file-store dir name and improving its test
---
 .../index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java   | 4 +++-
 .../oak/index/indexer/document/flatfile/FlatFileStoreTest.java      | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
index ff4b4f8..f53f04c 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
@@ -37,6 +37,8 @@ import static java.util.Collections.unmodifiableSet;
 
 public class FlatFileNodeStoreBuilder {
 
+    static final String FLAT_FILE_STORE_DIR_NAME = "flat-file-store";
+
     public static final String OAK_INDEXER_USE_ZIP = "oak.indexer.useZip";
     /**
      * System property name for sort strategy. If this is true, we use {@link MultithreadedTraverseWithSortStrategy}, else
@@ -175,7 +177,7 @@ public class FlatFileNodeStoreBuilder {
     }
 
     File createStoreDir() throws IOException {
-        File dir = new File(workDir, "flat-file-store");
+        File dir = new File(workDir, FLAT_FILE_STORE_DIR_NAME);
         FileUtils.forceMkdir(dir);
         return dir;
     }
diff --git a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStoreTest.java b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStoreTest.java
index 222e48f..79b6f44 100644
--- a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStoreTest.java
+++ b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStoreTest.java
@@ -51,8 +51,10 @@ import org.slf4j.LoggerFactory;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singleton;
+import static org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileNodeStoreBuilder.FLAT_FILE_STORE_DIR_NAME;
 import static org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileNodeStoreBuilder.OAK_INDEXER_SORT_STRATEGY_TYPE;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 @SuppressWarnings("StaticPseudoFunctionalStyleMethod")
 public class FlatFileStoreTest {
@@ -164,7 +166,9 @@ public class FlatFileStoreTest {
         memoryManager.isMemoryLow = false;
         nsetf.interrupt = false;
         File oldDataDir = new File(BUILD_TARGET_FOLDER + "/old-data"+System.currentTimeMillis());
-        FileUtils.copyDirectory(folder.getRoot().listFiles()[0], oldDataDir);
+        File [] fileList = folder.getRoot().listFiles((pathName) -> FLAT_FILE_STORE_DIR_NAME.equals(pathName.getName()));
+        assertTrue(fileList != null && fileList.length == 1);
+        FileUtils.copyDirectory(fileList[0], oldDataDir);
         flatStore = spyBuilder.withBlobStore(new MemoryBlobStore())
                 .withPreferredPathElements(preferred)
                 .withLastModifiedBreakPoints(lastModifiedBreakpoints)