From 7bcbcbc4d42faf09992983537c6d732b3fdbb1d3 Mon Sep 17 00:00:00 2001
From: FishJoy <chengqiang.cq@antgroup.com>
Date: Tue, 12 Dec 2023 18:55:44 +0800
Subject: [PATCH] feat(reasoner): add lube-api.

---
 .../lube/block/AggregationBlock.scala         |  5 +-
 .../reasoner/lube/block/BasicBlock.scala      |  4 ++
 .../reasoner/lube/block/FilterBlock.scala     |  3 +-
 .../reasoner/lube/block/MatchBlock.scala      | 30 +++++-------
 .../lube/block/OrderAndSliceBlock.scala       |  3 +-
 .../reasoner/lube/block/ProjectBlock.scala    |  5 +-
 .../reasoner/lube/block/ResultBlock.scala     | 43 ++++-------------
 .../reasoner/lube/block/SourceBlock.scala     |  3 +-
 .../lube/catalog/PropertyGraphSchema.scala    | 13 +++--
 .../lube/catalog/SemanticPropertyGraph.scala  | 28 ++++++-----
 .../lube/catalog/impl/JSONGraphCatalog.scala  |  8 +++-
 .../catalog/impl/PropertyGraphCatalog.scala   | 12 +++--
 .../reasoner/lube/common/graph/IRField.scala  |  8 ++--
 .../reasoner/lube/common/graph/IRGraph.scala  | 19 ++------
 .../lube/common/pattern/Pattern.scala         |  4 +-
 .../reasoner/lube/common/rule/RuleImpl.scala  |  2 +-
 .../reasoner/lube/utils/BlockUtils.scala      |  2 +-
 .../reasoner/lube/utils/ExprUtils.scala       | 17 +++++--
 .../impl/Block2GraphPathTransformer.scala     |  2 +-
 .../impl/Expr2QlexpressTransformer.scala      | 20 +++++++-
 .../openspg/reasoner/graph/IRGraphTests.scala | 24 ----------
 .../reasoner/parser/TransformerTest.scala     | 47 ++++++++++++++-----
 22 files changed, 152 insertions(+), 150 deletions(-)
 delete mode 100644 reasoner/lube-api/src/test/scala/com/antgroup/openspg/reasoner/graph/IRGraphTests.scala

diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/AggregationBlock.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/AggregationBlock.scala
index 7d3b1410d..0224b18ec 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/AggregationBlock.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/AggregationBlock.scala
@@ -16,13 +16,12 @@ package com.antgroup.openspg.reasoner.lube.block
 import scala.collection.mutable.ListBuffer
 
 import com.antgroup.openspg.reasoner.lube.common.expr.Aggregator
-import com.antgroup.openspg.reasoner.lube.common.graph.{IRField, IRGraph}
+import com.antgroup.openspg.reasoner.lube.common.graph.IRField
 
 final case class AggregationBlock(
     dependencies: List[Block],
     aggregations: Aggregations,
-    group: List[String],
-    graph: IRGraph)
+    group: List[String])
     extends BasicBlock[Fields](BlockType("aggregation")) {
 
   override def binds: Fields = {
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/BasicBlock.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/BasicBlock.scala
index 0f425268e..031a816f3 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/BasicBlock.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/BasicBlock.scala
@@ -13,6 +13,10 @@
 
 package com.antgroup.openspg.reasoner.lube.block
 
+import com.antgroup.openspg.reasoner.lube.common.graph.IRGraph
+
 abstract class BasicBlock[B <: Binds](override val blockType: BlockType) extends Block {
   override def binds: B
+
+  override def graph: IRGraph = dependencies.head.graph
 }
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/FilterBlock.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/FilterBlock.scala
index 740290810..8cf878bfb 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/FilterBlock.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/FilterBlock.scala
@@ -13,7 +13,6 @@
 
 package com.antgroup.openspg.reasoner.lube.block
 
-import com.antgroup.openspg.reasoner.lube.common.graph.IRGraph
 import com.antgroup.openspg.reasoner.lube.common.rule.Rule
 
 /**
@@ -23,7 +22,7 @@ import com.antgroup.openspg.reasoner.lube.common.rule.Rule
  * @param rules
  * @param graph
  */
-final case class FilterBlock(dependencies: List[Block], rules: Rule, graph: IRGraph)
+final case class FilterBlock(dependencies: List[Block], rules: Rule)
     extends BasicBlock[Binds](BlockType("filter")) {
 
   override def binds: Binds = {
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/MatchBlock.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/MatchBlock.scala
index 2ba3e429a..ceb6d2afe 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/MatchBlock.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/MatchBlock.scala
@@ -13,14 +13,8 @@
 
 package com.antgroup.openspg.reasoner.lube.block
 
-import scala.collection.mutable
-
-import com.antgroup.openspg.reasoner.lube.common.graph.{IRArray, IREdge, IRGraph, IRNode, IRPath}
-import com.antgroup.openspg.reasoner.lube.common.pattern.{
-  Connection,
-  GraphPath,
-  VariablePatternConnection
-}
+import com.antgroup.openspg.reasoner.lube.common.graph.{IREdge, IRNode, IRPath, IRRepeatPath}
+import com.antgroup.openspg.reasoner.lube.common.pattern.{Connection, GraphPath, VariablePatternConnection}
 
 /**
  * parse from "GraphStructure" block to match path
@@ -31,34 +25,34 @@ import com.antgroup.openspg.reasoner.lube.common.pattern.{
  */
 final case class MatchBlock(
     dependencies: List[Block],
-    patterns: Map[String, GraphPath],
-    graph: IRGraph)
+    patterns: Map[String, GraphPath])
     extends BasicBlock[Binds](BlockType("match")) {
 
   override def binds: Binds = {
+    val props = patterns.values.head.graphPattern.properties
     val nodes = patterns.values
       .flatMap(path =>
-        path.graphPattern.nodes.map(node => IRNode(node._1, new mutable.HashSet[String]())))
+        path.graphPattern.nodes.map(node => IRNode(node._1, props(node._1))))
       .toList
     val edges = patterns.values
       .flatMap(path =>
         path.graphPattern.edges
-          .map(pair => pair._2.map(rel => edgeToIRField(rel)).toList)
+          .map(pair => pair._2.map(rel => edgeToIRField(rel, props)).toList)
           .flatten)
       .toList
     Fields(nodes.++(edges))
   }
 
-  private def edgeToIRField(edge: Connection) = {
+  private def edgeToIRField(edge: Connection, props: Map[String, Set[String]]) = {
     edge match {
       case connection: VariablePatternConnection =>
-        val start = IRNode(connection.source, new mutable.HashSet[String]())
-        val end = IRNode(connection.target, new mutable.HashSet[String]())
-        val irEdge = IREdge(connection.alias, new mutable.HashSet[String]())
+        val start = IRNode(connection.source, props(connection.source))
+        val end = IRNode(connection.target, props(connection.target))
+        val irEdge = IREdge(connection.alias, props(connection.alias))
         val path = IRPath(connection.alias, List.apply(start, irEdge, end))
-        IRArray(path)
+        IRRepeatPath(path, connection.lower, connection.upper)
       case _ =>
-        IREdge(edge.alias, new mutable.HashSet[String]())
+        IREdge(edge.alias, props(edge.alias))
     }
   }
 
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/OrderAndSliceBlock.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/OrderAndSliceBlock.scala
index 535c36ce7..0a732b203 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/OrderAndSliceBlock.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/OrderAndSliceBlock.scala
@@ -20,8 +20,7 @@ final case class OrderAndSliceBlock(
     dependencies: List[Block],
     orderBy: Seq[SortItem],
     limit: Option[Int],
-    group: List[String],
-    graph: IRGraph)
+    group: List[String])
     extends BasicBlock[Binds](BlockType("order-and-slice")) {
   override def binds: Binds = dependencies.head.binds
 }
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/ProjectBlock.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/ProjectBlock.scala
index eb7601db5..241eb26cd 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/ProjectBlock.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/ProjectBlock.scala
@@ -15,7 +15,7 @@ package com.antgroup.openspg.reasoner.lube.block
 
 import scala.collection.mutable.ListBuffer
 
-import com.antgroup.openspg.reasoner.lube.common.graph.{IRField, IRGraph, IRVariable}
+import com.antgroup.openspg.reasoner.lube.common.graph.IRField
 import com.antgroup.openspg.reasoner.lube.common.rule.Rule
 
 /**
@@ -26,8 +26,7 @@ import com.antgroup.openspg.reasoner.lube.common.rule.Rule
  */
 final case class ProjectBlock(
     dependencies: List[Block],
-    projects: ProjectFields = ProjectFields(),
-    graph: IRGraph)
+    projects: ProjectFields = ProjectFields())
     extends BasicBlock[Fields](BlockType("project")) {
 
   override def binds: Fields = {
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/ResultBlock.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/ResultBlock.scala
index 98c0d9dc2..cfc11617b 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/ResultBlock.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/ResultBlock.scala
@@ -13,9 +13,6 @@
 
 package com.antgroup.openspg.reasoner.lube.block
 
-import scala.collection.mutable.ListBuffer
-
-import com.antgroup.openspg.reasoner.common.exception.UnsupportedOperationException
 import com.antgroup.openspg.reasoner.common.types.KgType
 import com.antgroup.openspg.reasoner.lube.common.expr.Expr
 import com.antgroup.openspg.reasoner.lube.common.graph._
@@ -24,7 +21,7 @@ import com.antgroup.openspg.reasoner.lube.common.pattern.{Element, PatternElemen
 /**
  * every operator block tree of root is result block
  */
-sealed trait ResultBlock extends Block {}
+abstract class ResultBlock[B <: Binds] extends BasicBlock[B](BlockType("result"))
 
 /**
  * output as table
@@ -35,16 +32,15 @@ sealed trait ResultBlock extends Block {}
 final case class TableResultBlock(
     dependencies: List[Block],
     selectList: OrderedFields,
-    asList: List[String],
-    graph: IRGraph)
-    extends ResultBlock {
+    asList: List[String])
+    extends ResultBlock[OrderedFields] {
 
   /**
    * The metadata output by the current block
    *
    * @return
    */
-  override def binds: Binds = selectList
+  override def binds: OrderedFields = selectList
 }
 
 /**
@@ -53,11 +49,8 @@ final case class TableResultBlock(
  * @param outputGraphPath the path name array for output
  * @param graph
  */
-final case class GraphResultBlock(
-    dependencies: List[Block],
-    outputGraphPath: List[String],
-    graph: IRGraph)
-    extends ResultBlock {
+final case class GraphResultBlock(dependencies: List[Block], outputGraphPath: List[String])
+    extends ResultBlock[Binds] {
   override val binds: Binds = dependencies.head.binds
 }
 
@@ -94,34 +87,14 @@ case class AddPredicate(predicate: PredicateElement) extends DDLOp
  * @param dependencies
  * @param graph
  */
-case class DDLBlock(ddlOp: Set[DDLOp], dependencies: List[Block], graph: IRGraph)
-    extends ResultBlock {
+case class DDLBlock(ddlOp: Set[DDLOp], dependencies: List[Block]) extends ResultBlock[Fields] {
 
   /**
    * The metadata output by the current block
    *
    * @return
    */
-  override def binds: Binds = {
-    val fields = dependencies.head.binds.fields
-    ddlOp.head match {
-      case AddProperty(s, propertyType, _) =>
-        val field = fields.find(f => f.name.equals(s.alias)).get
-        if (field.isInstanceOf[IRNode]) {
-          field.asInstanceOf[IRNode].fields.add(propertyType)
-        } else if (field.isInstanceOf[IREdge]) {
-          field.asInstanceOf[IREdge].fields.add(propertyType)
-        }
-        Fields(fields)
-      case AddPredicate(predicate) =>
-        val newFields = new ListBuffer[IRField]
-        newFields.++=(dependencies.head.binds.fields)
-        newFields.+=(IREdge(predicate.alias, null))
-        Fields(newFields.toList)
-      case other =>
-        throw UnsupportedOperationException(s"$other ddlop unsupported")
-    }
-  }
+  override def binds: Fields = Fields.empty
 
 }
 
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/SourceBlock.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/SourceBlock.scala
index 5842eb6a3..422155e6d 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/SourceBlock.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/block/SourceBlock.scala
@@ -15,7 +15,8 @@ package com.antgroup.openspg.reasoner.lube.block
 
 import com.antgroup.openspg.reasoner.lube.common.graph.IRGraph
 
-case class SourceBlock(graph: IRGraph) extends BasicBlock[Binds](BlockType("source")) {
+case class SourceBlock(override val graph: IRGraph)
+    extends BasicBlock[Binds](BlockType("source")) {
   override val dependencies: List[Block] = List.empty
   override val binds: Binds = Binds.empty
 }
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/PropertyGraphSchema.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/PropertyGraphSchema.scala
index 5d4eb4862..75871b82f 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/PropertyGraphSchema.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/PropertyGraphSchema.scala
@@ -24,9 +24,8 @@ import org.json4s.ext.EnumNameSerializer
 import org.json4s.jackson.Serialization
 import org.json4s.jackson.Serialization.write
 
-class PropertyGraphSchema(
-    val nodes: mutable.Map[String, Node],
-    val edges: mutable.Map[SPO, Edge]) extends Serializable {
+class PropertyGraphSchema(val nodes: mutable.Map[String, Node], val edges: mutable.Map[SPO, Edge])
+    extends Serializable {
 
   def getNodeField(nodeTypes: Set[String], fieldName: String): Field = {
     for (nodeType <- nodeTypes) {
@@ -52,6 +51,14 @@ class PropertyGraphSchema(
     }
   }
 
+  def addNode(
+      typeName: String,
+      nodeType: NodeType.Value,
+      properties: Set[Field],
+      resolved: Boolean): Unit = {
+    nodes.put(typeName, Node(typeName, nodeType, properties, resolved))
+  }
+
   def addVertexField(nodeType: String, field: Field): Unit = {
     val node = nodes.get(nodeType)
     if (!node.isEmpty) {
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/SemanticPropertyGraph.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/SemanticPropertyGraph.scala
index cf1a3d5e7..2aabe0b00 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/SemanticPropertyGraph.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/SemanticPropertyGraph.scala
@@ -17,8 +17,8 @@ import scala.collection.mutable
 
 import com.antgroup.openspg.reasoner.common.exception.NotDefineException
 import com.antgroup.openspg.reasoner.common.graph.edge.{Direction, SPO}
-import com.antgroup.openspg.reasoner.common.types.KgType
-import com.antgroup.openspg.reasoner.lube.catalog.struct.{Edge, Field, Node}
+import com.antgroup.openspg.reasoner.common.types.{KgType, KTString}
+import com.antgroup.openspg.reasoner.lube.catalog.struct.{Edge, Field, Node, NodeType}
 
 /**
  * A graph defined by Property Graph Model with enhanced semantics.
@@ -49,14 +49,24 @@ class SemanticPropertyGraph(
     graphSchema.addVertexField(nodeLabel, property)
   }
 
-  def getNode(nodeLabel: String): Node = {
-    if (nodeLabel.contains("/")) {
-      graphSchema.nodes(nodeLabel.split("/")(0))
+  def addNode(nodeLabel: String, nodeType: NodeType.Value, properties: Set[Field]): Unit = {
+    val node = graphSchema.nodes.get(nodeLabel)
+    if (node.isDefined) {
+      return
+    }
+    val finalProperties =
+      properties ++ Set.apply(new Field("id", KTString, true), new Field("name", KTString, true))
+    if (nodeType == NodeType.CONCEPT) {
+      graphSchema.addNode(nodeLabel, nodeType, finalProperties, true)
     } else {
-      graphSchema.nodes(nodeLabel)
+      graphSchema.addNode(nodeLabel, nodeType, finalProperties, false)
     }
   }
 
+  def getNode(nodeLabel: String): Node = {
+    graphSchema.nodes(nodeLabel)
+  }
+
   def getEdge(spoStr: String): Edge = {
     var spo = new SPO(spoStr)
     if (spo.getP.equals("belongTo") && !graphSchema.edges.contains(spo)) {
@@ -66,11 +76,7 @@ class SemanticPropertyGraph(
   }
 
   def containsNode(nodeLabel: String): Boolean = {
-    if (nodeLabel.contains("/")) {
-      graphSchema.nodes.contains(nodeLabel.split("/")(0))
-    } else {
-      graphSchema.nodes.contains(nodeLabel)
-    }
+    graphSchema.nodes.contains(nodeLabel)
   }
 
   def containsEdge(spoStr: String): Boolean = {
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/impl/JSONGraphCatalog.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/impl/JSONGraphCatalog.scala
index ac5311bf0..36e3a1b06 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/impl/JSONGraphCatalog.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/impl/JSONGraphCatalog.scala
@@ -61,6 +61,7 @@ class JSONGraphCatalog(val propertyGraph: String) extends Catalog {
       : Set[Field] = {
     Set.apply(
       new Field(Constants.NODE_ID_KEY, KTString, true),
+      new Field(Constants.VERTEX_INTERNAL_ID_KEY, KTString, true),
       new Field(Constants.CONTEXT_LABEL, KTString, true))
   }
 
@@ -70,8 +71,13 @@ class JSONGraphCatalog(val propertyGraph: String) extends Catalog {
   override def getDefaultEdgeProperties()
       : Set[Field] = {
     Set.apply(
+      new Field(Constants.CONTEXT_LABEL, KTString, true),
       new Field(Constants.EDGE_FROM_ID_KEY, KTString, true),
-      new Field(Constants.EDGE_TO_ID_KEY, KTString, true)
+      new Field(Constants.EDGE_TO_ID_KEY, KTString, true),
+      new Field(Constants.EDGE_FROM_INTERNAL_ID_KEY, KTString, true),
+      new Field(Constants.EDGE_TO_INTERNAL_ID_KEY, KTString, true),
+      new Field(Constants.EDGE_FROM_ID_TYPE_KEY, KTString, true),
+      new Field(Constants.EDGE_TO_ID_TYPE_KEY, KTString, true)
     )
   }
 
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/impl/PropertyGraphCatalog.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/impl/PropertyGraphCatalog.scala
index 09b38fc86..3669b51f1 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/impl/PropertyGraphCatalog.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/catalog/impl/PropertyGraphCatalog.scala
@@ -11,10 +11,6 @@
  * or implied.
  */
 
-/**
- * Alipay.com Inc.
- * Copyright (c) 2004-2023 All Rights Reserved.
- */
 package com.antgroup.openspg.reasoner.lube.catalog.impl
 
 import scala.collection.mutable
@@ -77,6 +73,7 @@ class PropertyGraphCatalog(val propertyGraphSchema: Map[String, Set[String]]) ex
   : Set[Field] = {
     Set.apply(
       new Field(Constants.NODE_ID_KEY, KTString, true),
+      new Field(Constants.VERTEX_INTERNAL_ID_KEY, KTString, true),
       new Field(Constants.CONTEXT_LABEL, KTString, true))
   }
 
@@ -86,8 +83,13 @@ class PropertyGraphCatalog(val propertyGraphSchema: Map[String, Set[String]]) ex
   override def getDefaultEdgeProperties()
   : Set[Field] = {
     Set.apply(
+      new Field(Constants.CONTEXT_LABEL, KTString, true),
       new Field(Constants.EDGE_FROM_ID_KEY, KTString, true),
-      new Field(Constants.EDGE_TO_ID_KEY, KTString, true)
+      new Field(Constants.EDGE_TO_ID_KEY, KTString, true),
+      new Field(Constants.EDGE_FROM_INTERNAL_ID_KEY, KTString, true),
+      new Field(Constants.EDGE_TO_INTERNAL_ID_KEY, KTString, true),
+      new Field(Constants.EDGE_FROM_ID_TYPE_KEY, KTString, true),
+      new Field(Constants.EDGE_TO_ID_TYPE_KEY, KTString, true)
     )
   }
 }
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/graph/IRField.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/graph/IRField.scala
index 3b9cb3bf6..82add033f 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/graph/IRField.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/graph/IRField.scala
@@ -13,8 +13,6 @@
 
 package com.antgroup.openspg.reasoner.lube.common.graph
 
-import scala.collection.mutable
-
 sealed trait IRField {
   def name: String
 }
@@ -26,14 +24,14 @@ sealed trait RichIRField extends IRField
  * @param name alias
  * @param fields the field names of node
  */
-case class IRNode(name: String, fields: mutable.Set[String]) extends IRField
+case class IRNode(name: String, fields: Set[String]) extends IRField
 
 /**
  * Used to represent Edge in QueryGraph, the name of IREdge is represented by alias
  * @param name alias
  * @param fields the field names of edge
  */
-case class IREdge(name: String, fields: mutable.Set[String]) extends IRField
+case class IREdge(name: String, fields: Set[String]) extends IRField
 
 /**
  * Used to represent prop of [[IRNode]] and [[IREdge]]
@@ -65,6 +63,6 @@ case class IRPath(name: String, elements: List[IRField]) extends RichIRField
  * @param name
  * @param element
  */
-case class IRArray(element: IRField) extends RichIRField {
+case class IRRepeatPath(element: IRPath, lower: Int, upper: Int) extends RichIRField {
   override def name: String = element.name
 }
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/graph/IRGraph.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/graph/IRGraph.scala
index d2e6af86d..b2b8b0f21 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/graph/IRGraph.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/graph/IRGraph.scala
@@ -13,31 +13,22 @@
 
 package com.antgroup.openspg.reasoner.lube.common.graph
 
-import java.util.concurrent.atomic.AtomicInteger
-
 /**
  * A graph defined in query, which has a graph name only. Usually the name is KG
  */
 trait IRGraph {
   def graphName: String
+  def nodes: Map[String, IRNode]
+  def edges: Map[String, IREdge]
 }
 
-final case class KG() extends IRGraph {
+final case class KG(nodes: Map[String, IRNode], edges: Map[String, IREdge]) extends IRGraph {
   override def graphName: String = IRGraph.defaultGraphName
 }
 
-final case class View(graphName: String) extends IRGraph
+final case class View(graphName: String, nodes: Map[String, IRNode], edges: Map[String, IREdge])
+    extends IRGraph
 
 object IRGraph {
   val defaultGraphName = "KG"
-  private val graphId: AtomicInteger = new AtomicInteger(0)
-
-  def generate: IRGraph = {
-    if (graphId.get() == 0) {
-      graphId.incrementAndGet()
-      KG()
-    } else {
-      View(defaultGraphName + "_" + graphId.getAndAdd(1))
-    }
-  }
 }
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/pattern/Pattern.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/pattern/Pattern.scala
index af93e8eb9..45cdcd2a9 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/pattern/Pattern.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/pattern/Pattern.scala
@@ -14,7 +14,6 @@
 package com.antgroup.openspg.reasoner.lube.common.pattern
 
 import scala.collection.mutable
-import scala.reflect.runtime.universe.TypeTag
 
 import com.antgroup.openspg.reasoner.common.graph.edge.{Direction, SPO}
 import com.antgroup.openspg.reasoner.lube.catalog.SemanticPropertyGraph
@@ -130,7 +129,8 @@ case class PartialGraphPattern(
 case class GraphPattern(
     rootAlias: String,
     nodes: Map[String, Element],
-    edges: Map[String, Set[Connection]]) {
+    edges: Map[String, Set[Connection]],
+    properties: Map[String, Set[String]]) {
 
   /**
    * Get pattern element by node alias
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/rule/RuleImpl.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/rule/RuleImpl.scala
index 27532bf1c..50f4e393d 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/rule/RuleImpl.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/common/rule/RuleImpl.scala
@@ -92,7 +92,7 @@ final case class LogicRule(ruleName: String, ruleExplain: String, expr: Expr)
       newRule.addDependency(r)
     }
     for (r <- rule.getDependencies) {
-      addDependency(r)
+      newRule.addDependency(r)
     }
     newRule
   }
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/BlockUtils.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/BlockUtils.scala
index 1fb209cdd..f980b1720 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/BlockUtils.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/BlockUtils.scala
@@ -30,7 +30,7 @@ object BlockUtils {
   def getDefine(block: Block): Set[String] = {
     val defines = new mutable.HashSet[String]()
     block match {
-      case DDLBlock(ddlOps, _, _) =>
+      case DDLBlock(ddlOps, _) =>
         ddlOps.foreach(op => {
           op match {
             case AddPredicate(predicate) =>
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/ExprUtils.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/ExprUtils.scala
index 21e874123..d34fb2c0c 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/ExprUtils.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/ExprUtils.scala
@@ -54,10 +54,10 @@ object ExprUtils {
               case GetField(fieldName) =>
                 val refName = arg.asInstanceOf[Ref].refName
                 if (edgeAlias != null && edgeAlias.contains(refName)) {
-                  List.apply(IREdge(refName, mutable.Set.apply(fieldName)))
+                  List.apply(IREdge(refName, Set.apply(fieldName)))
                 } else {
                   // other as ir node
-                  List.apply(IRNode(refName, mutable.Set.apply(fieldName)))
+                  List.apply(IRNode(refName, Set.apply(fieldName)))
                 }
               case _ => c.filter(Option(_).isDefined).flatten
             }
@@ -67,7 +67,14 @@ object ExprUtils {
         }
       } else {
         e match {
-          case Ref(refName) => List.apply(IRVariable(refName))
+          case Ref(refName) =>
+            if (nodesAlias != null && nodesAlias.contains(refName)) {
+              List.apply(IRNode(refName, Set.empty))
+            } else if (edgeAlias != null && edgeAlias.contains(refName)) {
+              List.apply(IREdge(refName, Set.empty))
+            } else {
+              List.apply(IRVariable(refName))
+            }
           case _ => List.empty
         }
       }
@@ -139,8 +146,8 @@ object ExprUtils {
    * @return
    */
   def mergeListIRField(c: List[IRField]): List[IRField] = {
-    var nodesMap = Map[String, mutable.Set[String]]()
-    var edgesMap = Map[String, mutable.Set[String]]()
+    var nodesMap = Map[String, Set[String]]()
+    var edgesMap = Map[String, Set[String]]()
     var refSet = mutable.Set[String]()
     var variable = c
       .filter(Option(_).isDefined)
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/transformer/impl/Block2GraphPathTransformer.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/transformer/impl/Block2GraphPathTransformer.scala
index c8fc2a1ac..6e985deb3 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/transformer/impl/Block2GraphPathTransformer.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/transformer/impl/Block2GraphPathTransformer.scala
@@ -20,7 +20,7 @@ import com.antgroup.openspg.reasoner.lube.utils.transformer.BlockTransformer
 class Block2GraphPathTransformer extends BlockTransformer[GraphPath] {
   def transformBlock2GraphPath(block: Block): List[GraphPath] = {
     block match {
-      case MatchBlock(_, patterns, _) => patterns.values.toList
+      case MatchBlock(_, patterns) => patterns.values.toList
       case _ => null
     }
   }
diff --git a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/transformer/impl/Expr2QlexpressTransformer.scala b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/transformer/impl/Expr2QlexpressTransformer.scala
index d4588ad24..58139085d 100644
--- a/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/transformer/impl/Expr2QlexpressTransformer.scala
+++ b/reasoner/lube-api/src/main/scala/com/antgroup/openspg/reasoner/lube/utils/transformer/impl/Expr2QlexpressTransformer.scala
@@ -53,7 +53,23 @@ class Expr2QlexpressTransformer extends ExprTransformer[String] {
 
   def trans(e: Expr, params: List[String]): String = {
     val opTrans: PartialFunction[Expr, String] = {
-      case BinaryOpExpr(name, l, r) => params.head + binaryOpSetTrans(name) + params(1)
+      case BinaryOpExpr(name, l, r) =>
+        val opStr = binaryOpSetTrans(name)
+        name match {
+          case BIn|BLike|BRLike|BAssign
+               |BEqual|BNotEqual|BGreaterThan
+               |BNotGreaterThan|BSmallerThan|BNotSmallerThan => params.head + opStr + params(1)
+          case _ =>
+            val leftStr = l match {
+              case c: BinaryOpExpr => "(" + params.head + ")"
+              case _ => params.head
+            }
+            val rightStr = r match {
+              case c: BinaryOpExpr => "(" + params(1) + ")"
+              case _ => params(1)
+            }
+            leftStr + opStr + rightStr
+        }
       case UnaryOpExpr(name, arg) => unaryOpSetTrans(name).format(params.head)
       case FunctionExpr(name, funcArgs) => "%s(%s)".format(name, params.mkString(","))
       case Ref(refName) => refName
@@ -74,7 +90,7 @@ class Expr2QlexpressTransformer extends ExprTransformer[String] {
         val l = list
           .map(x =>
             if (listType.equals(KTString)) {
-              "'%s'".format(x)
+              "\"%s\"".format(x)
             } else {
               x
             })
diff --git a/reasoner/lube-api/src/test/scala/com/antgroup/openspg/reasoner/graph/IRGraphTests.scala b/reasoner/lube-api/src/test/scala/com/antgroup/openspg/reasoner/graph/IRGraphTests.scala
deleted file mode 100644
index 876a17ba6..000000000
--- a/reasoner/lube-api/src/test/scala/com/antgroup/openspg/reasoner/graph/IRGraphTests.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2023 Ant Group CO., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied.
- */
-
-package com.antgroup.openspg.reasoner.lube.common.graph
-
-import org.scalatest.funspec.AnyFunSpec
-import org.scalatest.matchers.should.Matchers.{convertToAnyShouldWrapper, equal}
-
-class IRGraphTests extends AnyFunSpec{
-  it ("test generate graph") {
-    IRGraph.generate should equal(KG())
-    IRGraph.generate.graphName should equal("KG_1")
-  }
-}
diff --git a/reasoner/lube-api/src/test/scala/com/antgroup/openspg/reasoner/parser/TransformerTest.scala b/reasoner/lube-api/src/test/scala/com/antgroup/openspg/reasoner/parser/TransformerTest.scala
index 8ff9c897c..af92c714a 100644
--- a/reasoner/lube-api/src/test/scala/com/antgroup/openspg/reasoner/parser/TransformerTest.scala
+++ b/reasoner/lube-api/src/test/scala/com/antgroup/openspg/reasoner/parser/TransformerTest.scala
@@ -13,8 +13,6 @@
 
 package com.antgroup.openspg.reasoner.lube.parser
 
-import scala.collection.mutable
-
 import com.antgroup.openspg.reasoner.common.graph.edge.Direction
 import com.antgroup.openspg.reasoner.common.types.{KTInteger, KTLong, KTObject}
 import com.antgroup.openspg.reasoner.lube.block.{MatchBlock, ProjectBlock, ProjectFields, SourceBlock}
@@ -32,7 +30,7 @@ class TransformerTest extends AnyFunSpec {
     val block = ProjectBlock(
       List.apply(
         MatchBlock(
-          List.apply(SourceBlock(KG())),
+          List.apply(SourceBlock(KG(Map.empty, Map.empty))),
           Map.apply("t" -> GraphPath(
             "s",
             GraphPattern(
@@ -48,13 +46,11 @@ class TransformerTest extends AnyFunSpec {
                     Set.apply("belong"),
                     "d",
                     Direction.IN,
-                    null)))),
-            false)),
-          KG())),
+                    null))), Map.empty),
+            false)))),
       ProjectFields(
         Map.apply(IRVariable("total_domain_num") ->
-          ProjectRule(IRVariable("total_domain_num"), KTInteger, Ref("o")))),
-      KG())
+          ProjectRule(IRVariable("total_domain_num"), KTInteger, Ref("o")))))
     val p = BlockUtils.transBlock2Graph(block)
     p.size should equal(1)
     p.head.graphPattern.nodes.size should equal(2)
@@ -209,14 +205,14 @@ class TransformerTest extends AnyFunSpec {
 
     res(1) should equal(IRVariable("DayliyAmount"))
     res(2) should equal(IRVariable("MonthAmount"))
-    res(3) should equal(IRNode("user", mutable.Set.apply("sex")))
+    res(3) should equal(IRNode("user", Set.apply("sex")))
 
     val qlTransformer = new Expr2QlexpressTransformer()
     val qlExpress = qlTransformer.transform(r5)
     qlExpress.size should equal(5)
 
     qlExpress.head should equal("r0 = r0 = 123")
-    qlExpress.last should equal("R3 && R1 && !(R4 && R1)")
+    qlExpress.last should equal("(R3 && R1) && !(R4 && R1)")
   }
 
   it("variable_rule2_to_expr") {
@@ -227,7 +223,36 @@ class TransformerTest extends AnyFunSpec {
     val qlExpress = qlTransformer.transform(expr)
     print(qlExpress)
     qlExpress.head should
-      equal("DayliyAmount > 300 && R1 && !(MonthAmount < 500 && R1)")
+      equal("((DayliyAmount > 300) && R1) && !((MonthAmount < 500) && R1)")
+  }
+
+  it("agg rule flat") {
+    val r0 = LogicRule("tmp", "",
+      BinaryOpExpr(BGreaterThan, UnaryOpExpr(GetField("amount"), Ref("E1")), VLong("10")))
+    val r = ProjectRule(IRVariable("g"),
+      KTLong,
+      OpChainExpr(
+        GraphAggregatorExpr(
+          "unresolved_default_path",
+          List.apply(Ref("A"), Ref("B")),
+          null
+        ),
+        OpChainExpr(
+          AggIfOpExpr(
+            AggOpExpr(
+              Count,
+              Ref("E1")
+            ),
+            Ref("tmp")
+          ),
+          null
+        )
+      )
+    )
+    r.addDependency(r0)
+    val transformer = new Rule2ExprTransformer()
+    val expr = transformer.transform(r)
+    println(expr.pretty)
   }
 
   it("null ql") {