Merge pull request #1 from Louyk14/identity

Add union+identity test && Identity e2e Test
Louyk14 · Aug 17, 2023 · 01c90d1 · 01c90d1
2 parents 4bde357 + eadfbc8
commit 01c90d1
Show file tree

Hide file tree

Showing 4 changed files with 150 additions and 1 deletion.
diff --git a/...in/java/com/alibaba/graphscope/gremlin/integration/suite/standard/IrGremlinQueryTest.java b/...in/java/com/alibaba/graphscope/gremlin/integration/suite/standard/IrGremlinQueryTest.java
@@ -78,6 +78,12 @@ public abstract class IrGremlinQueryTest extends AbstractGremlinProcessTest {
 
     public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_group_by_by_mean();
 
+    public abstract Traversal<Vertex, Object> get_g_V_identity_values();
+
+    public abstract Traversal<Vertex, Object> get_g_V_haslabel_as_identity_values();
+
+    public abstract Traversal<Vertex, Object> get_g_V_has_union_identity_out_values();
+
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @Test
     public void g_V_group_by_by_dedup_count_test() {
@@ -311,6 +317,61 @@ public void g_V_group_by_by_mean() {
         Assert.assertEquals(4, result.size());
     }
 
+    @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+    @Test
+    public void g_V_haslabel_identity() {
+        Traversal<Vertex, Object> traversal =
+                this.get_g_V_identity_values();
+        this.printTraversalForm(traversal);
+        int counter = 0;
+
+        List<String> expected = Arrays.asList("1", "2", "3", "4", "5", "6");
+
+        while (traversal.hasNext()) {
+            Object result = traversal.next();
+            Assert.assertTrue(expected.contains(result.toString()));
+            ++counter;
+            System.out.println(result.toString());
+        }
+    }
+
+    @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+    @Test
+    public void g_V_haslabel_as_identity_values() {
+        Traversal<Vertex, Object> traversal =
+                this.get_g_V_haslabel_as_identity_values();
+        this.printTraversalForm(traversal);
+        int counter = 0;
+
+        List<String> expected = Arrays.asList("1", "2", "4", "6");
+
+        while (traversal.hasNext()) {
+            Object result = traversal.next();
+            Assert.assertTrue(expected.contains(result.toString()));
+            ++counter;
+            System.out.println(result.toString());
+        }
+    }
+
+    @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+    @Test
+    public void g_V_haslabel_union_identity_out_values() {
+        Traversal<Vertex, Object> traversal =
+                this.get_g_V_has_union_identity_out_values();
+        this.printTraversalForm(traversal);
+        int counter = 0;
+
+        List<String> expected = Arrays.asList("1", "2", "3", "4");
+
+        while (traversal.hasNext()) {
+            Object result = traversal.next();
+            Assert.assertTrue(expected.contains(result.toString()));
+            ++counter;
+            System.out.println(result.toString());
+        }
+
+    }
+
     public static class Traversals extends IrGremlinQueryTest {
 
         @Override
@@ -423,5 +484,20 @@ public Traversal<Vertex, Map<Object, Object>> get_g_V_group_by_by_min() {
         public Traversal<Vertex, Map<Object, Object>> get_g_V_group_by_by_mean() {
             return g.V().group().by().by(values("age").mean());
         }
+
+        @Override
+        public Traversal<Vertex, Object> get_g_V_identity_values() {
+            return g.V().identity().values("id");
+        }
+
+        @Override
+        public Traversal<Vertex, Object> get_g_V_haslabel_as_identity_values() {
+            return g.V().hasLabel("person").as("a").identity().values("id");
+        }
+
+        @Override
+        public Traversal<Vertex, Object> get_g_V_has_union_identity_out_values() {
+            return g.V().has("name", "marko").union(identity(), out()).values("id");
+        }
     }
 }
diff --git a/...ine/compiler/src/main/java/com/alibaba/graphscope/gremlin/integration/suite/utils/__.java b/...ine/compiler/src/main/java/com/alibaba/graphscope/gremlin/integration/suite/utils/__.java
@@ -71,6 +71,10 @@ public static GraphTraversal<?, Vertex> out(final String... edgeLabels) {
                 ((IrCustomizedTraversal) start()).out(rangeTraversal, labels);
     }
 
+    public static GraphTraversal<?, Vertex> bothV() {
+        return start().bothV();
+    }
+
     public static GraphTraversal<?, Vertex> in(final String... edgeLabels) {
         return start().in(edgeLabels);
     }
@@ -118,4 +122,8 @@ public static <A, B> GraphTraversal<?, B> select(final String selectKey) {
     public static <A> GraphTraversal<?, ?> has(final String propertyKey, final Object value) {
         return start().has(propertyKey, value);
     }
+
+    public static <A> GraphTraversal<?, ?> identity() {
+        return start().identity();
+    }
 }
diff --git a/...e/compiler/src/main/java/com/alibaba/graphscope/gremlin/result/GremlinResultAnalyzer.java b/...e/compiler/src/main/java/com/alibaba/graphscope/gremlin/result/GremlinResultAnalyzer.java
@@ -28,6 +28,7 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.*;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.*;
 import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
 
 import java.util.List;
 
@@ -40,7 +41,8 @@ public static GremlinResultParser analyze(Traversal traversal) {
                     || Utils.equalClass(step, ExpandFusionStep.class)
                     || Utils.equalClass(step, EdgeVertexStep.class)
                     || Utils.equalClass(step, EdgeOtherVertexStep.class)
-                    || Utils.equalClass(step, PathExpandStep.class)) {
+                    || Utils.equalClass(step, PathExpandStep.class)
+                    || Utils.equalClass(step, IdentityStep.class)) {
                 parserType = GremlinResultParserFactory.GRAPH_ELEMENT;
             } else if (Utils.equalClass(step, CountGlobalStep.class)
                     || Utils.equalClass(step, SumGlobalStep.class)

diff --git a/...active_engine/compiler/src/test/java/com/alibaba/graphscope/gremlin/IdentityStepTest.java b/...active_engine/compiler/src/test/java/com/alibaba/graphscope/gremlin/IdentityStepTest.java
@@ -17,16 +17,32 @@
 package com.alibaba.graphscope.gremlin;
 
 
+
+import com.alibaba.graphscope.common.IrPlan;
+import com.alibaba.graphscope.common.ir.Utils;
 import com.alibaba.graphscope.gremlin.transform.StepTransformFactory;
 import com.alibaba.graphscope.common.intermediate.operator.AsNoneOp;
+import com.alibaba.graphscope.common.intermediate.operator.UnionOp;
+import com.alibaba.graphscope.gremlin.integration.suite.utils.__;
+import com.alibaba.graphscope.gremlin.plugin.strategy.RemoveUselessStepStrategy;
+import com.alibaba.graphscope.common.intermediate.InterOpCollection;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
 import org.junit.Assert;
 import org.junit.Test;
+import java.util.Set;
+import java.util.List;
+import java.util.ArrayList;
+
 
 
 public class IdentityStepTest {
@@ -48,4 +64,51 @@ public void g_E() {
         AsNoneOp op = (AsNoneOp) StepTransformFactory.IDENTITY_STEP.apply(identityStep);
         Assert.assertEquals(false, op.getAlias().isPresent());
     }
+
+    @Test
+    public void g_V_union_identity_outE_test() {
+        // g.E().union(identity(), bothV())
+        Traversal getEdge = g.E();
+        Traversal identityTraversal = __.identity();
+        Traversal bothVTraversal = __.bothV();
+        // Traversal test = g.V().union(identity(), out());
+
+        //System.out.println(identityTraversal.asAdmin());
+        //System.out.println(bothVTraversal.asAdmin());
+
+        UnionStep unionStep = new UnionStep(getEdge.asAdmin(), identityTraversal.asAdmin(), bothVTraversal.asAdmin());
+
+        Traversal.Admin identityAdmin = (Traversal.Admin) unionStep.getGlobalChildren().get(0);
+        Traversal.Admin bothVAdmin = (Traversal.Admin) unionStep.getGlobalChildren().get(1);
+        identityAdmin.removeStep(1);
+        bothVAdmin.removeStep(1);
+
+        UnionOp op = (UnionOp) StepTransformFactory.UNION_STEP.apply(unionStep);
+        List<InterOpCollection> collection = (List<InterOpCollection>) op.getSubOpCollectionList().get().applyArg();
+        InterOpCollection identityCollection = (new InterOpCollectionBuilder(identityTraversal)).build();
+        InterOpCollection bothVCollection = (new InterOpCollectionBuilder(bothVTraversal)).build();
+
+        IrPlan identityUnionPlan = new IrPlan(Utils.schemaMeta, collection.get(0));
+        String identityUnionJson = identityUnionPlan.getPlanAsJson();
+
+        IrPlan identityPlan = new IrPlan(Utils.schemaMeta, identityCollection);
+        String identityJson = identityPlan.getPlanAsJson();
+
+        IrPlan bothVUnionPlan = new IrPlan(Utils.schemaMeta, collection.get(1));
+        String bothVUnionJson = bothVUnionPlan.getPlanAsJson();
+
+        IrPlan bothVPlan = new IrPlan(Utils.schemaMeta, bothVCollection);
+        String bothVJson = bothVPlan.getPlanAsJson();
+
+        Assert.assertEquals(identityUnionJson, identityJson);
+        Assert.assertEquals(bothVUnionJson, bothVJson);
+    }
+
+    @Test
+    public void g_V_as_identity_test() {
+        Traversal traversal = g.V().as("a").identity();
+        Step identityStep = traversal.asAdmin().getEndStep();
+        AsNoneOp op = (AsNoneOp) StepTransformFactory.IDENTITY_STEP.apply(identityStep);
+        Assert.assertEquals(false, op.getAlias().isPresent());
+    }
 }