svn commit: r1808088 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/

[chetanm]

Author: chetanm
Date: Tue Sep 12 09:04:06 2017
New Revision: 1808088

URL: http://svn.apache.org/viewvc?rev=1808088&view=rev
Log:
OAK-6649 - Provide callback support for newly inserted entries in unique index

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java?rev=1808088&r1=1808087&r2=1808088&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java
 Tue Sep 12 09:04:06 2017
@@ -22,6 +22,7 @@ import static org.apache.jackrabbit.oak.
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 
@@ -48,14 +49,23 @@ public class UniqueEntryStoreStrategy im
 
     static final Logger LOG = 
LoggerFactory.getLogger(UniqueEntryStoreStrategy.class);
 
+    private static final Consumer<NodeBuilder> NOOP = (nb) -> {};
+
     private final String indexName;
 
+    private final Consumer<NodeBuilder> insertCallback;
+
     public UniqueEntryStoreStrategy() {
         this(INDEX_CONTENT_NODE_NAME);
     }
 
     public UniqueEntryStoreStrategy(String indexName) {
+        this(indexName, NOOP);
+    }
+
+    public UniqueEntryStoreStrategy(String indexName, Consumer<NodeBuilder> 
insertCallback) {
         this.indexName = indexName;
+        this.insertCallback = insertCallback;
     }
 
     @Override
@@ -95,7 +105,7 @@ public class UniqueEntryStoreStrategy im
         }
     }
     
-    private static void insert(NodeBuilder index, String key, String value) {
+    private void insert(NodeBuilder index, String key, String value) {
         ApproximateCounter.adjustCountSync(index, 1);
         NodeBuilder k = index.child(key);
         ArrayList<String> list = new ArrayList<String>();
@@ -114,6 +124,8 @@ public class UniqueEntryStoreStrategy im
         }
         PropertyState s2 = MultiStringPropertyState.stringProperty("entry", 
list);
         k.setProperty(s2);
+
+        insertCallback.accept(k);
     }
 
     @Override

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java?rev=1808088&r1=1808087&r2=1808088&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java
 Tue Sep 12 09:04:06 2017
@@ -23,14 +23,15 @@ import static org.apache.jackrabbit.oak.
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.iterableWithSize;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.jackrabbit.oak.query.index.FilterImpl;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -80,4 +81,19 @@ public class UniqueEntryStoreStrategyTes
         
         assertThat(hits, iterableWithSize(0));
     }
+
+    @Test
+    public void callbackInvoked() throws Exception{
+        AtomicBoolean callbackInvoked = new AtomicBoolean();
+        store = new UniqueEntryStoreStrategy(INDEX_CONTENT_NODE_NAME, (nb) -> 
callbackInvoked.set(true));
+
+        indexName = "foo";
+
+        NodeState root = EMPTY_NODE;
+        indexMeta = root.builder();
+        Supplier<NodeBuilder> index = memoize(() -> 
indexMeta.child(INDEX_CONTENT_NODE_NAME));
+        store.update(index, "/some/node1", null, null, EMPTY, 
newHashSet("key1"));
+
+        assertTrue(callbackInvoked.get());
+    }
 }