yujunjun/openspg
1
0
Fork 0
mirror of https://github.com/OpenSPG/openspg.git synced 2025-12-27 15:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(schema): support dsl multi-segment definition (#71)

Browse Source 
Co-authored-by: baifuyu <fuyu.bfy@antgroup.com>
This commit is contained in:
matthewhyx 2024-01-09 14:54:38 +08:00 committed by GitHub
parent 7b1613c362
commit bcef8b711c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/core/schema/service/src/main/java/com/antgroup/openspg/server/core/schema/service/alter/check/PropertyChecker.java
View File

@ -29,9 +29,11 @@ import com.antgroup.openspg.reasoner.lube.logical.validate.Validator;
import com.antgroup.openspg.reasoner.lube.parser.ParserInterface;
import com.antgroup.openspg.reasoner.parser.KgDslParser;
import com.antgroup.openspg.server.core.schema.service.type.model.BuiltInPropertyEnum;
import com.google.common.collect.Lists;
import java.util.*;
import java.util.regex.Pattern;
import org.apache.commons.collections4.CollectionUtils;
import scala.collection.JavaConversions;
/**
* Check the information of property type in spg type is legal, the list of property in spg type
@ -173,10 +175,15 @@ public class PropertyChecker {
protected void checkDSL(String dsl, Catalog catalog) {
try {
ParserInterface parser = new KgDslParser();
Block block = parser.parse(dsl);
List<Block> blocks =
Lists.newArrayList(
JavaConversions.asJavaCollection(
parser.parseMultipleStatement(dsl, new scala.collection.immutable.HashMap<>())));
LogicalPlannerContext context =
new LogicalPlannerContext(catalog, parser, new scala.collection.immutable.HashMap<>());
Validator.validate(parser, block, context);
for (Block block : blocks) {
Validator.validate(parser, block, context);
}
} catch (Exception e) {
throw DslSyntaxError.dslSyntaxError(e);
}