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 fr...@apache.org on 2018/11/01 10:59:35 UTC
svn commit: r1845440 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
CachingSegmentReader.java LoggingHook.java SegmentNodeStore.java
SegmentNodeStoreRegistrar.java tool/LoggingHook.java util/SafeEncode.java
Author: frm
Date: Thu Nov 1 10:59:35 2018
New Revision: 1845440
URL: http://svn.apache.org/viewvc?rev=1845440&view=rev
Log:
OAK-7872 - Make LoggingHook private to o.a.j.o.segment
Added:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java
- copied, changed from r1845439, jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/LoggingHook.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/SafeEncode.java (with props)
Removed:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/LoggingHook.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java?rev=1845440&r1=1845439&r2=1845440&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java Thu Nov 1 10:59:35 2018
@@ -21,10 +21,12 @@ package org.apache.jackrabbit.oak.segmen
import static com.google.common.base.Preconditions.checkNotNull;
+import java.io.UnsupportedEncodingException;
+
import com.google.common.base.Function;
import com.google.common.base.Supplier;
import org.apache.jackrabbit.oak.cache.CacheStats;
-import org.apache.jackrabbit.oak.segment.tool.LoggingHook;
+import org.apache.jackrabbit.oak.segment.util.SafeEncode;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.stats.MeterStats;
@@ -129,10 +131,18 @@ public class CachingSegmentReader implem
});
}
+ private static String safeEncode(String value) {
+ try {
+ return SafeEncode.safeEncode(value);
+ } catch (UnsupportedEncodingException e) {
+ return "ERROR: " + e;
+ }
+ }
+
@NotNull
@Override
public SegmentNodeState readNode(@NotNull RecordId id) {
- LOG.trace(System.currentTimeMillis() + " " + LoggingHook.urlEncode(Thread.currentThread().getName()) + " n? " + id.toString());
+ LOG.trace(System.currentTimeMillis() + " " + safeEncode(Thread.currentThread().getName()) + " n? " + id.toString());
return new SegmentNodeState(this, writer, blobStore, id, readStats);
}
@@ -146,7 +156,7 @@ public class CachingSegmentReader implem
@Override
public SegmentPropertyState readProperty(
@NotNull RecordId id, @NotNull PropertyTemplate template) {
- LOG.trace(System.currentTimeMillis() + " " + LoggingHook.urlEncode(Thread.currentThread().getName()) + " p? " + id.toString());
+ LOG.trace(System.currentTimeMillis() + " " + safeEncode(Thread.currentThread().getName()) + " p? " + id.toString());
return new SegmentPropertyState(this, id, template);
}
Copied: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java (from r1845439, jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/LoggingHook.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/LoggingHook.java&r1=1845439&r2=1845440&rev=1845440&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/LoggingHook.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java Thu Nov 1 10:59:35 2018
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.segment.tool;
+package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
@@ -25,13 +25,12 @@ import static org.apache.jackrabbit.oak.
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.function.Consumer;
import org.apache.jackrabbit.oak.api.Blob;
-import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
+import org.apache.jackrabbit.oak.segment.util.SafeEncode;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -46,7 +45,7 @@ public class LoggingHook implements Comm
this.writer = writer;
}
- public static LoggingHook newLoggingHook(final Consumer<String> writer) {
+ static LoggingHook newLoggingHook(final Consumer<String> writer) {
return new LoggingHook(writer);
}
@@ -76,9 +75,17 @@ public class LoggingHook implements Comm
return true;
}
+ private static String safeEncode(String value) {
+ try {
+ return SafeEncode.safeEncode(value);
+ } catch (UnsupportedEncodingException e) {
+ return "ERROR: " + e;
+ }
+ }
+
@Override
public boolean childNodeAdded(String name, NodeState after) {
- log("n+ " + urlEncode(name));
+ log("n+ " + safeEncode(name));
this.enter(null, after);
boolean ret = after.compareAgainstBaseState(EmptyNodeState.EMPTY_NODE, this);
this.leave(null, after);
@@ -87,7 +94,7 @@ public class LoggingHook implements Comm
@Override
public boolean childNodeChanged(String name, NodeState before, NodeState after) {
- log("n^ " + urlEncode(name));
+ log("n^ " + safeEncode(name));
this.enter(before, after);
boolean ret = after.compareAgainstBaseState(before, this);
this.leave(before, after);
@@ -96,13 +103,13 @@ public class LoggingHook implements Comm
@Override
public boolean childNodeDeleted(String name, NodeState before) {
- log("n- " + urlEncode(name));
+ log("n- " + safeEncode(name));
return true;
}
private static String toString(final PropertyState ps) {
final StringBuilder val = new StringBuilder(); // TODO: an output stream would certainly be better
- val.append(urlEncode(ps.getName()));
+ val.append(safeEncode(ps.getName()));
val.append(" <");
val.append(ps.getType());
val.append("> ");
@@ -120,26 +127,16 @@ public class LoggingHook implements Comm
} else if (ps.isArray()) {
val.append("= [");
ps.getValue(STRINGS).forEach((String s) -> {
- val.append(urlEncode(s));
+ val.append(safeEncode(s));
val.append(',');
});
replaceOrAppendLastChar(val, ',', ']');
} else {
- val.append("= ").append(urlEncode(ps.getValue(STRING)));
+ val.append("= ").append(safeEncode(ps.getValue(STRING)));
}
return val.toString();
}
- public static String urlEncode(String s) {
- String ret;
- try {
- ret = URLEncoder.encode(s, "UTF-8").replace("%2F", "/").replace("%3A", ":");
- } catch (UnsupportedEncodingException ex) {
- ret = "ERROR: " + ex.toString();
- }
- return ret;
- }
-
private static void replaceOrAppendLastChar(StringBuilder b, char oldChar, char newChar) {
if (b.charAt(b.length() - 1) == oldChar) {
b.setCharAt(b.length() - 1, newChar);
@@ -149,7 +146,7 @@ public class LoggingHook implements Comm
}
private void log(String s) {
- writer.accept(System.currentTimeMillis() + " " + urlEncode(Thread.currentThread().getName()) + " " + s);
+ writer.accept(System.currentTimeMillis() + " " + safeEncode(Thread.currentThread().getName()) + " " + s);
}
private static void appendBlob(StringBuilder sb, Blob blob) {
@@ -168,10 +165,11 @@ public class LoggingHook implements Comm
@NotNull
@Override
- public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) throws CommitFailedException {
+ public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) {
this.enter(before, after);
after.compareAgainstBaseState(before, this);
this.leave(before, after);
return after;
}
+
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java?rev=1845440&r1=1845439&r2=1845440&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java Thu Nov 1 10:59:35 2018
@@ -38,7 +38,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.segment.scheduler.Commit;
import org.apache.jackrabbit.oak.segment.scheduler.LockBasedScheduler;
import org.apache.jackrabbit.oak.segment.scheduler.Scheduler;
-import org.apache.jackrabbit.oak.segment.tool.LoggingHook;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java?rev=1845440&r1=1845439&r2=1845440&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java Thu Nov 1 10:59:35 2018
@@ -61,7 +61,6 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
import org.apache.jackrabbit.oak.segment.split.SplitPersistence;
-import org.apache.jackrabbit.oak.segment.tool.LoggingHook;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
import org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo;
Added: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/SafeEncode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/SafeEncode.java?rev=1845440&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/SafeEncode.java (added)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/SafeEncode.java Thu Nov 1 10:59:35 2018
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.segment.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+public class SafeEncode {
+
+ private SafeEncode() {
+ // Prevent instantiation.
+ }
+
+ /**
+ * Encodes the input string by translating special characters into escape
+ * sequences. The resulting string is encoded according to the rules for URL
+ * encoding with the exception of the forward slashes and the colon, which
+ * are left as-is.
+ *
+ * @param s A UTF-8 string.
+ * @return The encoded string.
+ * @throws UnsupportedEncodingException
+ */
+ public static String safeEncode(String s) throws UnsupportedEncodingException {
+ return URLEncoder.encode(s, "UTF-8").replace("%2F", "/").replace("%3A", ":");
+ }
+
+}
Propchange: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/SafeEncode.java
------------------------------------------------------------------------------
svn:eol-style = native