svn commit: r1689008 - in /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene: IndexCopier.java IndexTracker.java LuceneIndexEditor.java

[al...@apache.org]

Author: alexparvulescu
Date: Fri Jul  3 12:32:35 2015
New Revision: 1689008

URL: http://svn.apache.org/r1689008
Log:
OAK-3069 Provide option to eagerly copy the new index files in CopyOnRead
 - minor logging tweaks

Modified:
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java?rev=1689008&r1=1689007&r2=1689008&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java Fri Jul  3 12:32:35 2015
@@ -386,6 +386,8 @@ public class IndexCopier implements Copy
                         invalidFileCount.incrementAndGet();
                     } else {
                         reference.markValid();
+                        log.trace("[{}] found local copy of file {}",
+                                indexPath, name);
                     }
                 }
                 success = true;
@@ -474,8 +476,9 @@ public class IndexCopier implements Copy
             filesToBeDeleted = new HashSet<String>(filesToBeDeleted);
             filesToBeDeleted.removeAll(failedToDelete);
             if(!filesToBeDeleted.isEmpty()) {
-                log.debug("Following files have been removed from Lucene " +
-                        "index directory [{}]", filesToBeDeleted);
+                log.debug(
+                        "[{}] Following files have been removed from Lucene index directory {}",
+                        indexPath, filesToBeDeleted);
             }
         }
 

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java?rev=1689008&r1=1689007&r2=1689008&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java Fri Jul  3 12:32:35 2015
@@ -96,7 +96,7 @@ class IndexTracker {
                     try {
                         long start = PERF_LOGGER.start();
                         IndexNode index = IndexNode.open(path, root, after, cloner);
-                        PERF_LOGGER.end(start, -1, "Index found to be updated at [{}]. Reopening the IndexNode", path);
+                        PERF_LOGGER.end(start, -1, "[{}] Index found to be updated. Reopening the IndexNode", path);
                         updates.put(path, index); // index can be null
                     } catch (IOException e) {
                         log.error("Failed to open Lucene index at " + path, e);

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1689008&r1=1689007&r2=1689008&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java Fri Jul  3 12:32:35 2015
@@ -533,7 +533,7 @@ public class LuceneIndexEditor implement
         if (type == null || !isSupportedMediaType(type)) {
             log.trace(
                     "[{}] Ignoring binary content for node {} due to unsupported (or null) jcr:mimeType [{}]",
-                    getIndexName(), nodePath, type);
+                    getIndexName(), path, type);
             return fields;
         }