Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Graph Features for Prism Interface #519

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
93e474e
Prepare statement processing for the introduction of graphs
May 16, 2024
bb40400
Improve code readability
May 16, 2024
cc9e6b6
Add basic graph execution
May 16, 2024
d92e9bc
Add relational graph results
May 16, 2024
585dbd6
Add graph results
May 16, 2024
eb63649
Add graph serialization tests
May 17, 2024
e536fed
Use mavenLocal for driver
May 17, 2024
c44d234
Add testcase for relational multimodel operations
May 17, 2024
28989ed
Add testcase for multi-model relational metadata
May 17, 2024
e89ad2a
Add test for multimodel mql
May 17, 2024
8933073
Fix ddl result bug
May 17, 2024
aad24ef
Rephrase error message
May 17, 2024
5cc1df7
Add cypher tests
May 17, 2024
a660672
Remove broken assertion
Jul 4, 2024
c1642f8
Adjust test
Jul 4, 2024
eb4b060
Fix node serialization
Jul 5, 2024
aa036e5
Add not implemented exception and todo for paths
Jul 18, 2024
5091b41
Update api version
Jul 18, 2024
0a86c9d
Put classes into corresponding packages
Jul 19, 2024
3bedb68
Fix method access
Jul 19, 2024
208d7c3
Update to new Prism API files
gartens Oct 4, 2024
7ce3517
Use switch expression
gartens Oct 4, 2024
c1635e6
Rename source/target to left/right
gartens Oct 4, 2024
7b00a38
Fix fallout from rebase
gartens Oct 9, 2024
038d96d
Fix instances missed in previous
gartens Oct 9, 2024
5a65a20
Improve switch expression
gartens Oct 9, 2024
badae33
Use .toList() instead of Collectors.toList()
gartens Oct 9, 2024
c748e29
Remove unused state and errorCode from PIServiceExceptions
gartens Oct 9, 2024
45ba7a9
Make getExecutor switch over the data models
gartens Oct 9, 2024
e4ca96e
Fix tests
gartens Oct 4, 2024
74d36ef
Make conditionals easier to read
gartens Oct 9, 2024
23b8eec
Format code & optimize imports
gartens Oct 9, 2024
24efde1
Use Map.of instead of new HashMap
gartens Oct 9, 2024
5e2d29e
Fix PrismUtilsTest
gartens Oct 10, 2024
83e9e11
Add back GEOMETRY
gartens Oct 10, 2024
634792b
Clean up after CypherTests
gartens Oct 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix node serialization
Tobias Hafner authored and gartens committed Oct 21, 2024
commit eb4b060fa46adc86c1d1eb1068aaa99380cde2ce
Original file line number Diff line number Diff line change
@@ -309,25 +309,29 @@ public static ProtoDocument buildProtoDocument( PolyDocument polyDocument ) {


public static ProtoNode buildProtoNode( PolyNode polyNode ) {
return ProtoNode.newBuilder()
ProtoNode.Builder node = ProtoNode.newBuilder()
.setId( polyNode.getId().getValue() )
.setName( polyNode.getVariableName().getValue() )
.addAllLabels( polyNode.getLabels().stream().map( l -> ((PolyString) l).getValue() ).collect( Collectors.toList() ) )
.addAllProperties( serializeToProtoEntryList( polyNode.properties.asMap() ) )
.build();
.addAllLabels( polyNode.getLabels().stream().map( l -> l.getValue() ).collect( Collectors.toList() ) )
.addAllProperties( serializeToProtoEntryList( polyNode.properties.asMap() ) );
if ( !(polyNode.variableName == null) ) {
node.setName( polyNode.variableName.getValue() );
}
return node.build();
}


public static ProtoEdge buildProtoEdge( PolyEdge polyEdge ) {
return ProtoEdge.newBuilder()
ProtoEdge.Builder edge = ProtoEdge.newBuilder()
.setId( polyEdge.getId().getValue() )
.setName( polyEdge.getVariableName().getValue() )
.addAllLabels( polyEdge.getLabels().stream().map( l -> ((PolyString) l).getValue() ).collect( Collectors.toList() ) )
.addAllLabels( polyEdge.getLabels().stream().map( l -> l.getValue() ).collect( Collectors.toList() ) )
.addAllProperties( serializeToProtoEntryList( polyEdge.properties.asMap() ) )
.setSource( polyEdge.getSource().getValue() )
.setTarget( polyEdge.getTarget().getValue() )
.setDirection( buildProtoEdgeDirection( polyEdge.getDirection() ) )
.build();
.setDirection( buildProtoEdgeDirection( polyEdge.getDirection() ) );
if ( !(polyEdge.variableName == null) ) {
edge.setName( polyEdge.getVariableName().getValue() );
}
return edge.build();
}