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.

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

Jump to bottom

Fix issue 1219 - MERGE not seeing previous clause var #1441

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Fix issue 1219 - MERGE not seeing previous clause var #1441

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
110 changes: 110 additions & 0 deletions regress/expected/cypher_merge.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,116 @@ SELECT * FROM cypher('cypher_merge', $$ MERGE p=(x:r)-[y:E]->(p)-[x]->(y) $$) AS
ERROR: variable "p" is for a path
LINE 1: ...M cypher('cypher_merge', $$ MERGE p=(x:r)-[y:E]->(p)-[x]->(y...
^
-- issue 1219
SELECT * FROM create_graph('issue_1219');
NOTICE: graph "issue_1219" has been created
create_graph
--------------

(1 row)

SELECT * FROM cypher('issue_1219', $$ CREATE (x:Label1{arr:[1,2,3,4]}) RETURN x $$) as (a agtype);
a
-----------------------------------------------------------------------------------------
{"id": 844424930131969, "label": "Label1", "properties": {"arr": [1, 2, 3, 4]}}::vertex
(1 row)

SELECT * FROM cypher('issue_1219', $$
MATCH (x:Label1{arr:[1,2,3,4]}) MERGE (y:Label2{key1:2, key2:x.arr, key3:3}) RETURN y
$$) as (result agtype);
result
-----------------------------------------------------------------------------------------------------------------
{"id": 1125899906842625, "label": "Label2", "properties": {"key1": 2, "key2": [1, 2, 3, 4], "key3": 3}}::vertex
(1 row)

SELECT * FROM cypher('issue_1219', $$
MATCH (x:Label1{arr:[1,2,3,4]}) MERGE (y:Label2{key2:id(x)}) RETURN y
$$) as (result agtype);
result
----------------------------------------------------------------------------------------------
{"id": 1125899906842626, "label": "Label2", "properties": {"key2": 844424930131969}}::vertex
(1 row)

SELECT * FROM cypher('issue_1219', $$ MATCH (x) RETURN x $$) as (a agtype);
a
-----------------------------------------------------------------------------------------------------------------
{"id": 844424930131969, "label": "Label1", "properties": {"arr": [1, 2, 3, 4]}}::vertex
{"id": 1125899906842625, "label": "Label2", "properties": {"key1": 2, "key2": [1, 2, 3, 4], "key3": 3}}::vertex
{"id": 1125899906842626, "label": "Label2", "properties": {"key2": 844424930131969}}::vertex
(3 rows)

-- these shouldn't create more
SELECT * FROM cypher('issue_1219', $$
MATCH (x:Label1{arr:[1,2,3,4]}) MERGE (y:Label2{key1:2, key2:x.arr, key3:3}) RETURN y
$$) as (result agtype);
result
-----------------------------------------------------------------------------------------------------------------
{"id": 1125899906842625, "label": "Label2", "properties": {"key1": 2, "key2": [1, 2, 3, 4], "key3": 3}}::vertex
(1 row)

SELECT * FROM cypher('issue_1219', $$
MATCH (x:Label1{arr:[1,2,3,4]}) MERGE (y:Label2{key2:id(x)}) RETURN y
$$) as (result agtype);
result
----------------------------------------------------------------------------------------------
{"id": 1125899906842626, "label": "Label2", "properties": {"key2": 844424930131969}}::vertex
(1 row)

SELECT * FROM cypher('issue_1219', $$ MATCH (x) RETURN x $$) as (a agtype);
a
-----------------------------------------------------------------------------------------------------------------
{"id": 844424930131969, "label": "Label1", "properties": {"arr": [1, 2, 3, 4]}}::vertex
{"id": 1125899906842625, "label": "Label2", "properties": {"key1": 2, "key2": [1, 2, 3, 4], "key3": 3}}::vertex
{"id": 1125899906842626, "label": "Label2", "properties": {"key2": 844424930131969}}::vertex
(3 rows)

-- create a path
SELECT * FROM cypher('issue_1219', $$
CREATE (u:Label1{name: "John"})-[e:knows]->(v:Label1{name: "Jane"})
$$) as (result agtype);
result
--------
(0 rows)

SELECT * FROM cypher('issue_1219', $$
MATCH (u:Label1{name:"John"})-[e:knows]->(v:Label1{name: "Jane"})
MERGE (y:Label2{start_id:id(u), edge_id:id(e), end_id:id(v)}) RETURN y
$$) as (result agtype);
result
----------------------------------------------------------------------------------------------------------------------------------------------------------
{"id": 1125899906842627, "label": "Label2", "properties": {"end_id": 844424930131971, "edge_id": 1407374883553281, "start_id": 844424930131970}}::vertex
(1 row)

SELECT * FROM cypher('issue_1219', $$ MATCH (x) RETURN x $$) as (result agtype);
result
----------------------------------------------------------------------------------------------------------------------------------------------------------
{"id": 844424930131969, "label": "Label1", "properties": {"arr": [1, 2, 3, 4]}}::vertex
{"id": 844424930131970, "label": "Label1", "properties": {"name": "John"}}::vertex
{"id": 844424930131971, "label": "Label1", "properties": {"name": "Jane"}}::vertex
{"id": 1125899906842625, "label": "Label2", "properties": {"key1": 2, "key2": [1, 2, 3, 4], "key3": 3}}::vertex
{"id": 1125899906842626, "label": "Label2", "properties": {"key2": 844424930131969}}::vertex
{"id": 1125899906842627, "label": "Label2", "properties": {"end_id": 844424930131971, "edge_id": 1407374883553281, "start_id": 844424930131970}}::vertex
(6 rows)

SELECT * FROM cypher('issue_1219', $$ MATCH ()-[e]->() RETURN e $$) as (result agtype);
result
----------------------------------------------------------------------------------------------------------------------------
{"id": 1407374883553281, "label": "knows", "end_id": 844424930131971, "start_id": 844424930131970, "properties": {}}::edge
(1 row)

SELECT drop_graph('issue_1219', true);
NOTICE: drop cascades to 5 other objects
DETAIL: drop cascades to table issue_1219._ag_label_vertex
drop cascades to table issue_1219._ag_label_edge
drop cascades to table issue_1219."Label1"
drop cascades to table issue_1219."Label2"
drop cascades to table issue_1219.knows
NOTICE: graph "issue_1219" has been dropped
drop_graph
------------

(1 row)

--clean up
SELECT * FROM cypher('cypher_merge', $$MATCH (n) DETACH DELETE n $$) AS (a agtype);
a
Expand Down
30 changes: 30 additions & 0 deletions regress/sql/cypher_merge.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,36 @@ SELECT * FROM cypher('cypher_merge', $$ MERGE p=(x:r)-[y:E]->(x)-[p]->(x) $$) AS
SELECT * FROM cypher('cypher_merge', $$ MERGE p=(x:r)-[y:E]->(x)-[p:E]->(x) $$) AS (x agtype);
SELECT * FROM cypher('cypher_merge', $$ MERGE p=(x:r)-[y:E]->(p)-[x]->(y) $$) AS (x agtype);

-- issue 1219
SELECT * FROM create_graph('issue_1219');
SELECT * FROM cypher('issue_1219', $$ CREATE (x:Label1{arr:[1,2,3,4]}) RETURN x $$) as (a agtype);
SELECT * FROM cypher('issue_1219', $$
MATCH (x:Label1{arr:[1,2,3,4]}) MERGE (y:Label2{key1:2, key2:x.arr, key3:3}) RETURN y
$$) as (result agtype);
SELECT * FROM cypher('issue_1219', $$
MATCH (x:Label1{arr:[1,2,3,4]}) MERGE (y:Label2{key2:id(x)}) RETURN y
$$) as (result agtype);
SELECT * FROM cypher('issue_1219', $$ MATCH (x) RETURN x $$) as (a agtype);
-- these shouldn't create more
SELECT * FROM cypher('issue_1219', $$
MATCH (x:Label1{arr:[1,2,3,4]}) MERGE (y:Label2{key1:2, key2:x.arr, key3:3}) RETURN y
$$) as (result agtype);
SELECT * FROM cypher('issue_1219', $$
MATCH (x:Label1{arr:[1,2,3,4]}) MERGE (y:Label2{key2:id(x)}) RETURN y
$$) as (result agtype);
SELECT * FROM cypher('issue_1219', $$ MATCH (x) RETURN x $$) as (a agtype);
-- create a path
SELECT * FROM cypher('issue_1219', $$
CREATE (u:Label1{name: "John"})-[e:knows]->(v:Label1{name: "Jane"})
$$) as (result agtype);
SELECT * FROM cypher('issue_1219', $$
MATCH (u:Label1{name:"John"})-[e:knows]->(v:Label1{name: "Jane"})
MERGE (y:Label2{start_id:id(u), edge_id:id(e), end_id:id(v)}) RETURN y
$$) as (result agtype);
SELECT * FROM cypher('issue_1219', $$ MATCH (x) RETURN x $$) as (result agtype);
SELECT * FROM cypher('issue_1219', $$ MATCH ()-[e]->() RETURN e $$) as (result agtype);
SELECT drop_graph('issue_1219', true);

--clean up
SELECT * FROM cypher('cypher_merge', $$MATCH (n) DETACH DELETE n $$) AS (a agtype);

Expand Down
4 changes: 4 additions & 0 deletions src/backend/nodes/cypher_outfuncs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ void out_cypher_path(StringInfo str, const ExtensibleNode *node)
DEFINE_AG_NODE(cypher_path);

WRITE_NODE_FIELD(path);
WRITE_STRING_FIELD(var_name);
WRITE_STRING_FIELD(parsed_var_name);
WRITE_LOCATION_FIELD(location);
}

Expand All @@ -203,6 +205,7 @@ void out_cypher_node(StringInfo str, const ExtensibleNode *node)
DEFINE_AG_NODE(cypher_node);

WRITE_STRING_FIELD(name);
WRITE_STRING_FIELD(parsed_name);
WRITE_STRING_FIELD(label);
WRITE_STRING_FIELD(parsed_label);
WRITE_NODE_FIELD(props);
Expand All @@ -215,6 +218,7 @@ void out_cypher_relationship(StringInfo str, const ExtensibleNode *node)
DEFINE_AG_NODE(cypher_relationship);

WRITE_STRING_FIELD(name);
WRITE_STRING_FIELD(parsed_name);
WRITE_STRING_FIELD(label);
WRITE_STRING_FIELD(parsed_label);
WRITE_NODE_FIELD(props);
Expand Down
10 changes: 5 additions & 5 deletions src/backend/optimizer/cypher_createplan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Plan *plan_cypher_set_path(PlannerInfo *root, RelOptInfo *rel,
}

/*
* Coverts the Scan node representing the delete clause
* Coverts the Scan node representing the DELETE clause
* to the delete Plan node
*/
Plan *plan_cypher_delete_path(PlannerInfo *root, RelOptInfo *rel,
Expand Down Expand Up @@ -168,7 +168,7 @@ Plan *plan_cypher_delete_path(PlannerInfo *root, RelOptInfo *rel,
// child plan nodes are here, Postgres processed them for us.
cs->custom_plans = custom_plans;
cs->custom_exprs = NIL;
// transfer delete metadata needed by the delete clause.
// transfer delete metadata needed by the DELETE clause.
cs->custom_private = best_path->custom_private;
/*
* the scan list of the delete node's children, used for ScanTupleSlot
Expand All @@ -183,7 +183,7 @@ Plan *plan_cypher_delete_path(PlannerInfo *root, RelOptInfo *rel,
}

/*
* Coverts the Scan node representing the delete clause
* Coverts the Scan node representing the MERGE clause
* to the merge Plan node
*/
Plan *plan_cypher_merge_path(PlannerInfo *root, RelOptInfo *rel,
Expand All @@ -206,7 +206,7 @@ Plan *plan_cypher_merge_path(PlannerInfo *root, RelOptInfo *rel,

cs->scan.plan.plan_node_id = 0; // Set later in set_plan_refs
/*
* the scan list of the delete node, used for its ScanTupleSlot used
* the scan list of the merge node, used for its ScanTupleSlot used
* by its parent in the execution phase.
*/
cs->scan.plan.targetlist = tlist;
Expand All @@ -229,7 +229,7 @@ Plan *plan_cypher_merge_path(PlannerInfo *root, RelOptInfo *rel,
// child plan nodes are here, Postgres processed them for us.
cs->custom_plans = custom_plans;
cs->custom_exprs = NIL;
// transfer delete metadata needed by the delete clause.
// transfer delete metadata needed by the MERGE clause.
cs->custom_private = best_path->custom_private;
/*
* the scan list of the merge node's children, used for ScanTupleSlot
Expand Down
2 changes: 1 addition & 1 deletion src/backend/optimizer/cypher_pathnode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ CustomPath *create_cypher_delete_path(PlannerInfo *root, RelOptInfo *rel,
}

/*
* Creates a Delete Path. Makes the original path a child of the new
* Creates a merge path. Makes the original path a child of the new
* path. We leave it to the caller to replace the pathlist of the rel.
*/
CustomPath *create_cypher_merge_path(PlannerInfo *root, RelOptInfo *rel,
Expand Down
68 changes: 64 additions & 4 deletions src/backend/parser/cypher_clause.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ static Node *transform_clause_for_join(cypher_parsestate *cpstate,
Alias* alias);
static cypher_clause *convert_merge_to_match(cypher_merge *merge);
static void
transform_cypher_merge_mark_tuple_position(List *target_list,
transform_cypher_merge_mark_tuple_position(cypher_parsestate *cpstate,
List *target_list,
cypher_create_path *path);
static cypher_target_node *get_referenced_variable(ParseState *pstate,
Node *node,
Expand Down Expand Up @@ -6262,7 +6263,7 @@ static Query *transform_cypher_merge(cypher_parsestate *cpstate,
* For the metadata need to create paths, find the tuple position that
* will represent the entity in the execution phase.
*/
transform_cypher_merge_mark_tuple_position(query->targetList,
transform_cypher_merge_mark_tuple_position(cpstate, query->targetList,
merge_path);
}

Expand Down Expand Up @@ -6413,7 +6414,7 @@ transform_merge_make_lateral_join(cypher_parsestate *cpstate, Query *query,
* For the metadata need to create paths, find the tuple position that
* will represent the entity in the execution phase.
*/
transform_cypher_merge_mark_tuple_position(query->targetList,
transform_cypher_merge_mark_tuple_position(cpstate, query->targetList,
merge_path);

return merge_path;
Expand All @@ -6425,7 +6426,8 @@ transform_merge_make_lateral_join(cypher_parsestate *cpstate, Query *query,
* function to keep the optimizer from removing the TargetEntry.
*/
static void
transform_cypher_merge_mark_tuple_position(List *target_list,
transform_cypher_merge_mark_tuple_position(cypher_parsestate *cpstate,
List *target_list,
cypher_create_path *path)
{
ListCell *lc = NULL;
Expand Down Expand Up @@ -6461,6 +6463,64 @@ transform_cypher_merge_mark_tuple_position(List *target_list,
// Mark the tuple position the target_node is for.
node->tuple_position = te->resno;
}

/* Iterate through the entities wrapping Var nodes with the volatile
* wrapper, if not already done.
*
* NOTE: add_volatile_wrapper function will not wrap itself so the following
* is safe to do.
*
* TODO: This ideally needs to be rewritten using a walker, to be more
* selective. However, walkers are tricky and take time to set up. For
* now, we brute force it. It is already restricted to explicitly
* named variables.
*
* TODO: We need to understand why add_volatile_wrapper is needed. Meaning,
* we need to understand why variables are removed by the function
* remove_unused_subquery_outputs. It "appears" that some linkage may
* not be set up properly, not allowing the PG logic to see that a
* variable is used from a previous clause. Right now, the volatile
* wrapper will suffice, but it is still a hack imho.
*
* TODO: There may be other locations where something similar may need to be
* done. This needs to be researched.
*/
foreach (lc, cpstate->entities)
{
transform_entity *te = lfirst(lc);
Node *node = (Node*) te->entity.node;
char *name = NULL;

if (is_ag_node(node, cypher_node))
{
name = te->entity.node->parsed_name;
}
else if (is_ag_node(node, cypher_relationship))
{
name = te->entity.rel->parsed_name;
}
else if (is_ag_node(node, cypher_path))
{
name = te->entity.path->parsed_var_name;
}
else
{
ereport(ERROR,
(errcode(ERRCODE_DATA_EXCEPTION),
errmsg("unexpected transform_entity entity type")));
}

/* node needs to have a parsed_name, meaning a name from the query */
if (name != NULL)
{
TargetEntry *tle = findTarget(target_list, name);

if (tle != NULL && IsA(tle->expr, Var))
{
tle->expr = add_volatile_wrapper(tle->expr);
}
}
}
}

/*
Expand Down
5 changes: 5 additions & 0 deletions src/backend/parser/cypher_gram.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,7 @@ path:

p = (cypher_path *)$3;
p->var_name = $1;
p->parsed_var_name = $1;
p->location = @1;

$$ = (Node *)p;
Expand All @@ -1221,6 +1222,7 @@ anonymous_path:
n = make_ag_node(cypher_path);
n->path = $1;
n->var_name = NULL;
n->parsed_var_name = NULL;
n->location = @1;

$$ = (Node *)n;
Expand Down Expand Up @@ -1271,6 +1273,7 @@ path_node:

n = make_ag_node(cypher_node);
n->name = $2;
n->parsed_name = $2;
n->label = $3;
n->parsed_label = $3;
n->props = $4;
Expand Down Expand Up @@ -1317,6 +1320,7 @@ path_relationship_body:

n = make_ag_node(cypher_relationship);
n->name = $2;
n->parsed_name = $2;
n->label = $3;
n->parsed_label = $3;
n->varlen = $4;
Expand All @@ -1331,6 +1335,7 @@ path_relationship_body:

n = make_ag_node(cypher_relationship);
n->name = NULL;
n->parsed_name = NULL;
n->label = NULL;
n->parsed_label = NULL;
n->varlen = NULL;
Expand Down
3 changes: 3 additions & 0 deletions src/include/nodes/cypher_nodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ typedef struct cypher_path
ExtensibleNode extensible;
List *path; // [ node ( , relationship , node , ... ) ]
char *var_name;
char *parsed_var_name;
int location;
} cypher_path;

Expand All @@ -141,6 +142,7 @@ typedef struct cypher_node
{
ExtensibleNode extensible;
char *name;
char *parsed_name;
char *label;
char *parsed_label;
Node *props; // map or parameter
Expand All @@ -159,6 +161,7 @@ typedef struct cypher_relationship
{
ExtensibleNode extensible;
char *name;
char *parsed_name;
char *label;
char *parsed_label;
Node *props; // map or parameter
Expand Down