diff --git a/pom.xml b/pom.xml index f2250793..eda21e0f 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 4.8 4.2.9 - 28.0 + 27.0 2.0.0 3.0.9 2.10.1 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 cd8ef294..f9b412e4 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 @@ -39,6 +39,9 @@ class PropertyGraphSchema(val nodes: mutable.Map[String, Node], val edges: mutab } def getNodeField(nodeType: String, fieldName: String): Field = { + if (fieldName.equals(Constants.NODE_ID_KEY)) { + return new Field(fieldName, KTString, true) + } val node = nodes.get(nodeType) if (node.isEmpty) { null diff --git a/reasoner/pom.xml b/reasoner/pom.xml index 4a896737..344a482e 100644 --- a/reasoner/pom.xml +++ b/reasoner/pom.xml @@ -41,7 +41,7 @@ 4.8 1.2.71_noneautotype - 28.0 + 27.0 2.0.0 2.7.2 3.1.0 diff --git a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/EmptyRDG.scala b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/EmptyRDG.scala similarity index 99% rename from reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/EmptyRDG.scala rename to reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/EmptyRDG.scala index 2324f9ca..230d9104 100644 --- a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/EmptyRDG.scala +++ b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/EmptyRDG.scala @@ -11,7 +11,7 @@ * or implied. */ -package com.antgroup.reasoner.session +package com.antgroup.openspg.reasoner.session import com.antgroup.openspg.reasoner.lube.block.{DDLOp, SortItem} import com.antgroup.openspg.reasoner.lube.common.expr.{Aggregator, Expr} diff --git a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/EmptyRow.scala b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/EmptyRow.scala similarity index 95% rename from reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/EmptyRow.scala rename to reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/EmptyRow.scala index ce68d9a9..a7f7071f 100644 --- a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/EmptyRow.scala +++ b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/EmptyRow.scala @@ -11,7 +11,7 @@ * or implied. */ -package com.antgroup.reasoner.session +package com.antgroup.openspg.reasoner.session import com.antgroup.openspg.reasoner.lube.logical.Var import com.antgroup.openspg.reasoner.lube.physical.rdg.Row diff --git a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/EmptySession.scala b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/EmptySession.scala similarity index 95% rename from reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/EmptySession.scala rename to reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/EmptySession.scala index 09f2daba..185a4632 100644 --- a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/EmptySession.scala +++ b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/EmptySession.scala @@ -11,14 +11,13 @@ * or implied. */ -package com.antgroup.reasoner.session +package com.antgroup.openspg.reasoner.session import com.antgroup.openspg.reasoner.lube.catalog.Catalog import com.antgroup.openspg.reasoner.lube.logical.RepeatPathVar import com.antgroup.openspg.reasoner.lube.parser.ParserInterface import com.antgroup.openspg.reasoner.lube.physical.PropertyGraph import com.antgroup.openspg.reasoner.warehouse.common.config.GraphLoaderConfig -import com.antgroup.openspg.reasoner.session.KGReasonerSession class EmptyPropertyGraph extends PropertyGraph[EmptyRDG] { diff --git a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/KgGraphSchemaTest.scala b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/KgGraphSchemaTest.scala similarity index 99% rename from reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/KgGraphSchemaTest.scala rename to reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/KgGraphSchemaTest.scala index cd34707d..9588a88b 100644 --- a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/KgGraphSchemaTest.scala +++ b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/KgGraphSchemaTest.scala @@ -11,7 +11,7 @@ * or implied. */ -package com.antgroup.reasoner.session +package com.antgroup.openspg.reasoner.session import com.antgroup.openspg.reasoner.common.graph.edge.Direction import com.antgroup.openspg.reasoner.lube.common.pattern.{ diff --git a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/PhysicalOpUtilTests.scala b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/PhysicalOpUtilTests.scala similarity index 97% rename from reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/PhysicalOpUtilTests.scala rename to reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/PhysicalOpUtilTests.scala index cba412a1..699343cd 100644 --- a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/PhysicalOpUtilTests.scala +++ b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/PhysicalOpUtilTests.scala @@ -11,7 +11,7 @@ * or implied. */ -package com.antgroup.reasoner.session +package com.antgroup.openspg.reasoner.session import com.antgroup.openspg.reasoner.lube.catalog.impl.PropertyGraphCatalog import com.antgroup.openspg.reasoner.lube.physical.util.PhysicalOperatorUtil diff --git a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/ReasonerSessionTests.scala b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/ReasonerSessionTests.scala similarity index 99% rename from reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/ReasonerSessionTests.scala rename to reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/ReasonerSessionTests.scala index 9a03d414..3038fea7 100644 --- a/reasoner/runner/runner-common/src/test/scala/com/antgroup/reasoner/session/ReasonerSessionTests.scala +++ b/reasoner/runner/runner-common/src/test/scala/com/antgroup/openspg/reasoner/session/ReasonerSessionTests.scala @@ -11,7 +11,7 @@ * or implied. */ -package com.antgroup.reasoner.session +package com.antgroup.openspg.reasoner.session import scala.collection.mutable.ListBuffer