Skip to content

Commit

Permalink
[GIE Compiler] Add data type of algebra operator output to physical p…
Browse files Browse the repository at this point in the history 
…lan (#2870)

Co-authored-by: Longbin Lai <longbin.lailb@alibaba-inc.com>
Co-authored-by: siyuan0322 <siyuanzhang.zsy@alibaba-inc.com>
  • Loading branch information
@shirly121 @longbinlai @siyuan0322
3 people authored Jun 15, 2023
1 parent 79cd577 commit b37ab90
Show file tree
Hide file tree
Showing 5 changed files with 332 additions and 129 deletions.
57 changes: 57 additions & 0 deletions ...ompiler/src/main/java/com/alibaba/graphscope/common/ir/runtime/ffi/RelToFfiConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ public RelNode visit(GraphLogicalSource source) {
if (source.getAliasId() != AliasInference.DEFAULT_ID) {
checkFfiResult(LIB.setScanAlias(ptrScan, ArgUtils.asAlias(source.getAliasId())));
}
checkFfiResult(
LIB.setScanMeta(
ptrScan,
new FfiPbPointer.ByValue(
com.alibaba.graphscope.common.ir.runtime.proto.Utils.protoRowType(
source.getRowType(), isColumnId)
.get(0)
.toByteArray())));
return new PhysicalNode(source, ptrScan);
}

Expand All @@ -96,6 +104,14 @@ public RelNode visit(GraphLogicalExpand expand) {
if (expand.getAliasId() != AliasInference.DEFAULT_ID) {
checkFfiResult(LIB.setEdgexpdAlias(ptrExpand, ArgUtils.asAlias(expand.getAliasId())));
}
checkFfiResult(
LIB.setEdgexpdMeta(
ptrExpand,
new FfiPbPointer.ByValue(
com.alibaba.graphscope.common.ir.runtime.proto.Utils.protoRowType(
expand.getRowType(), isColumnId)
.get(0)
.toByteArray())));
return new PhysicalNode(expand, ptrExpand);
}

Expand All @@ -106,6 +122,14 @@ public RelNode visit(GraphLogicalGetV getV) {
if (getV.getAliasId() != AliasInference.DEFAULT_ID) {
checkFfiResult(LIB.setGetvAlias(ptrGetV, ArgUtils.asAlias(getV.getAliasId())));
}
checkFfiResult(
LIB.setGetvMeta(
ptrGetV,
new FfiPbPointer.ByValue(
com.alibaba.graphscope.common.ir.runtime.proto.Utils.protoRowType(
getV.getRowType(), isColumnId)
.get(0)
.toByteArray())));
return new PhysicalNode(getV, ptrGetV);
}

Expand Down Expand Up @@ -135,6 +159,15 @@ public RelNode visit(GraphLogicalSingleMatch match) {
Pointer ptrSentence = LIB.initPatternSentence(FfiJoinKind.Inner);
addFfiBinder(ptrSentence, match.getSentence(), true);
checkFfiResult(LIB.addPatternSentence(ptrPattern, ptrSentence));
com.alibaba.graphscope.common.ir.runtime.proto.Utils.protoRowType(
match.getRowType(), isColumnId)
.forEach(
k -> {
checkFfiResult(
LIB.addPatternMeta(
ptrPattern,
new FfiPbPointer.ByValue(k.toByteArray())));
});
return new PhysicalNode(match, ptrPattern);
case OPTIONAL:
case ANTI:
Expand All @@ -151,6 +184,14 @@ public RelNode visit(GraphLogicalMultiMatch match) {
addFfiBinder(ptrSentence, sentence, true);
checkFfiResult(LIB.addPatternSentence(ptrPattern, ptrSentence));
}
com.alibaba.graphscope.common.ir.runtime.proto.Utils.protoRowType(
match.getRowType(), isColumnId)
.forEach(
k -> {
checkFfiResult(
LIB.addPatternMeta(
ptrPattern, new FfiPbPointer.ByValue(k.toByteArray())));
});
return new PhysicalNode(match, ptrPattern);
}

Expand Down Expand Up @@ -183,6 +224,14 @@ public PhysicalNode visit(GraphLogicalProject project) {
new FfiPbPointer.ByValue(expression.toByteArray()),
ffiAlias));
}
com.alibaba.graphscope.common.ir.runtime.proto.Utils.protoRowType(
project.getRowType(), isColumnId)
.forEach(
k -> {
checkFfiResult(
LIB.addProjectMeta(
ptrProject, new FfiPbPointer.ByValue(k.toByteArray())));
});
return new PhysicalNode(project, ptrProject);
}

Expand Down Expand Up @@ -249,6 +298,14 @@ public PhysicalNode visit(GraphLogicalAggregate aggregate) {
ffiAggOpt,
ffiAlias));
}
com.alibaba.graphscope.common.ir.runtime.proto.Utils.protoRowType(
aggregate.getRowType(), isColumnId)
.forEach(
k -> {
checkFfiResult(
LIB.addGroupbyKeyValueMeta(
ptrGroup, new FfiPbPointer.ByValue(k.toByteArray())));
});
return new PhysicalNode(aggregate, ptrGroup);
}

Expand Down
14 changes: 14 additions & 0 deletions ...active_engine/compiler/src/main/java/com/alibaba/graphscope/common/jna/IrCoreLibrary.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,18 @@ FfiResult.ByValue appendPatternOperator(
FfiResult.ByValue addParamsExtra(Pointer params, String key, String value);

Pointer initSinkGraphOperator(String graphName);

FfiResult.ByValue setScanMeta(Pointer scan, FfiPbPointer.ByValue meta);

FfiResult.ByValue setEdgexpdMeta(Pointer edgexpd, FfiPbPointer.ByValue meta);

FfiResult.ByValue setGetvMeta(Pointer getV, FfiPbPointer.ByValue meta);

FfiResult.ByValue addProjectMeta(Pointer project, FfiPbPointer.ByValue meta);

FfiResult.ByValue addGroupbyKeyValueMeta(Pointer groupBy, FfiPbPointer.ByValue meta);

FfiResult.ByValue addPatternMeta(Pointer pattern, FfiPbPointer.ByValue meta);

FfiResult.ByValue setUnfoldMeta(Pointer unfold, FfiPbPointer.ByValue meta);
}
16 changes: 6 additions & 10 deletions ...e/compiler/src/test/java/com/alibaba/graphscope/common/ir/runtime/FfiLogicalPlanTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

public class FfiLogicalPlanTest {
// Match (x:person)-[:knows*1..3]->(:person {age: 10})
// Return count(*)
@Test
public void logical_plan_1_test() throws Exception {
GraphBuilder builder = Utils.mockGraphBuilder();
Expand All @@ -50,7 +51,7 @@ public void logical_plan_1_test() throws Exception {
.pathOpt(GraphOpt.PathExpandPath.SIMPLE)
.resultOpt(GraphOpt.PathExpandResult.ALL_V)
.build();
RelNode node =
RelNode aggregate =
builder.source(
new SourceConfig(
GraphOpt.Source.VERTEX,
Expand All @@ -63,26 +64,21 @@ public void logical_plan_1_test() throws Exception {
GraphStdOperatorTable.EQUALS,
pxdBuilder.variable(null, "age"),
pxdBuilder.literal(10)))
.build();
RelNode aggregate =
builder.match(node, GraphOpt.Match.INNER)
.aggregate(builder.groupKey(), builder.count(builder.variable("x")))
.build();
Assert.assertEquals(
"GraphLogicalAggregate(keys=[{variables=[], aliases=[]}], values=[[{operands=[x],"
+ " aggFunction=COUNT, alias='$f0', distinct=false}]])\n"
+ " GraphLogicalSingleMatch(input=[null],"
+ " sentence=[GraphLogicalGetV(tableConfig=[{isAll=false, tables=[person]}],"
+ " GraphLogicalGetV(tableConfig=[{isAll=false, tables=[person]}],"
+ " alias=[DEFAULT], fusedFilter=[[=(DEFAULT.age, 10)]], opt=[END])\n"
+ " GraphLogicalPathExpand(expand=[GraphLogicalExpand(tableConfig=[{isAll=false,"
+ " GraphLogicalPathExpand(expand=[GraphLogicalExpand(tableConfig=[{isAll=false,"
+ " tables=[knows]}], alias=[DEFAULT], opt=[OUT])\n"
+ "], getV=[GraphLogicalGetV(tableConfig=[{isAll=false, tables=[person]}],"
+ " alias=[DEFAULT], opt=[END])\n"
+ "], offset=[1], fetch=[3], path_opt=[SIMPLE], result_opt=[ALL_V],"
+ " alias=[DEFAULT])\n"
+ " GraphLogicalSource(tableConfig=[{isAll=false, tables=[person]}],"
+ " alias=[x], opt=[VERTEX])\n"
+ "], matchOpt=[INNER])",
+ " GraphLogicalSource(tableConfig=[{isAll=false, tables=[person]}],"
+ " alias=[x], opt=[VERTEX])",
aggregate.explain().trim());
try (PhysicalBuilder<byte[]> ffiBuilder =
new FfiPhysicalBuilder(
Expand Down
Loading

0 comments on commit b37ab90

Please sign in to comment.