update

Author: wh1t3p1g

src/main/java/tabby/algo/PathFinding.java

@@ -80,8 +80,8 @@ depthFirst, new CommonJudgment()
     }
 
     @Procedure
-    @Description("tabby.algo.findJavaGadget(source, sinks, maxNodes, depthFirst) YIELD path, " +
-            "weight - run findJavaGadget with maxNodes from source to sink")
+    @Description("tabby.algo.findJavaGadget(source, sinks, maxNodes, depthFirst) YIELD path, weight" +
+            " - run findJavaGadget with maxNodes from source to sinks")
     public Stream<PathResult> findJavaGadget(
             @Name("startNode") Node startNode,
             @Name("endNodes") List<Node> endNodes,

src/main/java/tabby/evaluator/judgment/CommonJudgment.java

@@ -29,6 +29,21 @@ public Evaluation judge(Path path, State state, List<Node> endNodes, int maxDept
             }
         }else if(endNodes != null && endNodes.contains(node)){
             // 长度没到，但已经找到了endNode，停止进行
+//            Relationship relationship = path.lastRelationship();
+//            int[] position = state.getPositions(relationship.getId() + "");
+//            String pollutedStr = (String) node.getProperty("POLLUTED_POSITION", "[]");
+//            int[] polluted = JsonHelper.gson.fromJson(pollutedStr, int[].class);
+//            if(polluted != null && polluted.length > 0){
+//                Set<Integer> set = Transformer.intArrayToSet(position);
+//                boolean flag = true;
+//                for(int p:polluted){
+//                    if(!set.contains(p)){
+//                        flag = false;
+//                        break;
+//                    }
+//                }
+//                includes = flag;
+//            }
             continues = false;
         } else {
             includes = false;

src/main/java/tabby/expander/ForwardedPathExpander.java

@@ -31,8 +31,7 @@ public ForwardedPathExpander(boolean parallel, Processor processor) {
         this.processor = processor;
         String[] types = new String[]{"CALL>", "ALIAS>"};
         direction = Types.directionFor(types[0]);
-        relationshipTypes
-                = new RelationshipType[]{
+        relationshipTypes = new RelationshipType[]{
                     Types.relationshipTypeFor(types[0]),
                     Types.relationshipTypeFor(types[1])
                 };

src/main/java/tabby/help/Help.java

@@ -8,6 +8,7 @@
 import tabby.result.HelpResult;
 
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -38,13 +39,18 @@ public Stream<HelpResult> info(@Name("proc") String name) throws Exception {
         }
         String filter = " WHERE name starts with 'tabby.' " +
                 " AND ($name IS NULL  OR toLower(name) CONTAINS toLower($name) " +
-                " OR ($desc IS NOT NULL AND toLower(description) CONTAINS toLower($desc))) " +
-                "RETURN type, name, description, signature ";
-
-        String query = "WITH 'procedure' as type CALL dbms.procedures() yield name, description, signature " + filter +
-                " UNION ALL " +
-                "WITH 'function' as type CALL dbms.functions() yield name, description, signature " + filter;
-        return tx.execute(query, map("name", name, "desc", searchText ? name : null))
-                .stream().map(row -> new HelpResult(row, !extended.contains((String) row.get("name"))));
+                " OR ($desc IS NOT NULL AND toLower(description) CONTAINS toLower($desc))) ";
+
+        String proceduresQuery = "SHOW PROCEDURES yield name, description, signature " + filter +
+                "RETURN 'procedure' as type, name, description, signature ";
+
+        String functionsQuery = "SHOW FUNCTIONS yield name, description, signature " + filter +
+                "RETURN 'function' as type, name, description, signature ";
+        Map<String,Object> params = map( "name", name, "desc", searchText ? name : null );
+        Stream<Map<String,Object>> proceduresResults = tx.execute( proceduresQuery, params ).stream();
+        Stream<Map<String,Object>> functionsResults = tx.execute( functionsQuery, params ).stream();
+
+        return Stream.of( proceduresResults, functionsResults ).flatMap( results -> results.map(
+                row -> new HelpResult( row, !extended.contains( (String) row.get( "name" ) ) ) ) );
     }
 }

src/main/java/tabby/util/Transformer.java

@@ -0,0 +1,20 @@
+package tabby.util;
+
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author wh1t3p1g
+ * @since 2022/6/2
+ */
+public class Transformer {
+
+    public static int[] setToIntArray(Set<Integer> set){
+        return set.stream().mapToInt(Integer::intValue).toArray();
+    }
+
+    public static Set<Integer> intArrayToSet(int[] array){
+        return Arrays.stream(array).boxed().collect(Collectors.toSet());
+    }
+}