Skip to content

Add vertex and edge composite types with direct field access optimization #2303

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.

Sign up for GitHub

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

Open
MuhammadTahaNaveed wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add vertex and edge composite types with direct field access optimization #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
92 changes: 46 additions & 46 deletions regress/expected/agtype.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3251,49 +3251,49 @@ NOTICE: graph "agtype_null_duplicate_test" has been dropped
-- Vertex
--
--Basic Vertex Creation
SELECT _agtype_build_vertex('1'::graphid, $$label_name$$, agtype_build_map());
SELECT _agtype_build_vertex('1'::graphid, '"label_name"', agtype_build_map());
_agtype_build_vertex
------------------------------------------------------------
{"id": 1, "label": "label_name", "properties": {}}::vertex
(1 row)

SELECT _agtype_build_vertex('1'::graphid, $$label$$, agtype_build_map('id', 2));
SELECT _agtype_build_vertex('1'::graphid, '"label"', agtype_build_map('id', 2));
_agtype_build_vertex
--------------------------------------------------------------
{"id": 1, "label": "label", "properties": {"id": 2}}::vertex
(1 row)

--Null properties
SELECT _agtype_build_vertex('1'::graphid, $$label_name$$, NULL);
SELECT _agtype_build_vertex('1'::graphid, '"label_name"', NULL);
_agtype_build_vertex
------------------------------------------------------------
{"id": 1, "label": "label_name", "properties": {}}::vertex
(1 row)

--Test access operator
SELECT agtype_access_operator(_agtype_build_vertex('1'::graphid, $$label$$,
SELECT agtype_access_operator(_agtype_build_vertex('1'::graphid, '"label"',
agtype_build_map('id', 2)), '"id"');
agtype_access_operator
------------------------
2
(1 row)

SELECT _agtype_build_vertex('1'::graphid, $$label$$, agtype_build_list());
SELECT _agtype_build_vertex('1'::graphid, '"label"', agtype_build_list());
ERROR: _agtype_build_vertex() properties argument must be an object
--Vertex in a map
SELECT agtype_build_map(
'vertex',
_agtype_build_vertex('1'::graphid, $$label_name$$, agtype_build_map()));
_agtype_build_vertex('1'::graphid, '"label_name"', agtype_build_map()));
agtype_build_map
------------------------------------------------------------------------
{"vertex": {"id": 1, "label": "label_name", "properties": {}}::vertex}
(1 row)

SELECT agtype_access_operator(
agtype_build_map(
'vertex', _agtype_build_vertex('1'::graphid, $$label_name$$,
'vertex', _agtype_build_vertex('1'::graphid, '"label_name"',
agtype_build_map('key', 'value')),
'other_vertex', _agtype_build_vertex('1'::graphid, $$label_name$$,
'other_vertex', _agtype_build_vertex('1'::graphid, '"label_name"',
agtype_build_map('key', 'other_value'))),
'"vertex"');
agtype_access_operator
Expand All @@ -3303,18 +3303,18 @@ SELECT agtype_access_operator(

--Vertex in a list
SELECT agtype_build_list(
_agtype_build_vertex('1'::graphid, $$label_name$$, agtype_build_map()),
_agtype_build_vertex('2'::graphid, $$label_name$$, agtype_build_map()));
_agtype_build_vertex('1'::graphid, '"label_name"', agtype_build_map()),
_agtype_build_vertex('2'::graphid, '"label_name"', agtype_build_map()));
agtype_build_list
--------------------------------------------------------------------------------------------------------------------------
[{"id": 1, "label": "label_name", "properties": {}}::vertex, {"id": 2, "label": "label_name", "properties": {}}::vertex]
(1 row)

SELECT agtype_access_operator(
agtype_build_list(
_agtype_build_vertex('1'::graphid, $$label_name$$,
_agtype_build_vertex('1'::graphid, '"label_name"',
agtype_build_map('id', 3)),
_agtype_build_vertex('2'::graphid, $$label_name$$,
_agtype_build_vertex('2'::graphid, '"label_name"',
agtype_build_map('id', 4))), '0');
agtype_access_operator
-------------------------------------------------------------------
Expand All @@ -3326,30 +3326,30 @@ SELECT agtype_access_operator(
--
--Basic Edge Creation
SELECT _agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, agtype_build_map());
'"label_name"', agtype_build_map());
_agtype_build_edge
--------------------------------------------------------------------------------------
{"id": 1, "label": "label_name", "end_id": 3, "start_id": 2, "properties": {}}::edge
(1 row)

SELECT _agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label$$, agtype_build_map('id', 2));
'"label"', agtype_build_map('id', 2));
_agtype_build_edge
----------------------------------------------------------------------------------------
{"id": 1, "label": "label", "end_id": 3, "start_id": 2, "properties": {"id": 2}}::edge
(1 row)

--Null properties
SELECT _agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, NULL);
'"label_name"', NULL);
_agtype_build_edge
--------------------------------------------------------------------------------------
{"id": 1, "label": "label_name", "end_id": 3, "start_id": 2, "properties": {}}::edge
(1 row)

--Test access operator
SELECT agtype_access_operator(_agtype_build_edge('1'::graphid, '2'::graphid,
'3'::graphid, $$label$$, agtype_build_map('id', 2)),'"id"');
'3'::graphid, '"label"', agtype_build_map('id', 2)),'"id"');
agtype_access_operator
------------------------
2
Expand All @@ -3359,7 +3359,7 @@ SELECT agtype_access_operator(_agtype_build_edge('1'::graphid, '2'::graphid,
SELECT agtype_build_map(
'edge',
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, agtype_build_map()));
'"label_name"', agtype_build_map()));
agtype_build_map
------------------------------------------------------------------------------------------------
{"edge": {"id": 1, "label": "label_name", "end_id": 3, "start_id": 2, "properties": {}}::edge}
Expand All @@ -3368,9 +3368,9 @@ SELECT agtype_build_map(
SELECT agtype_access_operator(
agtype_build_map(
'edge', _agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, agtype_build_map('key', 'value')),
'"label_name"', agtype_build_map('key', 'value')),
'other_edge', _agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, agtype_build_map('key', 'other_value'))),
'"label_name"', agtype_build_map('key', 'other_value'))),
'"edge"');
agtype_access_operator
----------------------------------------------------------------------------------------------------
Expand All @@ -3380,19 +3380,19 @@ SELECT agtype_access_operator(
--Edge in a list
SELECT agtype_build_list(
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, agtype_build_map()),
'"label_name"', agtype_build_map()),
_agtype_build_edge('2'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, agtype_build_map()));
'"label_name"', agtype_build_map()));
agtype_build_list
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[{"id": 1, "label": "label_name", "end_id": 3, "start_id": 2, "properties": {}}::edge, {"id": 2, "label": "label_name", "end_id": 3, "start_id": 2, "properties": {}}::edge]
(1 row)

SELECT agtype_access_operator(
agtype_build_list(
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid, $$label_name$$,
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid, '"label_name"',
agtype_build_map('id', 3)),
_agtype_build_edge('2'::graphid, '2'::graphid, '3'::graphid, $$label_name$$,
_agtype_build_edge('2'::graphid, '2'::graphid, '3'::graphid, '"label_name"',
agtype_build_map('id', 4))), '0');
agtype_access_operator
---------------------------------------------------------------------------------------------
Expand All @@ -3401,10 +3401,10 @@ SELECT agtype_access_operator(

-- Path
SELECT _agtype_build_path(
_agtype_build_vertex('2'::graphid, $$label_name$$, agtype_build_map()),
_agtype_build_vertex('2'::graphid, '"label_name"', agtype_build_map()),
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label$$, agtype_build_map('id', 2)),
_agtype_build_vertex('3'::graphid, $$label_name$$, agtype_build_map())
'"label"', agtype_build_map('id', 2)),
_agtype_build_vertex('3'::graphid, '"label_name"', agtype_build_map())
);
_agtype_build_path
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand All @@ -3413,78 +3413,78 @@ SELECT _agtype_build_path(

--All these paths should produce Errors
SELECT _agtype_build_path(
_agtype_build_vertex('2'::graphid, $$label_name$$, agtype_build_map()),
_agtype_build_vertex('2'::graphid, '"label_name"', agtype_build_map()),
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label$$, agtype_build_map('id', 2))
'"label"', agtype_build_map('id', 2))
);
ERROR: a path is of the form: [vertex, (edge, vertex)*i] where i >= 0
SELECT _agtype_build_path(
_agtype_build_vertex('2'::graphid, $$label_name$$, agtype_build_map()),
_agtype_build_vertex('2'::graphid, '"label_name"', agtype_build_map()),
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label$$, agtype_build_map('id', 2)),
_agtype_build_vertex('3'::graphid, $$label_name$$, agtype_build_map()),
'"label"', agtype_build_map('id', 2)),
_agtype_build_vertex('3'::graphid, '"label_name"', agtype_build_map()),
_agtype_build_edge('1'::graphid, '4'::graphid, '5'::graphid,
$$label$$, agtype_build_map('id', 2))
'"label"', agtype_build_map('id', 2))
);
ERROR: a path is of the form: [vertex, (edge, vertex)*i] where i >= 0
SELECT _agtype_build_path(
_agtype_build_vertex('2'::graphid, $$label_name$$, agtype_build_map()),
_agtype_build_vertex('2'::graphid, '"label_name"', agtype_build_map()),
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label$$, agtype_build_map('id', 2)),
'"label"', agtype_build_map('id', 2)),
NULL
);
ERROR: argument 3 must not be null
SELECT _agtype_build_path(
_agtype_build_vertex('2'::graphid, $$label_name$$, agtype_build_map()),
_agtype_build_vertex('2'::graphid, '"label_name"', agtype_build_map()),
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label$$, agtype_build_map('id', 2)),
'"label"', agtype_build_map('id', 2)),
1
);
ERROR: argument 3 must be an agtype
SELECT _agtype_build_path(
_agtype_build_vertex('2'::graphid, $$label_name$$, agtype_build_map()),
_agtype_build_vertex('2'::graphid, '"label_name"', agtype_build_map()),
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label$$, agtype_build_map('id', 2)),
'"label"', agtype_build_map('id', 2)),
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label$$, agtype_build_map('id', 2))
'"label"', agtype_build_map('id', 2))
);
ERROR: paths consist of alternating vertices and edges
HINT: argument 3 must be an vertex
--
-- id, startid, endid
--
SELECT age_id(_agtype_build_vertex('1'::graphid, $$label_name$$, agtype_build_map()));
SELECT age_id(_agtype_build_vertex('1'::graphid, '"label_name"', agtype_build_map()));
age_id
--------
1
(1 row)

SELECT age_id(_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, agtype_build_map('id', 2)));
'"label_name"', agtype_build_map('id', 2)));
age_id
--------
1
(1 row)

SELECT age_start_id(_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, agtype_build_map('id', 2)));
'"label_name"', agtype_build_map('id', 2)));
age_start_id
--------------
2
(1 row)

SELECT age_end_id(_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label_name$$, agtype_build_map('id', 2)));
'"label_name"', agtype_build_map('id', 2)));
age_end_id
------------
3
(1 row)

SELECT age_id(_agtype_build_path(
_agtype_build_vertex('2'::graphid, $$label_name$$, agtype_build_map()),
_agtype_build_vertex('2'::graphid, '"label_name"', agtype_build_map()),
_agtype_build_edge('1'::graphid, '2'::graphid, '3'::graphid,
$$label$$, agtype_build_map('id', 2)),
_agtype_build_vertex('3'::graphid, $$label$$, agtype_build_map('id', 2))
'"label"', agtype_build_map('id', 2)),
_agtype_build_vertex('3'::graphid, '"label"', agtype_build_map('id', 2))
));
ERROR: id() argument must be a vertex, an edge or null
SELECT age_id(agtype_in('1'));
Expand Down
6 changes: 3 additions & 3 deletions regress/expected/cypher_match.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,10 +710,10 @@ $$) AS (r0 agtype);
---------------------------------------------------------------------------------------------------------------------------
{"id": 1407374883553282, "label": "e1", "end_id": 1125899906842626, "start_id": 1125899906842625, "properties": {}}::edge
{"id": 1407374883553281, "label": "e1", "end_id": 1125899906842627, "start_id": 1125899906842626, "properties": {}}::edge
{"id": 1970324836974594, "label": "e2", "end_id": 1688849860263937, "start_id": 1688849860263938, "properties": {}}::edge
{"id": 1970324836974593, "label": "e2", "end_id": 1688849860263939, "start_id": 1688849860263938, "properties": {}}::edge
{"id": 2533274790395905, "label": "e3", "end_id": 2251799813685250, "start_id": 2251799813685251, "properties": {}}::edge
{"id": 1970324836974594, "label": "e2", "end_id": 1688849860263937, "start_id": 1688849860263938, "properties": {}}::edge
{"id": 2533274790395906, "label": "e3", "end_id": 2251799813685250, "start_id": 2251799813685249, "properties": {}}::edge
{"id": 2533274790395905, "label": "e3", "end_id": 2251799813685250, "start_id": 2251799813685251, "properties": {}}::edge
(6 rows)

SELECT * FROM cypher('cypher_match', $$
Expand All @@ -730,8 +730,8 @@ SELECT * FROM cypher('cypher_match', $$
$$) AS (r0 agtype);
r0
---------------------------------------------------------------------------------------------------------------------------
{"id": 1970324836974594, "label": "e2", "end_id": 1688849860263937, "start_id": 1688849860263938, "properties": {}}::edge
{"id": 1970324836974593, "label": "e2", "end_id": 1688849860263939, "start_id": 1688849860263938, "properties": {}}::edge
{"id": 1970324836974594, "label": "e2", "end_id": 1688849860263937, "start_id": 1688849860263938, "properties": {}}::edge
(2 rows)

SELECT * FROM cypher('cypher_match', $$
Expand Down
Loading