Author: chetanm Date: Fri Oct 20 11:44:54 2017 New Revision: 1812734 URL: http://svn.apache.org/viewvc?rev=1812734&view=rev Log: OAK-6851 - Disabled index with reindex flag enabled should not lead to reindex report
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java?rev=1812734&r1=1812733&r2=1812734&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java Fri Oct 20 11:44:54 2017 @@ -31,6 +31,7 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_ASYNC_PROPERTY_NAME; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_COUNT; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME; +import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_DISABLED; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE; import static org.apache.jackrabbit.oak.spi.commit.CompositeEditor.compose; @@ -215,6 +216,12 @@ public class IndexUpdate implements Edit return false; } + //Do not attempt reindex of disabled indexes + PropertyState type = definition.getProperty(TYPE_PROPERTY_NAME); + if (type != null && TYPE_DISABLED.equals(type.getValue(Type.STRING))) { + return false; + } + PropertyState ps = definition.getProperty(REINDEX_PROPERTY_NAME); if (ps != null && ps.getValue(BOOLEAN)) { return !rootState.ignoreReindexFlags; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java?rev=1812734&r1=1812733&r2=1812734&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java Fri Oct 20 11:44:54 2017 @@ -194,7 +194,7 @@ public class IndexingProgressReporter im if (!log.isDebugEnabled() && !st.reindex) { continue; } - if (st.updateCount > 0) { + if (st.updateCount > 0 || st.reindex) { pw.printf(" - %s%n", st); } } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java?rev=1812734&r1=1812733&r2=1812734&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java Fri Oct 20 11:44:54 2017 @@ -27,6 +27,7 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_ASYNC_PROPERTY_NAME; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_COUNT; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME; +import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_DISABLED; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME; import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition; import static org.apache.jackrabbit.oak.InitialContent.INITIAL_CONTENT; @@ -47,14 +48,17 @@ import java.util.concurrent.atomic.Atomi import javax.annotation.Nonnull; +import ch.qos.logback.classic.Level; import com.google.common.collect.Maps; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; +import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.plugins.index.IndexUpdate.MissingIndexProviderStrategy; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexLookup; +import org.apache.jackrabbit.oak.plugins.index.reference.ReferenceEditorProvider; import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; @@ -912,6 +916,42 @@ public class IndexUpdateTest { assertFalse(indexed.getChildNode("oak:index").getChildNode("newIndex").getBoolean(IndexConstants.DISABLE_INDEXES_ON_NEXT_CYCLE)); } + @Test + public void reindexForDisabledIndexes() throws Exception{ + EditorHook hook = new EditorHook( + new IndexUpdateProvider(new CompositeIndexEditorProvider( + new PropertyIndexEditorProvider(), + new ReferenceEditorProvider() + ))); + + NodeState before = builder.getNodeState(); + createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME), + "fooIndex", true, false, ImmutableSet.of("foo"), null); + builder.child("testRoot").setProperty("foo", "abc"); + NodeState after = builder.getNodeState(); + + NodeState indexed = hook.processCommit(before, after, CommitInfo.EMPTY); + + before = indexed; + builder = before.builder(); + builder.getChildNode("oak:index").getChildNode("fooIndex").setProperty(TYPE_PROPERTY_NAME, TYPE_DISABLED); + builder.getChildNode("oak:index").getChildNode("fooIndex").setProperty(REINDEX_PROPERTY_NAME, true); + after = builder.getNodeState(); + + LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class.getName()).filter(Level.INFO).create(); + customLogs.starting(); + + before = after; + builder = before.builder(); + builder.child("testRoot2").setProperty("foo", "abc"); + after = builder.getNodeState(); + indexed = hook.processCommit(before, after, CommitInfo.EMPTY); + + assertTrue(customLogs.getLogs().isEmpty()); + customLogs.finished(); + + } + private static void markCorrupt(NodeBuilder builder, String indexName) { builder.getChildNode(INDEX_DEFINITIONS_NAME).getChildNode(indexName) .setProperty(IndexConstants.CORRUPT_PROPERTY_NAME, ISO8601.format(Calendar.getInstance()));