Extract useful info from cypher remove, set, unwind

lynx/src/main/scala/org/grapheco/lynx/logical/LogicalRemove.scala

@@ -11,11 +11,12 @@
 
 package org.grapheco.lynx.logical
 
-import org.opencypher.v9_0.ast.Remove
+import org.opencypher.v9_0.ast.RemoveItem
 
 /**
   *@description:
   */
-case class LogicalRemove(r: Remove)(val in: Option[LogicalNode]) extends LogicalNode {
+case class LogicalRemove(removeItems: Seq[RemoveItem])(val in: Option[LogicalNode])
+  extends LogicalNode {
   override val children: Seq[LogicalNode] = in.toSeq
 }

lynx/src/main/scala/org/grapheco/lynx/logical/LogicalSetClause.scala

@@ -11,11 +11,12 @@
 
 package org.grapheco.lynx.logical
 
-import org.opencypher.v9_0.ast.SetClause
+import org.opencypher.v9_0.ast.SetItem
 
 /**
   *@description:
   */
-case class LogicalSetClause(d: SetClause)(val in: Option[LogicalNode]) extends LogicalNode {
+case class LogicalSetClause(setItems: Seq[SetItem])(val in: Option[LogicalNode])
+  extends LogicalNode {
   override val children: Seq[LogicalNode] = in.toSeq
 }

lynx/src/main/scala/org/grapheco/lynx/logical/LogicalUnwind.scala

@@ -11,11 +11,16 @@
 
 package org.grapheco.lynx.logical
 
-import org.opencypher.v9_0.ast.Unwind
+import org.grapheco.lynx.expression.LynxVariable
+import org.opencypher.v9_0.expressions.Expression
 
 /**
   *@description:
   */
-case class LogicalUnwind(u: Unwind)(val in: Option[LogicalNode]) extends LogicalNode {
+case class LogicalUnwind(
+    variable: LynxVariable,
+    expression: Expression
+  )(val in: Option[LogicalNode])
+  extends LogicalNode {
   override val children: Seq[LogicalNode] = in.toSeq
 }

lynx/src/main/scala/org/grapheco/lynx/logical/translator/LogicalRemoveTranslator.scala

@@ -23,5 +23,5 @@ case class LogicalRemoveTranslator(r: Remove) extends LogicalNodeTranslator {
       in: Option[LogicalNode]
     )(implicit plannerContext: LogicalPlannerContext
     ): LogicalNode =
-    LogicalRemove(r)(in)
+    LogicalRemove(r.items)(in)
 }

lynx/src/main/scala/org/grapheco/lynx/logical/translator/LogicalSetClauseTranslator.scala

@@ -11,9 +11,11 @@
 
 package org.grapheco.lynx.logical.translator
 
+import org.grapheco.lynx.expression.LynxVariable
+import org.grapheco.lynx.expression.utils.ConvertExpressionToLynxExpression
 import org.grapheco.lynx.logical.plan.LogicalPlannerContext
 import org.grapheco.lynx.logical.{LogicalNode, LogicalSetClause}
-import org.opencypher.v9_0.ast.SetClause
+import org.opencypher.v9_0.ast.{SetClause, SetExactPropertiesFromMapItem, SetIncludingPropertiesFromMapItem, SetPropertyItem}
 
 /**
   *@description:
@@ -22,6 +24,25 @@ case class LogicalSetClauseTranslator(s: SetClause) extends LogicalNodeTranslato
   override def translate(
       in: Option[LogicalNode]
     )(implicit plannerContext: LogicalPlannerContext
-    ): LogicalNode =
-    LogicalSetClause(s)(in)
+    ): LogicalNode = {
+    val lynxItems = s.items.map {
+      case s @ SetPropertyItem(property, expression) =>
+        SetPropertyItem(property, ConvertExpressionToLynxExpression.convert(expression))(s.position)
+
+      // TODO: Convert setClause
+      case s @ SetExactPropertiesFromMapItem(variable, expression) =>
+        SetExactPropertiesFromMapItem(
+          variable,
+          ConvertExpressionToLynxExpression.convert(expression)
+        )(s.position)
+
+      case s @ SetIncludingPropertiesFromMapItem(variable, expression) =>
+        SetIncludingPropertiesFromMapItem(
+          variable,
+          ConvertExpressionToLynxExpression.convert(expression)
+        )(s.position)
+    }
+
+    LogicalSetClause(lynxItems)(in)
+  }
 }

lynx/src/main/scala/org/grapheco/lynx/logical/translator/LogicalUnwindTranslator.scala

@@ -11,6 +11,8 @@
 
 package org.grapheco.lynx.logical.translator
 
+import org.grapheco.lynx.expression.LynxVariable
+import org.grapheco.lynx.expression.utils.ConvertExpressionToLynxExpression
 import org.grapheco.lynx.logical.plan.LogicalPlannerContext
 import org.grapheco.lynx.logical.{LogicalNode, LogicalUnwind}
 import org.opencypher.v9_0.ast.Unwind
@@ -22,10 +24,15 @@ case class LogicalUnwindTranslator(u: Unwind) extends LogicalNodeTranslator {
   override def translate(
       in: Option[LogicalNode]
     )(implicit plannerContext: LogicalPlannerContext
-    ): LogicalNode =
+    ): LogicalNode = {
     //    in match {
     //      case None => LogicalUnwind(u)(None)
     //      case Some(left) => LogicalJoin(isSingleMatch = false)(left, LogicalUnwind(u)(in))
     //    }
-    LogicalUnwind(u)(in)
+
+    LogicalUnwind(
+      LynxVariable(u.variable.name),
+      ConvertExpressionToLynxExpression.convert(u.expression)
+    )(in)
+  }
 }

lynx/src/main/scala/org/grapheco/lynx/physical/PhysicalUnwind.scala

@@ -11,6 +11,7 @@
 
 package org.grapheco.lynx.physical
 
+import org.grapheco.lynx.expression.LynxVariable
 import org.grapheco.lynx.physical.plan.PhysicalPlannerContext
 import org.grapheco.lynx.{DataFrame, ExecutionContext, LynxType}
 import org.grapheco.lynx.types.LynxValue
@@ -22,8 +23,8 @@ import org.opencypher.v9_0.util.symbols.CTAny
   *@description:
   */
 case class PhysicalUnwind(
-    expression: Expression,
-    variable: Variable
+    variable: LynxVariable,
+    expression: Expression
   )(implicit val in: Option[PhysicalNode],
     val plannerContext: PhysicalPlannerContext)
   extends AbstractPhysicalNode {
@@ -66,5 +67,5 @@ case class PhysicalUnwind(
     }
 
   override def withChildren(children0: Seq[PhysicalNode]): PhysicalUnwind =
-    PhysicalUnwind(expression, variable)(children0.headOption, plannerContext)
+    PhysicalUnwind(variable, expression)(children0.headOption, plannerContext)
 }

lynx/src/main/scala/org/grapheco/lynx/physical/plan/DefaultPhysicalPlanner.scala

@@ -62,12 +62,12 @@ class DefaultPhysicalPlanner(runnerContext: QueryRunnerContext) extends Physical
         PhysicalPatternMatchTranslator(patternMatch)(plannerContext).translate(None)
       case li @ LogicalCreateIndex(labelName: LabelName, properties: List[PropertyKeyName]) =>
         PhysicalCreateIndex(labelName, properties)(plannerContext)
-      case sc @ LogicalSetClause(d) =>
-        PhysicalSetClauseTranslator(d.items).translate(sc.in.map(plan(_)))(plannerContext)
-      case lr @ LogicalRemove(r) =>
-        PhysicalRemoveTranslator(r.items).translate(lr.in.map(plan(_)))(plannerContext)
-      case lu @ LogicalUnwind(u) =>
-        PhysicalUnwindTranslator(u.expression, u.variable)
+      case sc @ LogicalSetClause(setItems) =>
+        PhysicalSetClauseTranslator(setItems).translate(sc.in.map(plan(_)))(plannerContext)
+      case lr @ LogicalRemove(removeItems) =>
+        PhysicalRemoveTranslator(removeItems).translate(lr.in.map(plan(_)))(plannerContext)
+      case lu @ LogicalUnwind(variable, expression) =>
+        PhysicalUnwindTranslator(variable, expression)
           .translate(lu.in.map(plan(_)))(plannerContext)
     }
   }

lynx/src/main/scala/org/grapheco/lynx/physical/translator/PhysicalUnwindTranslator.scala

@@ -11,19 +11,20 @@
 
 package org.grapheco.lynx.physical.translator
 
+import org.grapheco.lynx.expression.LynxVariable
 import org.grapheco.lynx.physical.plan.PhysicalPlannerContext
 import org.grapheco.lynx.physical.{PhysicalNode, PhysicalUnwind}
-import org.opencypher.v9_0.expressions.{Expression, Variable}
+import org.opencypher.v9_0.expressions.Expression
 
 /**
   *@description:
   */
-case class PhysicalUnwindTranslator(expression: Expression, variable: Variable)
+case class PhysicalUnwindTranslator(variable: LynxVariable, expression: Expression)
   extends PhysicalNodeTranslator {
   override def translate(
       in: Option[PhysicalNode]
     )(implicit ppc: PhysicalPlannerContext
     ): PhysicalNode = {
-    PhysicalUnwind(expression, variable)(in, ppc)
+    PhysicalUnwind(variable, expression)(in, ppc)
   }
 }