Author: adulceanu
Date: Mon Nov 5 09:34:23 2018
New Revision: 1845764
URL: http://svn.apache.org/viewvc?rev=1845764&view=rev
Log:
OAK-7882 - Inconsistent handling of cloud-prefix causes segment-copy to fail
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java?rev=1845764&r1=1845763&r2=1845764&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
Mon Nov 5 09:34:23 2018
@@ -66,7 +66,7 @@ class CompactCommand implements Command
if (path.startsWith("az:")) {
code = AzureCompact.builder()
- .withPath(path.substring(3))
+ .withPath(path)
.withForce(isTrue(forceArg.value(options)))
.withSegmentCacheSize(Integer.getInteger("cache", 256))
.withGCLogInterval(Long.getLong("compaction-progress-log",
150000))
Modified:
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java?rev=1845764&r1=1845763&r2=1845764&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java
Mon Nov 5 09:34:23 2018
@@ -95,7 +95,7 @@ public class ToolUtils {
switch (storeType) {
case AZURE:
- CloudBlobDirectory cloudBlobDirectory =
createCloudBlobDirectory(pathOrUri);
+ CloudBlobDirectory cloudBlobDirectory =
createCloudBlobDirectory(pathOrUri.substring(3));
persistence = new AzurePersistence(cloudBlobDirectory);
break;
default:
