svn commit: r1850231 - in /jackrabbit/oak/trunk: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/

[thomasm]

Author: thomasm
Date: Thu Jan  3 13:07:22 2019
New Revision: 1850231

URL: http://svn.apache.org/viewvc?rev=1850231&view=rev
Log:
OAK-7947 Lazy loading of Lucene index files startup (related changes)

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
    
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java?rev=1850231&r1=1850230&r2=1850231&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
 Thu Jan  3 13:07:22 2019
@@ -197,7 +197,7 @@ class OakStreamingIndexFile implements O
             } else if (pos < position) {
                 LOG.warn("Seeking back on streaming index file {}. Current 
position {}, requested position {}. " +
                                 "Please make sure that CopyOnRead and prefetch 
of index files are enabled.",
-                        getName(), position(), pos);
+                                dirDetails + "/" + getName(), position(), pos);
 
                 // seeking back on input stream. Close current one
                 IOUtils.closeQuietly(blobInputStream);

Modified: 
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java?rev=1850231&r1=1850230&r2=1850231&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
 Thu Jan  3 13:07:22 2019
@@ -730,11 +730,13 @@ public class FulltextIndexPlanner {
     }
 
     private long estimatedEntryCount() {
-        int numOfDocs = getNumDocs();
         if (useActualEntryCount) {
-            return definition.isEntryCountDefined() ? 
definition.getEntryCount() : numOfDocs;
+            if (definition.isEntryCountDefined()) {
+                return definition.getEntryCount();
+            }
+            return  getNumDocs();
         } else {
-            return estimatedEntryCount_Compat(numOfDocs);
+            return estimatedEntryCount_Compat(getNumDocs());
         }
     }