svn commit: r1784168 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

[ch...@apache.org]

Author: chetanm
Date: Thu Feb 23 16:23:39 2017
New Revision: 1784168

URL: http://svn.apache.org/viewvc?rev=1784168&view=rev
Log:
OAK-5791 - Reduce number of calls while adding a new node

Fix test logic to count correctly

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1784168&r1=1784167&r2=1784168&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Thu Feb 23 16:23:39 2017
@@ -2918,32 +2918,43 @@ public class DocumentNodeStoreTest {
 
         ws.reset();
 
+        System.out.println("======");
         builder = ns.getRoot().builder();
         builder.child("a").child("b").child("c");
         merge(ns, builder);
+        System.out.println("======");
 
-        assertEquals(2, ws.count);
+        assertEquals(1, ws.count);
     }
 
     private static class WriteCountingStore extends MemoryDocumentStore {
+        private final ThreadLocal<Boolean> createMulti = new ThreadLocal<>();
         int count;
 
         @Override
         public <T extends Document> T createOrUpdate(Collection<T> collection, UpdateOp update) {
-            incrementCounter(collection);
+            if (createMulti.get() == null) {
+                if (collection == Collection.NODES) System.out.println("createOrUpdate " + update);
+                incrementCounter(collection);
+            }
             return super.createOrUpdate(collection, update);
         }
 
         @Override
         public <T extends Document> List<T> createOrUpdate(Collection<T> collection, List<UpdateOp> updateOps) {
-            if (updateOps.size() != 1) { //For size == 1 previous method gets called internally which inflates the count
-                incrementCounter(collection);
+            incrementCounter(collection);
+            if (collection == Collection.NODES) System.out.println( "createOrUpdate (multi) " + updateOps);
+            try {
+                createMulti.set(true);
+                return super.createOrUpdate(collection, updateOps);
+            } finally {
+                createMulti.remove();
             }
-            return super.createOrUpdate(collection, updateOps);
         }
 
         @Override
         public <T extends Document> T findAndUpdate(Collection<T> collection, UpdateOp update) {
+            if (collection == Collection.NODES) System.out.println( "findAndUpdate " + update);
             incrementCounter(collection);
             return super.findAndUpdate(collection, update);
         }