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

[chetanm]

Author: chetanm
Date: Fri Dec  8 07:27:02 2017
New Revision: 1817467

URL: http://svn.apache.org/viewvc?rev=1817467&view=rev
Log:
OAK-6353 - Use Document order traversal for reindexing performed on 
DocumentNodeStore setups

Fix memory computation

Modified:
    
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/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=1817467&r1=1817466&r2=1817467&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
 Fri Dec  8 07:27:02 2017
@@ -72,12 +72,12 @@ public class NodeStateEntrySorter {
     }
 
     public void setMaxMemoryInGB(long maxMemoryInGb) {
-        this.maxMemory = maxMemory * ONE_GB;
+        this.maxMemory = maxMemoryInGb * ONE_GB;
     }
 
     public void sort() throws IOException {
         long estimatedMemory = estimateAvailableMemory();
-        long memory = Math.max(estimatedMemory, maxMemory);
+        long memory = Math.min(estimatedMemory, maxMemory);
         log.info("Sorting with memory {} (estimated {})", 
humanReadableByteCount(memory), humanReadableByteCount(estimatedMemory));
         Stopwatch w = Stopwatch.createStarted();