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 2017/08/22 16:30:31 UTC
svn commit: r1805793 - in /jackrabbit/oak/trunk:
oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/
oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/
Author: frm
Date: Tue Aug 22 16:30:31 2017
New Revision: 1805793
URL: http://svn.apache.org/viewvc?rev=1805793&view=rev
Log:
OAK-6569 - Use file names instead of paths in TarFiles
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java?rev=1805793&r1=1805792&r2=1805793&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java Tue Aug 22 16:30:31 2017
@@ -37,7 +37,6 @@ import static org.apache.jackrabbit.oak.
import java.awt.*;
import java.io.Closeable;
-import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -403,7 +402,7 @@ class NodeStoreTree extends JPanel imple
Set<UUID> uuids = newHashSet();
for (Entry<String, Set<UUID>> e : index.entrySet()) {
if (e.getKey().endsWith(file)) {
- sb.append("SegmentNodeState references to ").append(new File(e.getKey()).getName());
+ sb.append("SegmentNodeState references to ").append(e.getKey());
sb.append(newline);
uuids = e.getValue();
break;
@@ -454,7 +453,7 @@ class NodeStoreTree extends JPanel imple
sb.append(newline);
for (Entry<String, Set<UUID>> e : index.entrySet()) {
if (e.getValue().contains(id)) {
- sb.append("Tar file: ").append(new File(e.getKey()).getName());
+ sb.append("Tar file: ").append(e.getKey());
sb.append(newline);
break;
}
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java?rev=1805793&r1=1805792&r2=1805793&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java Tue Aug 22 16:30:31 2017
@@ -20,13 +20,13 @@ package org.apache.jackrabbit.oak.explor
import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Sets.newHashSet;
import static java.util.Collections.reverseOrder;
-import static java.util.Collections.sort;
import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
import java.io.File;
import java.io.IOException;
import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.ArrayDeque;
+import java.util.ArrayList;
import java.util.Deque;
import java.util.Iterator;
import java.util.List;
@@ -137,11 +137,8 @@ class SegmentTarExplorerBackend implemen
@Override
public List<String> getTarFiles() {
- List<String> files = newArrayList();
- for (String p : store.getTarReaderIndex().keySet()) {
- files.add(new File(p).getName());
- }
- sort(files, reverseOrder());
+ List<String> files = new ArrayList<>(store.getTarReaderIndex().keySet());
+ files.sort(reverseOrder());
return files;
}
@@ -377,10 +374,10 @@ class SegmentTarExplorerBackend implemen
}
private String getFile(SegmentId segmentId) {
- for (Entry<String, Set<UUID>> path2Uuid : index.entrySet()) {
- for (UUID uuid : path2Uuid.getValue()) {
+ for (Entry<String, Set<UUID>> nameToId : index.entrySet()) {
+ for (UUID uuid : nameToId.getValue()) {
if (uuid.equals(segmentId.asUUID())) {
- return new File(path2Uuid.getKey()).getName();
+ return nameToId.getKey();
}
}
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java?rev=1805793&r1=1805792&r2=1805793&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java Tue Aug 22 16:30:31 2017
@@ -741,7 +741,7 @@ public class TarFiles implements Closeab
Map<String, Set<UUID>> index = new HashMap<>();
for (TarReader reader : iterable(head)) {
- index.put(reader.getFile().getAbsolutePath(), reader.getUUIDs());
+ index.put(reader.getFile().getName(), reader.getUUIDs());
}
return index;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java?rev=1805793&r1=1805792&r2=1805793&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java Tue Aug 22 16:30:31 2017
@@ -235,8 +235,8 @@ public class TarFilesTest {
writeSegmentWithReferences(d, b, c);
tarFiles.newWriter();
- File file = new File(tarFiles.getIndices().keySet().iterator().next());
- Map<UUID, List<UUID>> graph = tarFiles.getGraph(file.getName());
+ String file = tarFiles.getIndices().keySet().iterator().next();
+ Map<UUID, List<UUID>> graph = tarFiles.getGraph(file);
Set<UUID> keys = new HashSet<>();
addAll(keys, a, b, c, d);