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

Fix multiple match joined on edge produce wrong result #4923

Merged
merged 12 commits into from
Nov 24, 2022

Conversation

codesigner
Copy link
Contributor

@codesigner codesigner commented Nov 23, 2022

What type of PR is this?

  • bug
  • feature
  • enhancement

What problem(s) does this PR solve?

Issue(s) number:

fix #4921
fix #4917

Description:

  • Edge added a id() function to encode it's key in string, which is need when join on edge
  • id function produce NullBadType for edge before, fixed with return edge's id()
  • an internal function _joinkey was added to produce join key, not used the id() function anymore
  • AliasType added a new type kEdgeList indicate "[e:*x..y]" , distinguish from Edge;
  • Tck was covered.

This PR fix two bugs

Bug 1

Multiple match joined on edge is not properly joined, the joined key is a BadNull (fixed by new adde edge's id() function)
Data to reproduce the bug:

  • There is only one edge point from Tim Duncan to Tony Parker
  • Tim Duncan has 3 out edge
  • Tony Parker has 5 in edge
(root@nebula) [basketballplayer]>       MATCH p=(v:player)-[e]->(u:player) WHERE v.player.name=="Tim Duncan" and  u.player.name=="Tony Parker" return p
+------------------------------------------------------------------------------------------------------------------------------------+
| p                                                                                                                                  |
+------------------------------------------------------------------------------------------------------------------------------------+
| <("player100" :player{age: 42, name: "Tim Duncan"})-[:follow@0 {degree: 95}]->("player101" :player{age: 36, name: "Tony Parker"})> |
+------------------------------------------------------------------------------------------------------------------------------------+

(root@nebula) [basketballplayer]>       MATCH p = (v:player)-[e]->() WHERE v.player.name=="Tim Duncan" return count(p)
+----------+
| count(p) |
+----------+
| 3        |
+----------+
Got 1 rows (time spent 5.879ms/6.762867ms)

Wed, 23 Nov 2022 16:46:21 CST

(root@nebula) [basketballplayer]>       MATCH p=()-[e]->(u:player) WHERE u.player.name=="Tony Parker" return count(p)
+----------+
| count(p) |
+----------+
| 5        |
+----------+
Got 1 rows (time spent 6.784ms/7.658707ms)
  • Before Fix:
    All edge start from Tim Duncan, and all edges end with Tony Parker, all there edges joined on the BadNull key, produce 15 result (all match, like cross joined), the result is WROING
(root@nebula) [basketballplayer]>       MATCH (v:player)-[e]->() WHERE v.player.name=="Tim Duncan" MATCH ()-[e]->(u:player) WHERE u.player.name=="Tony Parker"return v, u
+----------------------------------------------------+-----------------------------------------------------+
| v                                                  | u                                                   |
+----------------------------------------------------+-----------------------------------------------------+
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
+----------------------------------------------------+-----------------------------------------------------+
Got 15 rows (time spent 6.909ms/8.443643ms)
  • After Fixed
    Joined on the new added edge id(string), produce the only edge between the two nodes which is correct.
(root@nebula) [basketballplayer]>       MATCH (v:player)-[e]->() WHERE v.player.name=="Tim Duncan" MATCH ()-[e]->(u:player) WHERE u.player.name=="Tony Parker"return v, u
+----------------------------------------------------+-----------------------------------------------------+
| v                                                  | u                                                   |
+----------------------------------------------------+-----------------------------------------------------+
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"}) |
+----------------------------------------------------+-----------------------------------------------------+
Bug 2
  • Before Fix
(root@nebula) [basketballplayer]> MATCH (v:player)-[e:follow*1..2]->(u) WHERE v.player.name=="Tim Duncan" MATCH (vv:player)-[e]->() WHERE vv.player.name=="Tony Parker"return v, u
+----------------------------------------------------+-----------------------------------------------------------+
| v                                                  | u                                                         |
+----------------------------------------------------+-----------------------------------------------------------+
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"})       |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"})       |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"})       |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"})       |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player101" :player{age: 36, name: "Tony Parker"})       |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player102" :player{age: 33, name: "LaMarcus Aldridge"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player102" :player{age: 33, name: "LaMarcus Aldridge"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player102" :player{age: 33, name: "LaMarcus Aldridge"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player102" :player{age: 33, name: "LaMarcus Aldridge"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player102" :player{age: 33, name: "LaMarcus Aldridge"}) |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player100" :player{age: 42, name: "Tim Duncan"})        |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
| ("player100" :player{age: 42, name: "Tim Duncan"}) | ("player125" :player{age: 41, name: "Manu Ginobili"})     |
+----------------------------------------------------+-----------------------------------------------------------+
Got 30 rows (time spent 6.763ms/7.990917ms)

Produce a WRONG result, but it should not to. because type of e binding to in the 1st MATCH is List of edge, while e in the 2nd MATCH is Edge, they are different type, can not be joined, this query should produce semantic error like neo4j see #4921

  • After Fix
(root@nebula) [basketballplayer]> MATCH (v:player)-[e:follow*1..2]->(u) WHERE v.player.name=="Tim Duncan" MATCH (vv:player)-[e]->() WHERE vv.player.name=="Tony Parker"return v, u
[ERROR (-1009)]: SemanticError: e binding to different type: Edge vs EdgeList

Checklist:

Tests:

  • TCK
  • Unit test(positive and negative cases)
  • Function test
  • Performance test
  • N/A

Affects:

  • Documentation affected (Please add the label if documentation needs to be modified.)
  • Incompatibility (If it breaks the compatibility, please describe it and add the label.)
  • If it's needed to cherry-pick (If cherry-pick to some branches is required, please label the destination version(s).)
  • Performance impacted: Consumes more CPU/Memory

Release notes:

Please confirm whether to be reflected in release notes and how to describe:

ex. Fixed the bug .....

@codesigner codesigner merged commit 8842efb into vesoft-inc:master Nov 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review ready-for-testing PR: ready for the CI test
Projects
None yet
5 participants