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 al...@apache.org on 2014/05/27 22:03:11 UTC
svn commit: r1597865 - in
/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak:
explorer/ explorer/Explorer.java explorer/NodeStoreTree.java
explorer/SegmentExplorer.java explorer/SegmentTree.java run/Main.java
segmentexplorer/
Author: alexparvulescu
Date: Tue May 27 20:03:10 2014
New Revision: 1597865
URL: http://svn.apache.org/r1597865
Log:
OAK-1858 Segment Explorer
- refactored package names, class names
Added:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/
- copied from r1597847, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java
- copied, changed from r1597847, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/SegmentExplorer.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java
- copied, changed from r1597847, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/SegmentTree.java
Removed:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentExplorer.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTree.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java (from r1597847, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/SegmentExplorer.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/SegmentExplorer.java&r1=1597847&r2=1597865&rev=1597865&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/SegmentExplorer.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/Explorer.java Tue May 27 20:03:10 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.segmentexplorer;
+package org.apache.jackrabbit.oak.explorer;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
@@ -33,15 +33,21 @@ import javax.swing.UIManager.LookAndFeel
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
-public class SegmentExplorer {
+/**
+ * NodeStore explorer
+ *
+ * GUI based on Swing, for now it is tailored to the TarMK
+ *
+ */
+public class Explorer {
public static void main(String[] args) throws IOException {
- new SegmentExplorer(args);
+ new Explorer(args);
}
- public SegmentExplorer(String[] args) throws IOException {
+ public Explorer(String[] args) throws IOException {
if (args.length == 0) {
- System.err.println("usage: explore <path> [/content/path...]");
+ System.err.println("usage: explore <path>");
System.exit(1);
}
@@ -82,7 +88,7 @@ public class SegmentExplorer {
log.setLineWrap(true);
log.setEditable(false);
- SegmentTree treePanel = new SegmentTree(store, log);
+ NodeStoreTree treePanel = new NodeStoreTree(store, log);
GridBagConstraints c = new GridBagConstraints();
c.fill = GridBagConstraints.BOTH;
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java (from r1597847, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/SegmentTree.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/SegmentTree.java&r1=1597847&r2=1597865&rev=1597865&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segmentexplorer/SegmentTree.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java Tue May 27 20:03:10 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.segmentexplorer;
+package org.apache.jackrabbit.oak.explorer;
import java.awt.GridLayout;
import java.io.File;
@@ -56,7 +56,7 @@ import org.apache.jackrabbit.oak.spi.sta
import com.google.common.collect.Lists;
import com.google.common.escape.Escapers;
-public class SegmentTree extends JPanel implements TreeSelectionListener {
+class NodeStoreTree extends JPanel implements TreeSelectionListener {
private final DefaultTreeModel treeModel;
private final JTree tree;
@@ -65,7 +65,7 @@ public class SegmentTree extends JPanel
private final Map<String, Set<UUID>> index;
private final Map<RecordId, Long[]> sizeCache;
- public SegmentTree(FileStore store, JTextArea log) {
+ public NodeStoreTree(FileStore store, JTextArea log) {
super(new GridLayout(1, 0));
this.log = log;
@@ -185,7 +185,8 @@ public class SegmentTree extends JPanel
sb.append(newline);
}
- sb.append("Child nodes (count: " + s.getChildNodeCount(Long.MAX_VALUE) + ")");
+ sb.append("Child nodes (count: "
+ + s.getChildNodeCount(Long.MAX_VALUE) + ")");
sb.append(newline);
for (ChildNodeEntry ce : s.getChildNodeEntries()) {
sb.append(" + " + ce.getName());
@@ -222,18 +223,18 @@ public class SegmentTree extends JPanel
private String toString(PropertyState ps, int index) {
if (ps.getType().tag() == PropertyType.BINARY) {
- return "<" + FileUtils.byteCountToDisplaySize(ps.getValue(Type.BINARY, index).length())+ " >";
+ return "<"
+ + FileUtils.byteCountToDisplaySize(ps.getValue(Type.BINARY,
+ index).length()) + " >";
} else if (ps.getType().tag() == PropertyType.STRING) {
String value = ps.getValue(Type.STRING, index);
if (value.length() > 60) {
- value = value.substring(0, 57)
- + "... (" + value.length() + " chars)";
+ value = value.substring(0, 57) + "... (" + value.length()
+ + " chars)";
}
- String escaped = Escapers.builder()
- .setSafeRange(' ', '~')
- .addEscape('"', "\\\"")
- .addEscape('\\', "\\\\")
- .build().escape(value);
+ String escaped = Escapers.builder().setSafeRange(' ', '~')
+ .addEscape('"', "\\\"").addEscape('\\', "\\\\").build()
+ .escape(value);
return '"' + escaped + '"';
} else {
return ps.getValue(Type.STRING, index);
@@ -244,8 +245,10 @@ public class SegmentTree extends JPanel
SegmentId segmentId = id.getSegmentId();
for (Entry<String, Set<UUID>> path2Uuid : index.entrySet()) {
for (UUID uuid : path2Uuid.getValue()) {
- if (uuid.getMostSignificantBits() == segmentId.getMostSignificantBits()
- && uuid.getLeastSignificantBits() == segmentId.getLeastSignificantBits()) {
+ if (uuid.getMostSignificantBits() == segmentId
+ .getMostSignificantBits()
+ && uuid.getLeastSignificantBits() == segmentId
+ .getLeastSignificantBits()) {
return new File(path2Uuid.getKey()).getName();
}
}
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1597865&r1=1597864&r2=1597865&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Tue May 27 20:03:10 2014
@@ -53,6 +53,7 @@ import org.apache.jackrabbit.oak.api.Con
import org.apache.jackrabbit.oak.benchmark.BenchmarkRunner;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.console.Console;
+import org.apache.jackrabbit.oak.explorer.Explorer;
import org.apache.jackrabbit.oak.fixture.OakFixture;
import org.apache.jackrabbit.oak.http.OakServlet;
import org.apache.jackrabbit.oak.jcr.Jcr;
@@ -66,7 +67,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
import org.apache.jackrabbit.oak.scalability.ScalabilityRunner;
-import org.apache.jackrabbit.oak.segmentexplorer.SegmentExplorer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade;
@@ -124,7 +124,7 @@ public class Main {
ScalabilityRunner.main(args);
break;
case EXPLORE:
- SegmentExplorer.main(args);
+ Explorer.main(args);
break;
default:
System.err.println("Unknown command: " + mode);