Author: chetanm
Date: Thu Dec 21 06:31:53 2017
New Revision: 1818883
URL: http://svn.apache.org/viewvc?rev=1818883&view=rev
Log:
OAK-7102 - Refactor DocumentIndexer logic to enable different sort approaches
Move sizeOf method to utils
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStoreUtils.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStoreUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStoreUtils.java?rev=1818883&r1=1818882&r2=1818883&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStoreUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStoreUtils.java
Thu Dec 21 06:31:53 2017
@@ -29,6 +29,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+import java.util.List;
import java.util.zip.Deflater;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
@@ -63,4 +64,8 @@ class FlatFileStoreUtils {
}
return new BufferedWriter(new OutputStreamWriter(out, UTF_8));
}
+
+ public static long sizeOf(List<File> sortedFiles) {
+ return sortedFiles.stream().mapToLong(File::length).sum();
+ }
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java?rev=1818883&r1=1818882&r2=1818883&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java
Thu Dec 21 06:31:53 2017
@@ -40,6 +40,7 @@ import static org.apache.commons.io.File
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileStoreUtils.createReader;
import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileStoreUtils.createWriter;
+import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileStoreUtils.sizeOf;
public class NodeStateEntrySorter {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -171,10 +172,6 @@ public class NodeStateEntrySorter {
return new File(file.getParentFile(), baseName + "-sorted." +
extension);
}
- private static long sizeOf(List<File> sortedFiles) {
- return sortedFiles.stream().mapToLong(File::length).sum();
- }
-
/**
* This method calls the garbage collector and then returns the free
* memory. This avoids problems with applications where the GC hasn't
