Skip to content

Add graph view filtering and label wrapping #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stalep wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add graph view filtering and label wrapping #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<h5m.benchmark.warmup>5</h5m.benchmark.warmup>

<h5m.cli.native>true</h5m.cli.native>
<lib.aesh>3.5</lib.aesh>
<lib.aesh>3.6.1</lib.aesh>

<!-- dependencies -->
<lib.duckdb>1.4.4.0</lib.duckdb>
Expand Down
76 changes: 59 additions & 17 deletions src/main/java/io/hyperfoil/tools/h5m/cli/ListNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
import io.hyperfoil.tools.h5m.api.Node;
import io.hyperfoil.tools.h5m.api.NodeGroup;
import io.hyperfoil.tools.h5m.api.svc.NodeGroupServiceInterface;
import io.hyperfoil.tools.h5m.entity.NodeEntity;
import jakarta.inject.Inject;
import jakarta.transaction.Transactional;
import org.aesh.util.graph.GraphStyle;
import picocli.CommandLine;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.stream.Collectors;

import org.aesh.util.graph.Graph;
import org.aesh.util.graph.GraphNode;
Expand All @@ -32,6 +30,16 @@ public static enum Render {Table, Graph};

@CommandLine.Option(names = {"as"}, description = "Valid values: ${COMPLETION-CANDIDATES}\")", defaultValue = "Table") Render render;

@CommandLine.Option(names = {"--hide"}, description = "hide nodes matching suffix pattern (comma-separated, e.g. _primary,_alt)", arity = "0..1") String hidePattern;

@CommandLine.Option(names = {"--type"}, description = "filter by node type (comma-separated, e.g. sql,ecma,fp,rd)", arity = "0..1") String typeFilter;

@CommandLine.Option(names = {"--depth"}, description = "max depth from root", arity = "0..1", defaultValue = "0") int maxDepth;

@CommandLine.Option(names = {"--show-type"}, description = "prefix node labels with [type]", defaultValue = "true") boolean showType;

@CommandLine.Option(names = {"--max-label-width"}, description = "wrap labels at word boundaries when wider than N chars (0 = no wrap)", defaultValue = "30") int maxLabelWidth;

@Override
@Transactional
public Integer call() throws Exception {
Expand All @@ -47,13 +55,31 @@ public Integer call() throws Exception {
return 1;
}
if(render.equals(Render.Graph)){
GraphNode rootNode = GraphNode.of("root");
Set<String> skipNames = new HashSet<>();
if (hidePattern != null) {
List<String> suffixes = Arrays.stream(hidePattern.split(",")).map(String::trim).toList();
for (Node source : nodeGroup.sources()) {
for (String suffix : suffixes) {
if (source.name().endsWith(suffix)) {
skipNames.add(source.name());
break;
}
}
}
}

Set<String> types = typeFilter != null
? Arrays.stream(typeFilter.split(",")).map(String::trim).collect(Collectors.toSet())
: Collections.emptySet();

String rootLabel = showType ? "[root] root" : "root";
GraphNode rootNode = GraphNode.of(rootLabel);
Map<Node,GraphNode> nodes = new HashMap<>();
nodes.put(nodeGroup.root(), rootNode);
for(Node source: nodeGroup.sources()){
walk(source,nodes);
}
System.out.println(Graph.render(rootNode, GraphStyle.ROUNDED));
for(Node source: nodeGroup.sources()){
walk(source, nodes, skipNames, types, 1, maxDepth, showType);
}
System.out.println(Graph.render(rootNode, GraphStyle.ROUNDED, 0, maxLabelWidth));
}else {
System.out.println(
ListCmd.table(80,nodeGroup.sources(),List.of("name","type","fqdn","operation"),
Expand All @@ -69,18 +95,34 @@ public Integer call() throws Exception {
return 0;
}

public GraphNode walk(Node node, Map<Node,GraphNode> nodes){
public GraphNode walk(Node node, Map<Node,GraphNode> nodes, Set<String> skipNames,
Set<String> typeFilter, int depth, int maxDepth, boolean showType){
if(nodes.containsKey(node)){
return nodes.get(node);
}else{
GraphNode rtrn = GraphNode.of(node.name());
}
if(maxDepth > 0 && depth > maxDepth){
return null;
}

boolean skip = skipNames.contains(node.name())
|| (!typeFilter.isEmpty() && !typeFilter.contains(node.type().display()));

GraphNode rtrn = null;
if (!skip) {
String label = showType ? "[" + node.type().display() + "] " + node.name() : node.name();
rtrn = GraphNode.of(label);
nodes.put(node, rtrn);
for(Node source: node.sources()){
GraphNode fromSource = walk(source,nodes);
fromSource.child(rtrn);
}
return rtrn;
}

for(Node source: node.sources()){
GraphNode fromSource = walk(source, nodes, skipNames, typeFilter, depth + 1, maxDepth, showType);
if(rtrn != null && fromSource != null){
fromSource.child(rtrn);
} else if(rtrn != null && nodes.containsKey(source)){
nodes.get(source).child(rtrn);
}
}
return rtrn;
}

}
Loading