OAK-8603: Composite Node Store + Counter Index: allow indexing from s…

…cratch / reindex

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1867371 13f79535-47bb-0310-9956-ffa450edef68

oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditor.java

@@ -159,7 +159,11 @@ private void leaveNew() throws CommitFailedException {
         }
         root.callback.indexUpdate();
         for (Map.Entry<Mount, Integer> e : countOffsets.entrySet()) {
-            NodeBuilder builder = getBuilder(e.getKey());
+            Mount mount = e.getKey();
+            if (mount.isReadOnly()) {
+                continue;
+            }
+            NodeBuilder builder = getBuilder(mount);
             int countOffset = e.getValue();
 
             PropertyState p = builder.getProperty(COUNT_HASH_PROPERTY_NAME);

oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreLuceneIndexTest.java

@@ -47,6 +47,7 @@
 import static org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.shutdown;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 
 @SuppressWarnings("ConstantConditions")
@@ -113,6 +114,19 @@ public void addIndexInReadWriteWithIndexExistinginReadOnly() throws Exception {
         repoV1.setupIndexAndContentInRepo("luceneTest", "foo", true, VERSION_1);
     }
 
+    @Test
+    public void reindexCounterIndex() throws Exception {
+        Session s = repoV1.getSession();
+        Node c = s.getRootNode().getNode(INDEX_DEFINITIONS_NAME).getNode("counter");
+
+        c.setProperty("async", (String) null);
+        c.setProperty("resolution", 1);
+        c.setProperty("reindex", true);
+        s.save();
+
+        assertFalse(c.getProperty("reindex").getBoolean());
+    }
+
     /**
      * Given a composite jcr repo with a lucene index with indexed data from both read only and read write parts
      * We create a V2 of this repo which will have the lucene index removed -