svn commit: r1818882 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java

[chetanm]

Author: chetanm
Date: Thu Dec 21 05:02:58 2017
New Revision: 1818882

URL: http://svn.apache.org/viewvc?rev=1818882&view=rev
Log:
OAK-7102 - Refactor DocumentIndexer logic to enable different sort approaches

Fix the file name logic

Modified:
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java?rev=1818882&r1=1818881&r2=1818882&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java
 Thu Dec 21 05:02:58 2017
@@ -69,8 +69,9 @@ class StoreAndSortStrategy {
     private File sortStoreFile(File storeFile) throws IOException {
         File sortWorkDir = new File(storeFile.getParent(), "sort-work-dir");
         FileUtils.forceMkdir(sortWorkDir);
+        File sortedFile = new File(storeFile.getParentFile(), 
getSortedStoreFileName());
         NodeStateEntrySorter sorter =
-                new NodeStateEntrySorter(comparator, storeFile, sortWorkDir);
+                new NodeStateEntrySorter(comparator, storeFile, sortWorkDir, 
sortedFile);
 
         logFlags();
 
@@ -107,4 +108,8 @@ class StoreAndSortStrategy {
     private String getStoreFileName() {
         return compressionEnabled ? "store.json.zip" : "store.json";
     }
+
+    private String getSortedStoreFileName() {
+        return compressionEnabled ? "store-sorted.json.zip" : 
"store-sorted.json";
+    }
 }