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 md...@apache.org on 2018/04/03 13:38:18 UTC
svn commit: r1828237 - in /jackrabbit/oak/trunk/oak-segment-tar/src:
main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/
test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/
Author: mduerig
Date: Tue Apr 3 13:38:17 2018
New Revision: 1828237
URL: http://svn.apache.org/viewvc?rev=1828237&view=rev
Log:
OAK-5655: TarMK: Analyse locality of reference
Typo
Added:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java
- copied, changed from r1827987, jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTrace.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java
- copied, changed from r1827987, jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTraceTest.java
Removed:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTrace.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTraceTest.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerRunner.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java
Copied: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java (from r1827987, jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTrace.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTrace.java&r1=1827987&r2=1828237&rev=1828237&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTrace.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java Tue Apr 3 13:38:17 2018
@@ -37,13 +37,13 @@ import com.google.common.collect.Immutab
import org.apache.jackrabbit.oak.spi.state.NodeState;
/**
- * A breath first traversal trace.
+ * A breadth first traversal trace.
* <p>
- * When {@link Trace#run(NodeState) run} this trace performs a breath first traversal starting
+ * When {@link Trace#run(NodeState) run} this trace performs a breadth first traversal starting
* from the passed node up to a certain depth. It logs the current depth and the number of
* traversed nodes as additional {@link IOTracer#setContext(List) context}.
*/
-public class BreathFirstTrace implements Trace {
+public class BreadthFirstTrace implements Trace {
/**
* The context specification of this trace.
@@ -64,12 +64,12 @@ public class BreathFirstTrace implements
private final AtomicInteger nodeCount = new AtomicInteger();
/**
- * Create a new instance of a breath first traversal trace.
+ * Create a new instance of a breadth first traversal trace.
* @param depth maximal depth of the nodes to traverse
* @param path path of the root node where to start traversing
* @param context consumer to pass the additional context to
*/
- public BreathFirstTrace(int depth, @Nonnull String path, @Nonnull Consumer<List<String>> context) {
+ public BreadthFirstTrace(int depth, @Nonnull String path, @Nonnull Consumer<List<String>> context) {
checkArgument(depth >= 0);
this.depth = depth;
Copied: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java (from r1827987, jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTraceTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTraceTest.java&r1=1827987&r2=1828237&rev=1828237&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreathFirstTraceTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java Tue Apr 3 13:38:17 2018
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Test;
-public class BreathFirstTraceTest {
+public class BreadthFirstTraceTest {
@Nonnull
private static NodeState createTree(int depth) {
@@ -46,7 +46,7 @@ public class BreathFirstTraceTest {
@Test
public void testTraverseEmptyTree() {
List<List<String>> trace = newArrayList();
- new BreathFirstTrace(4, "/", trace::add).run(createTree(0));
+ new BreadthFirstTrace(4, "/", trace::add).run(createTree(0));
assertEquals(1, trace.size());
assertEquals(ImmutableList.of("0", "1"), trace.get(0));
}
@@ -54,7 +54,7 @@ public class BreathFirstTraceTest {
@Test
public void testTraverseDepth1Tree() {
List<List<String>> trace = newArrayList();
- new BreathFirstTrace(4, "/", trace::add).run(createTree(1));
+ new BreadthFirstTrace(4, "/", trace::add).run(createTree(1));
assertEquals(2, trace.size());
assertEquals(ImmutableList.of("0", "1"), trace.get(0));
assertEquals(ImmutableList.of("1", "2"), trace.get(1));
@@ -63,7 +63,7 @@ public class BreathFirstTraceTest {
@Test
public void testTraverseDepth2Tree() {
List<List<String>> trace = newArrayList();
- new BreathFirstTrace(4, "/", trace::add).run(createTree(2));
+ new BreadthFirstTrace(4, "/", trace::add).run(createTree(2));
assertEquals(3, trace.size());
assertEquals(ImmutableList.of("0", "1"), trace.get(0));
assertEquals(ImmutableList.of("1", "2"), trace.get(1));
@@ -73,7 +73,7 @@ public class BreathFirstTraceTest {
@Test
public void testTraverseDepth3TreeWithLimit2() {
List<List<String>> trace = newArrayList();
- new BreathFirstTrace(2, "/", trace::add).run(createTree(3));
+ new BreadthFirstTrace(2, "/", trace::add).run(createTree(3));
assertEquals(3, trace.size());
assertEquals(ImmutableList.of("0", "1"), trace.get(0));
assertEquals(ImmutableList.of("1", "2"), trace.get(1));
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerRunner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerRunner.java?rev=1828237&r1=1828236&r2=1828237&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerRunner.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerRunner.java Tue Apr 3 13:38:17 2018
@@ -86,7 +86,7 @@ public class IOTracerRunner extends IOMo
public void collectTrace() throws IOException, InvalidFileStoreVersionException {
checkArgument(INPUT != null, "No segment store directory specified");
System.out.println(format(
- "Breath first traversing %d levels of %s starting at %s", DEPTH, INPUT, PATH));
+ "Breadth first traversing %d levels of %s starting at %s", DEPTH, INPUT, PATH));
System.out.println(
format("mmap=%b, segment cache=%d", MMAP, SEGMENT_CACHE));
System.out.println(format("Writing trace to %s", OUTPUT));
@@ -114,9 +114,9 @@ public class IOTracerRunner extends IOMo
.withSegmentCacheSize(segmentCacheSize)
.withIOMonitor(ioMonitor));
- IOTracer ioTracer = newIOTracer(factory, out, BreathFirstTrace.CONTEXT_SPEC);
+ IOTracer ioTracer = newIOTracer(factory, out, BreadthFirstTrace.CONTEXT_SPEC);
ioTracer.collectTrace(
- new BreathFirstTrace(depth, path, ioTracer::setContext));
+ new BreadthFirstTrace(depth, path, ioTracer::setContext));
}
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java?rev=1828237&r1=1828236&r2=1828237&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java Tue Apr 3 13:38:17 2018
@@ -95,9 +95,9 @@ public class IOTracerTest extends IOMoni
try (StringWriter out = new StringWriter()) {
Function<IOMonitor, FileStore> factory = this::createFileStore;
- IOTracer ioTracer = newIOTracer(factory, out, BreathFirstTrace.CONTEXT_SPEC);
+ IOTracer ioTracer = newIOTracer(factory, out, BreadthFirstTrace.CONTEXT_SPEC);
ioTracer.collectTrace(
- new BreathFirstTrace(2, "/", ioTracer::setContext));
+ new BreadthFirstTrace(2, "/", ioTracer::setContext));
try (BufferedReader reader = new BufferedReader(new StringReader(out.toString()))) {
Optional<String> header = reader.lines().findFirst();