change expression engine

apache · Nov 22, 2021 · b8cc46c · b8cc46c
1 parent 7fb40dd
commit b8cc46c
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 32 deletions.
diff --git a/computer-algorithm/pom.xml b/computer-algorithm/pom.xml
@@ -23,9 +23,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.googlecode.aviator</groupId>
-            <artifactId>aviator</artifactId>
-            <version>3.0.1</version>
+            <groupId>org.mvel</groupId>
+            <artifactId>mvel2</artifactId>
+            <version>2.4.13.Final</version>
         </dependency>
     </dependencies>
 

diff --git a/.../src/main/java/com/baidu/hugegraph/computer/algorithm/path/rings/filter/SpreadFilter.java b/.../src/main/java/com/baidu/hugegraph/computer/algorithm/path/rings/filter/SpreadFilter.java
@@ -19,53 +19,64 @@
 
 package com.baidu.hugegraph.computer.algorithm.path.rings.filter;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.function.Predicate;
+
+import org.mvel2.MVEL;
 
 import com.baidu.hugegraph.computer.core.graph.edge.Edge;
 import com.baidu.hugegraph.computer.core.graph.value.Value;
 import com.baidu.hugegraph.computer.core.graph.vertex.Vertex;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.googlecode.aviator.AviatorEvaluator;
-import com.googlecode.aviator.Expression;
 
 public class SpreadFilter {
 
     private static final String ALL = "*";
     private static final String MESSAGE = "$message";
     private static final String ELEMENT = "$element";
-    private static final List<Expression> PASS = ImmutableList.of();
+    private static final List<Serializable> PASS = ImmutableList.of();
 
-    private final Map<String, Expression> vertexFilter;
-    private final Map<String, Expression> edgeFilter;
+    private final Map<String, Serializable> vertexFilter;
+    private final Map<String, Serializable> edgeSpreadFilter;
+    private final Map<String, Serializable> edgeFilter;
 
     public SpreadFilter(String describe) {
-        FilterDescribe filter = FilterDescribe.of(describe);
+        FilterDescribe des = FilterDescribe.of(describe);
 
         this.vertexFilter = new HashMap<>();
+        this.edgeSpreadFilter = new HashMap<>();
         this.edgeFilter = new HashMap<>();
 
-        this.init(this.vertexFilter, filter.vertexFilter());
-        this.init(this.edgeFilter, filter.edgeFilter());
+        this.init(this.vertexFilter, des.vertexFilter(), expression -> true);
+        this.init(this.edgeSpreadFilter, des.edgeFilter(), expression -> true);
+        // TODO: Use a better scheme to parse expressions with only $element
+        this.init(this.edgeFilter, des.edgeFilter(), expression -> {
+            return !expression.contains(MESSAGE);
+        });
     }
 
-    private void init(Map<String, Expression> filter,
-                      List<FilterDescribe.DescribeItem> describes) {
+    private void init(Map<String, Serializable> filter,
+                      List<FilterDescribe.DescribeItem> describes,
+                      Predicate<? super String> predicate) {
         for (FilterDescribe.DescribeItem describe : describes) {
             String labelName = describe.label();
-            Expression expression = AviatorEvaluator.compile(
-                                                     describe.propertyFilter());
-            filter.put(labelName, expression);
+            String propertyFilter = describe.propertyFilter();
+            if (predicate.test(propertyFilter) || ALL.equals(labelName)) {
+                Serializable expression = MVEL.compileExpression(
+                                               describe.propertyFilter());
+                filter.put(labelName, expression);
+            }
         }
     }
 
     public boolean filter(Vertex vertex) {
         String label = vertex.label();
-        List<Expression> expressions = expressions(this.vertexFilter, label);
+        List<Serializable> expressions = expressions(this.vertexFilter, label);
 
         if (expressions == PASS) {
             return true;
@@ -78,27 +89,21 @@ public boolean filter(Vertex vertex) {
 
     public boolean filter(Edge edge) {
         String label = edge.label();
-        List<Expression> expressions = expressions(this.edgeFilter, label);
+        List<Serializable> expressions = expressions(this.edgeFilter, label);
 
         if (expressions == PASS) {
             return true;
         }
 
-        expressions = expressions.stream()
-                                 .filter(expression -> {
-                                     return !expression.getVariableNames()
-                                                       .contains(MESSAGE);
-                                 })
-                                 .collect(Collectors.toList());
-
         Map<String, Map<String, Value<?>>> params =
                     ImmutableMap.of(ELEMENT, edge.properties().get());
         return filter(params, expressions);
     }
 
     public boolean filter(Edge edge, RingsDetectionValue message) {
         String label = edge.label();
-        List<Expression> expressions = expressions(this.edgeFilter, label);
+        List<Serializable> expressions = expressions(this.edgeSpreadFilter,
+                                                     label);
 
         if (expressions == PASS) {
             return true;
@@ -111,20 +116,22 @@ public boolean filter(Edge edge, RingsDetectionValue message) {
     }
 
     private static boolean filter(Map<String, Map<String, Value<?>>> params,
-                                  List<Expression> expressions) {
+                                  List<Serializable> expressions) {
         Map<String, Object> map = convertParamsValueToObject(params);
         return expressions.stream()
                           .allMatch(expression -> {
-                              return (Boolean) expression.execute(map);
+                              return (Boolean) MVEL.executeExpression(
+                                                    expression, map);
                           });
     }
 
-    private static List<Expression> expressions(Map<String, Expression> filter,
-                                                String label) {
+    private static List<Serializable> expressions(
+                                      Map<String, Serializable> filter,
+                                      String label) {
         if (filter.size() == 0) {
             return PASS;
         }
-        List<Expression> expressions = new ArrayList<>();
+        List<Serializable> expressions = new ArrayList<>();
         if (filter.containsKey(ALL)) {
             expressions.add(filter.get(ALL));
         }