svn commit: r1810644 - /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java

[ch...@apache.org]

Author: chetanm
Date: Tue Oct  3 05:09:39 2017
New Revision: 1810644

URL: http://svn.apache.org/viewvc?rev=1810644&view=rev
Log:
OAK-6535 - Synchronous Lucene Property Indexes

Configure CommitContext with merge commits done by cleaner

Modified:
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java?rev=1810644&r1=1810643&r2=1810644&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java Tue Oct  3 05:09:39 2017
@@ -29,14 +29,17 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.base.Stopwatch;
+import com.google.common.collect.ImmutableMap;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.plugins.index.AsyncIndexInfo;
 import org.apache.jackrabbit.oak.plugins.index.AsyncIndexInfoService;
 import org.apache.jackrabbit.oak.plugins.index.IndexPathService;
 import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
+import org.apache.jackrabbit.oak.spi.commit.CommitContext;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.commit.SimpleCommitContext;
 import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -225,8 +228,7 @@ public class PropertyIndexCleaner implem
     private void merge(NodeBuilder builder) throws CommitFailedException {
         //TODO Configure conflict hooks
         //TODO Configure validator
-        //Configure CommitContext
-        nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+        nodeStore.merge(builder, EmptyHook.INSTANCE, createCommitInfo());
     }
 
     private Map<String, Long> getAsyncInfo() {
@@ -242,6 +244,11 @@ public class PropertyIndexCleaner implem
         return infos;
     }
 
+    private static CommitInfo createCommitInfo() {
+        Map<String, Object> info = ImmutableMap.of(CommitContext.NAME, new SimpleCommitContext());
+        return new CommitInfo(CommitInfo.OAK_UNKNOWN, CommitInfo.OAK_UNKNOWN, info);
+    }
+
     private static NodeBuilder child(NodeBuilder nb, String path) {
         for (String name : PathUtils.elements(checkNotNull(path))) {
             //Use getChildNode to avoid creating new entries by default