From bee3cc20a3d0c6867be703887a3122aaea7187c8 Mon Sep 17 00:00:00 2001 From: raz-mon Date: Sun, 4 Dec 2022 15:11:57 +0200 Subject: [PATCH 1/2] fixed expected execution plan, restored tox image --- tests/test_asyncio/test_graph.py | 12 ++++-------- tests/test_graph.py | 12 ++++-------- tox.ini | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/tests/test_asyncio/test_graph.py b/tests/test_asyncio/test_graph.py index 78242568fe..d349971691 100644 --- a/tests/test_asyncio/test_graph.py +++ b/tests/test_asyncio/test_graph.py @@ -437,11 +437,11 @@ async def test_explain(modclient: redis.Redis): Distinct Join Project - Conditional Traverse | (t:Team)->(r:Rider) + Conditional Traverse | (t)->(r:Rider) Filter Node By Label Scan | (t:Team) Project - Conditional Traverse | (t:Team)->(r:Rider) + Conditional Traverse | (t)->(r:Rider) Filter Node By Label Scan | (t:Team)""" assert str(result).replace(" ", "").replace("\n", "") == expected.replace( @@ -453,9 +453,7 @@ async def test_explain(modclient: redis.Redis): Operation("Join") .append_child( Operation("Project").append_child( - Operation( - "Conditional Traverse", "(t:Team)->(r:Rider)" - ).append_child( + Operation("Conditional Traverse", "(t)->(r:Rider)").append_child( Operation("Filter").append_child( Operation("Node By Label Scan", "(t:Team)") ) @@ -464,9 +462,7 @@ async def test_explain(modclient: redis.Redis): ) .append_child( Operation("Project").append_child( - Operation( - "Conditional Traverse", "(t:Team)->(r:Rider)" - ).append_child( + Operation("Conditional Traverse", "(t)->(r:Rider)").append_child( Operation("Filter").append_child( Operation("Node By Label Scan", "(t:Team)") ) diff --git a/tests/test_graph.py b/tests/test_graph.py index cc6433ca52..ebda8e312b 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -528,11 +528,11 @@ def test_explain(client): Distinct Join Project - Conditional Traverse | (t:Team)->(r:Rider) + Conditional Traverse | (t)->(r:Rider) Filter Node By Label Scan | (t:Team) Project - Conditional Traverse | (t:Team)->(r:Rider) + Conditional Traverse | (t)->(r:Rider) Filter Node By Label Scan | (t:Team)""" assert str(result).replace(" ", "").replace("\n", "") == expected.replace( @@ -544,9 +544,7 @@ def test_explain(client): Operation("Join") .append_child( Operation("Project").append_child( - Operation( - "Conditional Traverse", "(t:Team)->(r:Rider)" - ).append_child( + Operation("Conditional Traverse", "(t)->(r:Rider)").append_child( Operation("Filter").append_child( Operation("Node By Label Scan", "(t:Team)") ) @@ -555,9 +553,7 @@ def test_explain(client): ) .append_child( Operation("Project").append_child( - Operation( - "Conditional Traverse", "(t:Team)->(r:Rider)" - ).append_child( + Operation("Conditional Traverse", "(t)->(r:Rider)").append_child( Operation("Filter").append_child( Operation("Node By Label Scan", "(t:Team)") ) diff --git a/tox.ini b/tox.ini index 4eda45f935..85b3242857 100644 --- a/tox.ini +++ b/tox.ini @@ -94,7 +94,7 @@ volumes = [docker:redismod] name = redismod -image = redis/redis-stack-server:latest +image = redislabs/redismod:edge ports = 36379:6379/tcp healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',36379)) else False" From e648bd953dfeabb1495cd9f55d696c5e77357fa6 Mon Sep 17 00:00:00 2001 From: raz-mon Date: Sun, 4 Dec 2022 15:24:28 +0200 Subject: [PATCH 2/2] fix --- tests/test_asyncio/test_graph.py | 2 +- tests/test_graph.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_asyncio/test_graph.py b/tests/test_asyncio/test_graph.py index d349971691..7e70baae89 100644 --- a/tests/test_asyncio/test_graph.py +++ b/tests/test_asyncio/test_graph.py @@ -406,7 +406,7 @@ async def test_execution_plan(modclient: redis.Redis): "MATCH (r:Rider)-[:rides]->(t:Team) WHERE t.name = $name RETURN r.name, t.name, $params", # noqa {"name": "Yehuda"}, ) - expected = "Results\n Project\n Conditional Traverse | (t:Team)->(r:Rider)\n Filter\n Node By Label Scan | (t:Team)" # noqa + expected = "Results\n Project\n Conditional Traverse | (t)->(r:Rider)\n Filter\n Node By Label Scan | (t:Team)" # noqa assert result == expected await redis_graph.delete() diff --git a/tests/test_graph.py b/tests/test_graph.py index ebda8e312b..d71df48688 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -497,7 +497,7 @@ def test_execution_plan(client): "MATCH (r:Rider)-[:rides]->(t:Team) WHERE t.name = $name RETURN r.name, t.name, $params", # noqa {"name": "Yehuda"}, ) - expected = "Results\n Project\n Conditional Traverse | (t:Team)->(r:Rider)\n Filter\n Node By Label Scan | (t:Team)" # noqa + expected = "Results\n Project\n Conditional Traverse | (t)->(r:Rider)\n Filter\n Node By Label Scan | (t:Team)" # noqa assert result == expected redis_graph.delete()