diff --git a/reasoner/runner/local-runner/src/test/java/com/antgroup/openspg/reasoner/runner/local/main/transitive/TransitiveOptionalTest.java b/reasoner/runner/local-runner/src/test/java/com/antgroup/openspg/reasoner/runner/local/main/transitive/TransitiveOptionalTest.java index 8eed3908..7b67b691 100644 --- a/reasoner/runner/local-runner/src/test/java/com/antgroup/openspg/reasoner/runner/local/main/transitive/TransitiveOptionalTest.java +++ b/reasoner/runner/local-runner/src/test/java/com/antgroup/openspg/reasoner/runner/local/main/transitive/TransitiveOptionalTest.java @@ -14,9 +14,6 @@ package com.antgroup.openspg.reasoner.runner.local.main.transitive; import com.antgroup.openspg.reasoner.common.constants.Constants; -import com.antgroup.openspg.reasoner.common.graph.edge.IEdge; -import com.antgroup.openspg.reasoner.common.graph.property.IProperty; -import com.antgroup.openspg.reasoner.common.graph.vertex.IVertex; import com.antgroup.openspg.reasoner.graphstate.impl.MemGraphState; import com.antgroup.openspg.reasoner.lube.catalog.Catalog; import com.antgroup.openspg.reasoner.lube.catalog.impl.PropertyGraphCatalog; @@ -28,11 +25,9 @@ import com.antgroup.openspg.reasoner.runner.local.loader.MockLocalGraphLoader; import com.antgroup.openspg.reasoner.runner.local.model.LocalReasonerResult; import com.antgroup.openspg.reasoner.runner.local.model.LocalReasonerTask; import com.antgroup.openspg.reasoner.util.Convert2ScalaUtil; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import org.junit.Assert; import org.junit.Test; diff --git a/reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/rdg/common/KgGraphAddFieldsImpl.java b/reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/rdg/common/KgGraphAddFieldsImpl.java index 3d3f7afb..c1bff40f 100644 --- a/reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/rdg/common/KgGraphAddFieldsImpl.java +++ b/reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/rdg/common/KgGraphAddFieldsImpl.java @@ -13,17 +13,12 @@ package com.antgroup.openspg.reasoner.rdg.common; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; import com.antgroup.openspg.reasoner.common.constants.Constants; import com.antgroup.openspg.reasoner.common.exception.IllegalArgumentException; -import com.antgroup.openspg.reasoner.common.graph.edge.IEdge; -import com.antgroup.openspg.reasoner.common.graph.property.IProperty; import com.antgroup.openspg.reasoner.common.graph.type.GraphItemType; import com.antgroup.openspg.reasoner.common.graph.vertex.IVertexId; import com.antgroup.openspg.reasoner.kggraph.KgGraph; import com.antgroup.openspg.reasoner.kggraph.impl.KgGraphSplitStaticParameters; -import com.antgroup.openspg.reasoner.lube.common.pattern.Connection; import com.antgroup.openspg.reasoner.lube.common.pattern.PartialGraphPattern; import com.antgroup.openspg.reasoner.lube.logical.EdgeVar; import com.antgroup.openspg.reasoner.lube.logical.NodeVar; @@ -36,7 +31,6 @@ import com.google.common.base.Splitter; import com.google.common.collect.Lists; import java.io.Serializable; import java.util.*; - import lombok.Builder; import lombok.Data; import scala.Tuple2; @@ -137,7 +131,8 @@ public class KgGraphAddFieldsImpl implements Serializable { return result; } - private Object getFieldValue(AddFieldsInfo addFieldsInfo, Map context, KgGraph path) { + private Object getFieldValue( + AddFieldsInfo addFieldsInfo, Map context, KgGraph path) { if (1 == addFieldsInfo.getExpressionList().size()) { String expressionString = addFieldsInfo.getExpressionList().get(0); if (expressionString.endsWith(Constants.PROPERTY_JSON_KEY) @@ -146,19 +141,12 @@ public class KgGraphAddFieldsImpl implements Serializable { return SelectRowImpl.getSelectValue( getPropertyList.get(0), getPropertyList.get(1), context); } - if (expressionString.endsWith(Constants.EDGE_SET_KEY)){ + if (expressionString.endsWith(Constants.EDGE_SET_KEY)) { List edges = new ArrayList<>(); - for ( String e: path.getEdgeAlias()){ -// Object propertyMap = ; + for (String e : path.getEdgeAlias()) { edges.add(RunnerUtil.recoverContextKeys(context.get(e))); } -// String res = JSON.toJSONString( -// edges, -// SerializerFeature.PrettyFormat, -// SerializerFeature.DisableCircularReferenceDetect, -// SerializerFeature.SortField); return edges; - } } return RuleRunner.getInstance()