You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2016/08/11 11:26:34 UTC
svn commit: r1755941 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/
oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/
oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/ ...
Author: tomekr
Date: Thu Aug 11 11:26:34 2016
New Revision: 1755941
URL: http://svn.apache.org/viewvc?rev=1755941&view=rev
Log:
OAK-4626: Use oak-upgrade to init the local cache nodestore (reverted)
Reverted the commit r1754841.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/PathFilteringDiff.java
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/cli/MigrationFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java?rev=1755941&r1=1755940&r2=1755941&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java Thu Aug 11 11:26:34 2016
@@ -44,7 +44,7 @@ import static org.apache.jackrabbit.oak.
* so as to expose it as an {@link AbstractDocumentNodeState} by extracting
* the meta properties which are stored as hidden properties
*/
-public class DelegatingDocumentNodeState extends AbstractDocumentNodeState {
+class DelegatingDocumentNodeState extends AbstractDocumentNodeState {
//Hidden props holding DocumentNodeState meta properties
static final String PROP_PATH = ":doc-path";
static final String PROP_REVISION = ":doc-rev";
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/PathFilteringDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/PathFilteringDiff.java?rev=1755941&r1=1755940&r2=1755941&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/PathFilteringDiff.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/PathFilteringDiff.java Thu Aug 11 11:26:34 2016
@@ -36,7 +36,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
-public class PathFilteringDiff extends ApplyDiff {
+class PathFilteringDiff extends ApplyDiff {
private static final Logger logger = LoggerFactory.getLogger(PathFilteringDiff.class);
private final DiffContext ctx;
private final AbstractDocumentNodeState parent;
@@ -100,7 +100,7 @@ public class PathFilteringDiff extends A
return (AbstractDocumentNodeState) state;
}
- public static void copyMetaProperties(AbstractDocumentNodeState state, NodeBuilder builder) {
+ static void copyMetaProperties(AbstractDocumentNodeState state, NodeBuilder builder) {
builder.setProperty(asPropertyState(PROP_REVISION, state.getRootRevision()));
builder.setProperty(asPropertyState(PROP_LAST_REV, state.getLastRevision()));
builder.setProperty(createProperty(PROP_PATH, state.getPath()));
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=1755941&r1=1755940&r2=1755941&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 Thu Aug 11 11:26:34 2016
@@ -30,19 +30,11 @@ import com.google.common.base.Function;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState;
-import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
-import org.apache.jackrabbit.oak.plugins.document.NodeStateDiffer;
-import org.apache.jackrabbit.oak.plugins.document.secondary.DelegatingDocumentNodeState;
-import org.apache.jackrabbit.oak.plugins.document.secondary.PathFilteringDiff;
-import org.apache.jackrabbit.oak.plugins.index.PathFilter;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
-import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
-import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -105,8 +97,6 @@ public class RepositorySidegrade {
private boolean skipInitialization = false;
- private boolean addSecondaryMetadata = false;
-
private List<CommitHook> customCommitHooks = null;
VersionCopyConfiguration versionCopyConfiguration = new VersionCopyConfiguration();
@@ -231,10 +221,6 @@ public class RepositorySidegrade {
this.skipInitialization = skipInitialization;
}
- public void setAddSecondaryMetadata(boolean addSecondaryMetadata) {
- this.addSecondaryMetadata = addSecondaryMetadata;
- }
-
/**
* Same as {@link #copy(RepositoryInitializer)}, but with no custom initializer.
*/
@@ -278,33 +264,11 @@ public class RepositorySidegrade {
}
copyState(sourceRoot, targetRoot);
- if (addSecondaryMetadata && source instanceof DocumentNodeStore) {
- doAddSecondaryMetadata();
- }
} catch (Exception e) {
throw new RepositoryException("Failed to copy content", e);
}
}
- private void doAddSecondaryMetadata() throws CommitFailedException {
- LOG.info("Copying secondary metadata");
-
- AbstractDocumentNodeState sourceRoot = (AbstractDocumentNodeState) source.getRoot();
- NodeState secondaryRoot = target.getRoot();
-
- NodeState base = DelegatingDocumentNodeState.wrapIfPossible(secondaryRoot, NodeStateDiffer.DEFAULT_DIFFER);
- NodeBuilder builder = secondaryRoot.builder();
-
- // Copy the root node meta properties
- PathFilteringDiff.copyMetaProperties(sourceRoot, builder);
-
- // Apply the rest of properties
- ApplyDiff diff = new PathFilteringDiff(builder, new PathFilter(includePaths, excludePaths), sourceRoot);
- sourceRoot.compareAgainstBaseState(base, diff);
-
- target.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- }
-
private void removeCheckpointReferences(NodeBuilder builder) throws CommitFailedException {
// removing references to the checkpoints,
// which don't exist in the new repository
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java?rev=1755941&r1=1755940&r2=1755941&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java Thu Aug 11 11:26:34 2016
@@ -118,7 +118,6 @@ public class MigrationFactory {
sidegrade.setFilterLongNames(stores.getSrcType().isSupportLongNames() && !stores.getDstType().isSupportLongNames());
sidegrade.setSkipInitialization(options.isSkipInitialization());
sidegrade.setIncludeIndex(options.isIncludeIndex());
- sidegrade.setAddSecondaryMetadata(options.isAddSecondaryMetadata());
return sidegrade;
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java?rev=1755941&r1=1755940&r2=1755941&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java Thu Aug 11 11:26:34 2016
@@ -30,8 +30,6 @@ public class MigrationOptions {
private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
- private static final boolean ADD_SECONDARY_METADATA = Boolean.getBoolean("oak.upgrade.addSecondaryMetadata");
-
private final boolean copyBinariesByReference;
private final boolean mmap;
@@ -149,10 +147,6 @@ public class MigrationOptions {
return ignoreMissingBinaries;
}
- public boolean isAddSecondaryMetadata() {
- return ADD_SECONDARY_METADATA;
- }
-
private void logOptions() {
if (copyBinariesByReference) {
log.info("DataStore needs to be shared with new repository");
@@ -208,10 +202,6 @@ public class MigrationOptions {
log.info("Missing binaries won't break the migration");
}
- if (ADD_SECONDARY_METADATA) {
- log.info("Secondary metadata will be added");
- }
-
log.info("Cache size: {} MB", cacheSizeInMB);
}