Skip to content

Fix MERGE edges on 32-bit builds: keep path_entry ids as graphids #2602

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
laquereric wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix MERGE edges on 32-bit builds: keep path_entry ids as graphids #2602

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
28 changes: 19 additions & 9 deletions src/backend/executor/cypher_merge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
*
* Note: This structure is only useful for paths when stored in a dynamic
* array.
*
* Note: id, start_id and end_id hold graphid values, never Datums. They are
* converted with GRAPHID_GET_DATUM/DATUM_GET_GRAPHID where they meet a
* Datum. On a 64-bit build the two are the same bits, but with
* SIZEOF_DATUM=4 a graphid Datum is a pointer, and storing it here (or
* reading a graphid stored here as a Datum) writes edges with
* start_id/end_id from whatever that address holds.
*/
typedef struct path_entry
{
Expand Down Expand Up @@ -1270,8 +1277,9 @@ static Datum merge_vertex(cypher_merge_custom_scan_state *css,
path_array != NULL &&
path_array[path_index] != NULL)
{
id = path_array[path_index]->id;
isNull = path_array[path_index]->id_isNull;
id = isNull ? (Datum) 0 :
GRAPHID_GET_DATUM(path_array[path_index]->id);
}
/*
* Otherwise, we need to retrieve the vertex normally and store its
Expand All @@ -1285,7 +1293,8 @@ static Datum merge_vertex(cypher_merge_custom_scan_state *css,
if (path_array != NULL && path_array[path_index] != NULL)
{
/* store it */
path_array[path_index]->id = id;
path_array[path_index]->id = isNull ? 0 :
DATUM_GET_GRAPHID(id);
path_array[path_index]->id_isNull = isNull;
}
}
Expand Down Expand Up @@ -1422,7 +1431,7 @@ static Datum merge_vertex(cypher_merge_custom_scan_state *css,
else if (path_array != NULL && path_array[path_index] != NULL)
{
/* retrieve the id of the vertex */
id = path_array[path_index]->id;
id = GRAPHID_GET_DATUM(path_array[path_index]->id);

/*
* Add the Datum to the list of entities for creating the path variable
Expand Down Expand Up @@ -1606,10 +1615,11 @@ static void merge_edge(cypher_merge_custom_scan_state *css,
path_array != NULL &&
path_array[path_index] != NULL)
{
id = path_array[path_index]->id;
isNull = path_array[path_index]->id_isNull;
start_id = path_array[path_index]->start_id;
end_id = path_array[path_index]->end_id;
id = isNull ? (Datum) 0 :
GRAPHID_GET_DATUM(path_array[path_index]->id);
start_id = GRAPHID_GET_DATUM(path_array[path_index]->start_id);
end_id = GRAPHID_GET_DATUM(path_array[path_index]->end_id);
}
/*
* Otherwise, we need to get the edge's ID and store its unique values if
Expand All @@ -1623,10 +1633,10 @@ static void merge_edge(cypher_merge_custom_scan_state *css,
if (path_array != NULL && path_array[path_index] != NULL)
{
/* store it */
path_array[path_index]->id = id;
path_array[path_index]->id = isNull ? 0 : DATUM_GET_GRAPHID(id);
path_array[path_index]->id_isNull = isNull;
path_array[path_index]->start_id = start_id;
path_array[path_index]->end_id = end_id;
path_array[path_index]->start_id = DATUM_GET_GRAPHID(start_id);
path_array[path_index]->end_id = DATUM_GET_GRAPHID(end_id);
}
}
else
Expand Down