svn commit: r1792719 - in /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade: RepositorySidegrade.java RepositoryUpgrade.java

[tomekr]

Author: tomekr
Date: Wed Apr 26 09:20:36 2017
New Revision: 1792719

URL: http://svn.apache.org/viewvc?rev=1792719&view=rev
Log:
OAK-6131: No need to rebuild the counter/uuid index anymore

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1792719&r1=1792718&r2=1792719&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 Wed Apr 26 09:20:36 2017
@@ -68,7 +68,6 @@ import static org.apache.jackrabbit.oak.
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.calculateEffectiveIncludePaths;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.createIndexEditorProvider;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.createTypeEditorProvider;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.markIndexesToBeRebuilt;
 import static 
org.apache.jackrabbit.oak.upgrade.nodestate.NodeStateCopier.copyProperties;
 import static 
org.apache.jackrabbit.oak.upgrade.version.VersionCopier.copyVersionStorage;
 import static 
org.apache.jackrabbit.oak.upgrade.version.VersionHistoryUtil.getVersionStorage;
@@ -312,7 +311,6 @@ public class RepositorySidegrade {
                 }
                 hooks.add(new EditorHook(new 
VersionableEditor.Provider(sourceRoot, getWorkspaceName(), 
versionCopyConfiguration)));
             }
-            markIndexesToBeRebuilt(targetRoot);
             // type validation, reference and indexing hooks
             hooks.add(new EditorHook(new CompositeEditorProvider(
                     createTypeEditorProvider(),

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1792719&r1=1792718&r2=1792719&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
 Wed Apr 26 09:20:36 2017
@@ -155,8 +155,6 @@ public class RepositoryUpgrade {
 
     private static final int LOG_NODE_COPY = 
Integer.getInteger("oak.upgrade.logNodeCopy", 10000);
 
-    private static final Set<String> INDEXES_TO_REBUILD = 
ImmutableSet.of("counter", "uuid");
-
     public static final Set<String> DEFAULT_INCLUDE_PATHS = ALL;
 
     public static final Set<String> DEFAULT_EXCLUDE_PATHS = NONE;
@@ -544,8 +542,6 @@ public class RepositoryUpgrade {
                 hooks.addAll(customCommitHooks);
             }
 
-            markIndexesToBeRebuilt(targetBuilder);
-
             // type validation, reference and indexing hooks
             hooks.add(new EditorHook(new CompositeEditorProvider(
                 createTypeEditorProvider(),
@@ -560,21 +556,6 @@ public class RepositoryUpgrade {
         }
     }
 
-    static void markIndexesToBeRebuilt(NodeBuilder targetRoot) {
-        NodeBuilder oakIndex = IndexUtils.getOrCreateOakIndex(targetRoot);
-        for (String indexName : INDEXES_TO_REBUILD) {
-            final NodeBuilder indexDef = oakIndex.getChildNode(indexName);
-            if (!indexDef.exists()) {
-                continue;
-            }
-            final PropertyState reindex = 
indexDef.getProperty(REINDEX_PROPERTY_NAME);
-            logger.info("Marking {} to be reindexed", indexName);
-            if (reindex == null || !reindex.getValue(Type.BOOLEAN)) {
-                indexDef.setProperty(REINDEX_PROPERTY_NAME, true);
-            }
-        }
-    }
-
     private boolean overrideEarlyShutdown() {
         if (earlyShutdown == false) {
             return false;
@@ -1021,10 +1002,6 @@ public class RepositoryUpgrade {
         private final boolean earlyShutdown;
         private final RepositoryContext source;
 
-        public LoggingCompositeHook(Collection<CommitHook> hooks) {
-          this(hooks, null, false);
-      }
-
         public LoggingCompositeHook(Collection<CommitHook> hooks,
                   RepositoryContext source, boolean earlyShutdown) {
             this.hooks = hooks;