Content-Length: 47364 | pFad | http://github.com/RedisGraph/JRedisGraph/pull/105.patch

thub.com From b4ea3926cdadbef64e75798272e48a53d23476e5 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Thu, 21 Jan 2021 22:43:23 +0000 Subject: [PATCH 1/8] Add support for graph.RO_QUERY command --- .../com/redislabs/redisgraph/RedisGraph.java | 48 +++++++++++ .../impl/api/AbstractRedisGraph.java | 79 +++++++++++++++++++ .../impl/api/ContextedRedisGraph.java | 44 +++++++++++ .../redisgraph/impl/api/RedisGraph.java | 31 ++++++++ .../impl/api/RedisGraphCommand.java | 1 + .../redisgraph/RedisGraphAPITest.java | 44 +++++++++++ 6 files changed, 247 insertions(+) diff --git a/src/main/java/com/redislabs/redisgraph/RedisGraph.java b/src/main/java/com/redislabs/redisgraph/RedisGraph.java index 3a2ae19..187ca3c 100644 --- a/src/main/java/com/redislabs/redisgraph/RedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/RedisGraph.java @@ -14,6 +14,14 @@ public interface RedisGraph extends Closeable { */ ResultSet query(String graphId, String query); + /** + * Execute a Cypher read-only query. + * @param graphId a graph to perform the query on + * @param query Cypher query + * @return a result set + */ + ResultSet queryReadOnly(String graphId, String query); + /** * Execute a Cypher query with timeout. * @param graphId a graph to perform the query on @@ -23,6 +31,16 @@ public interface RedisGraph extends Closeable { */ ResultSet query(String graphId, String query, long timeout); + /** + * Execute a Cypher read-only query with timeout. + * @param graphId a graph to perform the query on + * @param query Cypher query + * @param timeout + * @return a result set + */ + ResultSet queryReadOnly(String graphId, String query, long timeout); + + /** * Execute a Cypher query with arguments * @param graphId a graph to perform the query on @@ -34,6 +52,17 @@ public interface RedisGraph extends Closeable { @Deprecated ResultSet query(String graphId, String query, Object ...args); + /** + * Execute a Cypher read-only query with arguments + * @param graphId a graph to perform the query on + * @param query Cypher query + * @param args + * @return a result set + * @deprecated use {@link #query(String, String, Map)} instead. + */ + @Deprecated + ResultSet queryReadOnly(String graphId, String query, Object ...args); + /** * Executes a cypher query with parameters. * @param graphId a graph to perform the query on. @@ -43,6 +72,15 @@ public interface RedisGraph extends Closeable { */ ResultSet query(String graphId, String query, Map params); + /** + * Executes a cypher read-only query with parameters. + * @param graphId a graph to perform the query on. + * @param query Cypher query. + * @param params parameters map. + * @return a result set. + */ + ResultSet queryReadOnly(String graphId, String query, Map params); + /** * Executes a cypher query with parameters and timeout. * @param graphId a graph to perform the query on. @@ -53,6 +91,16 @@ public interface RedisGraph extends Closeable { */ ResultSet query(String graphId, String query, Map params, long timeout); + /** + * Executes a cypher read-only query with parameters and timeout. + * @param graphId a graph to perform the query on. + * @param query Cypher query. + * @param params parameters map. + * @param timeout + * @return a result set. + */ + ResultSet queryReadOnly(String graphId, String query, Map params, long timeout); + /** * Invokes stored procedures without arguments * @param graphId a graph to perform the query on diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java b/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java index e1149e0..973297f 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java @@ -27,6 +27,14 @@ public abstract class AbstractRedisGraph implements RedisGraph { */ protected abstract ResultSet sendQuery(String graphId, String preparedQuery); + /** + * Sends a read-only query to the redis graph. Implementation and context dependent + * @param graphId graph to be queried + * @param preparedQuery prepared query + * @return Result set + */ + protected abstract ResultSet sendReadOnlyQuery(String graphId, String preparedQuery); + /** * Sends a query to the redis graph.Implementation and context dependent * @param graphId graph to be queried @@ -36,6 +44,15 @@ public abstract class AbstractRedisGraph implements RedisGraph { */ protected abstract ResultSet sendQuery(String graphId, String preparedQuery, long timeout); + /** + * Sends a read-query to the redis graph.Implementation and context dependent + * @param graphId graph to be queried + * @param preparedQuery prepared query + * @param timeout + * @return Result set + */ + protected abstract ResultSet sendReadOnlyQuery(String graphId, String preparedQuery, long timeout); + /** * Execute a Cypher query. * @param graphId a graph to perform the query on @@ -46,6 +63,16 @@ public ResultSet query(String graphId, String query) { return sendQuery(graphId, query); } + /** + * Execute a Cypher read-only query. + * @param graphId a graph to perform the query on + * @param query Cypher query + * @return a result set + */ + public ResultSet queryReadOnly(String graphId, String query) { + return sendReadOnlyQuery(graphId, query); + } + /** * Execute a Cypher query with timeout. * @param graphId a graph to perform the query on @@ -58,6 +85,18 @@ public ResultSet query(String graphId, String query, long timeout) { return sendQuery(graphId, query, timeout); } + /** + * Execute a Cypher read-only query with timeout. + * @param graphId a graph to perform the query on + * @param timeout + * @param query Cypher query + * @return a result set + */ + @Override + public ResultSet queryReadOnly(String graphId, String query, long timeout) { + return sendReadOnlyQuery(graphId, query, timeout); + } + /** * Execute a Cypher query with arguments * @param graphId a graph to perform the query on @@ -72,6 +111,20 @@ public ResultSet query(String graphId, String query, Object ...args) { return sendQuery(graphId, preparedQuery); } + /** + * Execute a Cypher read-only query with arguments + * @param graphId a graph to perform the query on + * @param query Cypher query + * @param args + * @return a result set + * @deprecated use {@link #query(String, String, Map)} instead. + */ + @Deprecated + public ResultSet queryReadOnly(String graphId, String query, Object ...args) { + String preparedQuery = Utils.prepareQuery(query, args); + return sendReadOnlyQuery(graphId, preparedQuery); + } + /** * Executes a cypher query with parameters. * @param graphId a graph to perform the query on. @@ -84,6 +137,18 @@ public ResultSet query(String graphId, String query, Map params) return sendQuery(graphId, preparedQuery); } + /** + * Executes a cypher read-only query with parameters. + * @param graphId a graph to perform the query on. + * @param query Cypher query. + * @param params parameters map. + * @return a result set. + */ + public ResultSet queryReadOnly(String graphId, String query, Map params) { + String preparedQuery = Utils.prepareQuery(query, params); + return sendReadOnlyQuery(graphId, preparedQuery); + } + /** * Executes a cypher query with parameters and timeout. * @param graphId a graph to perform the query on. @@ -98,6 +163,20 @@ public ResultSet query(String graphId, String query, Map params, return sendQuery(graphId, preparedQuery, timeout); } + /** + * Executes a cypher read-only query with parameters and timeout. + * @param graphId a graph to perform the query on. + * @param timeout + * @param query Cypher query. + * @param params parameters map. + * @return a result set. + */ + @Override + public ResultSet queryReadOnly(String graphId, String query, Map params, long timeout) { + String preparedQuery = Utils.prepareQuery(query, params); + return sendReadOnlyQuery(graphId, preparedQuery, timeout); + } + public ResultSet callProcedure(String graphId, String procedure){ return callProcedure(graphId, procedure, Utils.DUMMY_LIST, Utils.DUMMY_MAP); } diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java b/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java index fb9fce9..01eed6c 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java @@ -60,6 +60,27 @@ protected ResultSet sendQuery(String graphId, String preparedQuery) { } } + /** + * Sends the read-only query over the instance only connection + * @param graphId graph to be queried + * @param preparedQuery prepared query + * @return Result set with the query answer + */ + @Override + protected ResultSet sendReadOnlyQuery(String graphId, String preparedQuery) { + Jedis conn = getConnection(); + try { + List rawResponse = (List) conn.sendCommand(RedisGraphCommand.RO_QUERY, graphId, preparedQuery, Utils.COMPACT_STRING); + return new ResultSetImpl(rawResponse, this, caches.getGraphCache(graphId)); + } + catch (JRedisGraphRunTimeException rt) { + throw rt; + } + catch (JedisDataException j) { + throw new JRedisGraphCompileTimeException(j); + } + } + /** * Sends the query over the instance only connection * @param graphId graph to be queried @@ -83,6 +104,29 @@ protected ResultSet sendQuery(String graphId, String preparedQuery, long timeout } } + /** + * Sends the read-only query over the instance only connection + * @param graphId graph to be queried + * @param timeout + * @param preparedQuery prepared query + * @return Result set with the query answer + */ + @Override + protected ResultSet sendReadOnlyQuery(String graphId, String preparedQuery, long timeout) { + Jedis conn = getConnection(); + try { + List rawResponse = (List) conn.sendBlockingCommand(RedisGraphCommand.RO_QUERY, + graphId, preparedQuery, Utils.COMPACT_STRING, Utils.TIMEOUT_STRING, Long.toString(timeout)); + return new ResultSetImpl(rawResponse, this, caches.getGraphCache(graphId)); + } + catch (JRedisGraphRunTimeException rt) { + throw rt; + } + catch (JedisDataException j) { + throw new JRedisGraphCompileTimeException(j); + } + } + /** * @return Returns the instance Jedis connection. */ diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java b/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java index c2f4cc2..1bb0f50 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java @@ -69,6 +69,21 @@ protected ResultSet sendQuery(String graphId, String preparedQuery){ } } + /** + * Overrides the abstract function. + * Sends the read-only query from any Jedis connection received from the Jedis pool and closes it once done + * @param graphId graph to be queried + * @param preparedQuery prepared query + * @return Result set with the query answer + */ + @Override + protected ResultSet sendReadOnlyQuery(String graphId, String preparedQuery){ + try (ContextedRedisGraph contextedRedisGraph = new ContextedRedisGraph(getConnection())) { + contextedRedisGraph.setRedisGraphCaches(caches); + return contextedRedisGraph.sendReadOnlyQuery(graphId, preparedQuery); + } + } + /** * Overrides the abstract function. * Sends the query from any Jedis connection received from the Jedis pool and closes it once done @@ -85,6 +100,22 @@ protected ResultSet sendQuery(String graphId, String preparedQuery, long timeout } } + /** + * Overrides the abstract function. + * Sends the read-only query from any Jedis connection received from the Jedis pool and closes it once done + * @param graphId graph to be queried + * @param preparedQuery prepared query + * @param timeout + * @return Result set with the query answer + */ + @Override + protected ResultSet sendReadOnlyQuery(String graphId, String preparedQuery, long timeout){ + try (ContextedRedisGraph contextedRedisGraph = new ContextedRedisGraph(getConnection())) { + contextedRedisGraph.setRedisGraphCaches(caches); + return contextedRedisGraph.sendReadOnlyQuery(graphId, preparedQuery, timeout); + } + } + /** * Closes the Jedis pool */ diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraphCommand.java b/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraphCommand.java index 3db45d0..0af0f61 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraphCommand.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraphCommand.java @@ -9,6 +9,7 @@ */ public enum RedisGraphCommand implements ProtocolCommand { QUERY("graph.QUERY"), + RO_QUERY("graph.RO_QUERY"), DELETE("graph.DELETE"); private final byte[] raw; diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index 9e3769a..d44dfc9 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -479,6 +479,8 @@ public void testEscapedQuery() { Assert.assertNotNull(api.query("social", "CREATE (:escaped{s1:%s,s2:%s})", "S\"'", "S'\"")); Assert.assertNotNull(api.query("social", "MATCH (n) where n.s1=%s and n.s2=%s RETURN n", "S\"'", "S'\"")); Assert.assertNotNull(api.query("social", "MATCH (n) where n.s1='S\"' RETURN n")); + Assert.assertNotNull(api.queryReadOnly("social", "MATCH (n) where n.s1='S\"' RETURN n")); + } @Test @@ -866,14 +868,19 @@ public void testParameters(){ Object param = parameters[i]; params.put("param", param); ResultSet resultSet = api.query("social", "RETURN $param", params); + ResultSet resultSetRo = api.queryReadOnly("social", "RETURN $param", params); Assert.assertEquals(1, resultSet.size()); + Assert.assertEquals(1, resultSetRo.size()); Record r = resultSet.next(); + Record rRo = resultSetRo.next(); Object o = r.getValue(0); + Object oRo = rRo.getValue(0); Object expected = expected_anwsers[i]; if(i == parameters.length-1) { expected = Arrays.asList((Object[])expected); } Assert.assertEquals(expected, o); + Assert.assertEquals(expected, oRo); } } @@ -954,11 +961,48 @@ public void testCachedExecution() { Assert.assertTrue(resultSet.getStatistics().cachedExecution()); } + @Test + public void testCachedExecutionReadOnly() { + api.query("social", "CREATE (:N {val:1}), (:N {val:2})"); + + // First time should not be loaded from execution cache + Map params = new HashMap<>(); + params.put("val", 1L); + ResultSet resultSet = api.queryReadOnly("social","MATCH (n:N {val:$val}) RETURN n.val", params); + Assert.assertEquals(1, resultSet.size()); + Record r = resultSet.next(); + Assert.assertEquals(params.get("val"), r.getValue(0)); + Assert.assertFalse(resultSet.getStatistics().cachedExecution()); + + // Run in loop many times to make sure the query will be loaded + // from cache at least once + for (int i = 0 ; i < 64; i++){ + resultSet = api.queryReadOnly("social","MATCH (n:N {val:$val}) RETURN n.val", params); + } + Assert.assertEquals(1, resultSet.size()); + r = resultSet.next(); + Assert.assertEquals(params.get("val"), r.getValue(0)); + Assert.assertTrue(resultSet.getStatistics().cachedExecution()); + } + @Test public void timeoutArgument() { ResultSet rs = api.query("social", "UNWIND range(0,100) AS x WITH x AS x WHERE x = 100 RETURN x", 1L); + ResultSet rsRo = api.queryReadOnly("social", "UNWIND range(0,100) AS x WITH x AS x WHERE x = 100 RETURN x", 1L); Assert.assertEquals(1, rs.size()); + Assert.assertEquals(1, rsRo.size()); Record r = rs.next(); + Record rRo = rsRo.next(); Assert.assertEquals(Long.valueOf(100), r.getValue(0)); + Assert.assertEquals(Long.valueOf(100), rRo.getValue(0)); + } + + @Test + public void testSimpleReadOnly() { + api.query("social","CREATE (:person{name:'filipe',age:30})"); + ResultSet rsRo = api.queryReadOnly("social", "MATCH (a:person) WHERE (a.name = 'filipe') RETURN a.age"); + Assert.assertEquals(1, rsRo.size()); + Record r = rsRo.next(); + Assert.assertEquals(Long.valueOf(30), r.getValue(0)); } } From f97e01943cd63f51e076fc1acac31885c6bf0f9c Mon Sep 17 00:00:00 2001 From: filipe oliveira Date: Sun, 24 Jan 2021 16:10:54 +0000 Subject: [PATCH 2/8] Apply suggestions from code review Co-authored-by: DvirDukhan --- src/main/java/com/redislabs/redisgraph/RedisGraph.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/redislabs/redisgraph/RedisGraph.java b/src/main/java/com/redislabs/redisgraph/RedisGraph.java index 187ca3c..bbb324a 100644 --- a/src/main/java/com/redislabs/redisgraph/RedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/RedisGraph.java @@ -20,7 +20,7 @@ public interface RedisGraph extends Closeable { * @param query Cypher query * @return a result set */ - ResultSet queryReadOnly(String graphId, String query); + ResultSet readOnlyQuery(String graphId, String query); /** * Execute a Cypher query with timeout. @@ -38,7 +38,7 @@ public interface RedisGraph extends Closeable { * @param timeout * @return a result set */ - ResultSet queryReadOnly(String graphId, String query, long timeout); + ResultSet readOnlyQuery(String graphId, String query, long timeout); /** @@ -79,7 +79,7 @@ public interface RedisGraph extends Closeable { * @param params parameters map. * @return a result set. */ - ResultSet queryReadOnly(String graphId, String query, Map params); + ResultSet readOnlyQuery(String graphId, String query, Map params); /** * Executes a cypher query with parameters and timeout. @@ -99,7 +99,7 @@ public interface RedisGraph extends Closeable { * @param timeout * @return a result set. */ - ResultSet queryReadOnly(String graphId, String query, Map params, long timeout); + ResultSet readOnlyQuery(String graphId, String query, Map params, long timeout); /** * Invokes stored procedures without arguments From bc99b667fd8c57b5f2caf8528041891fdc4d2636 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Sun, 24 Jan 2021 16:12:29 +0000 Subject: [PATCH 3/8] [fix] Fixes per PR review: removed deprecated read-only variants --- .../java/com/redislabs/redisgraph/RedisGraph.java | 10 ---------- .../redisgraph/impl/api/AbstractRedisGraph.java | 14 -------------- 2 files changed, 24 deletions(-) diff --git a/src/main/java/com/redislabs/redisgraph/RedisGraph.java b/src/main/java/com/redislabs/redisgraph/RedisGraph.java index 187ca3c..be7b709 100644 --- a/src/main/java/com/redislabs/redisgraph/RedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/RedisGraph.java @@ -52,16 +52,6 @@ public interface RedisGraph extends Closeable { @Deprecated ResultSet query(String graphId, String query, Object ...args); - /** - * Execute a Cypher read-only query with arguments - * @param graphId a graph to perform the query on - * @param query Cypher query - * @param args - * @return a result set - * @deprecated use {@link #query(String, String, Map)} instead. - */ - @Deprecated - ResultSet queryReadOnly(String graphId, String query, Object ...args); /** * Executes a cypher query with parameters. diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java b/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java index 973297f..5d6fc32 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java @@ -111,20 +111,6 @@ public ResultSet query(String graphId, String query, Object ...args) { return sendQuery(graphId, preparedQuery); } - /** - * Execute a Cypher read-only query with arguments - * @param graphId a graph to perform the query on - * @param query Cypher query - * @param args - * @return a result set - * @deprecated use {@link #query(String, String, Map)} instead. - */ - @Deprecated - public ResultSet queryReadOnly(String graphId, String query, Object ...args) { - String preparedQuery = Utils.prepareQuery(query, args); - return sendReadOnlyQuery(graphId, preparedQuery); - } - /** * Executes a cypher query with parameters. * @param graphId a graph to perform the query on. From 9de69a2c6424c1f8e72f1187031c320b21778cc6 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Sun, 24 Jan 2021 16:27:15 +0000 Subject: [PATCH 4/8] [fix] Fixes per PR review: added RO to transactions. --- .../redisgraph/RedisGraphTransaction.java | 36 +++++++++ .../impl/api/AbstractRedisGraph.java | 8 +- .../impl/api/RedisGraphTransaction.java | 79 +++++++++++++++++++ .../redisgraph/RedisGraphAPITest.java | 35 +++++--- 4 files changed, 143 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/redislabs/redisgraph/RedisGraphTransaction.java b/src/main/java/com/redislabs/redisgraph/RedisGraphTransaction.java index 08259fe..cbcd127 100644 --- a/src/main/java/com/redislabs/redisgraph/RedisGraphTransaction.java +++ b/src/main/java/com/redislabs/redisgraph/RedisGraphTransaction.java @@ -31,6 +31,14 @@ public interface RedisGraphTransaction extends */ Response query(String graphId, String query); + /** + * Execute a Cypher read-only query. + * @param graphId a graph to perform the query on + * @param query Cypher query + * @return a response which builds the result set with the query answer. + */ + Response readOnlyQuery(String graphId, String query); + /** * Execute a Cypher query with timeout. * @param graphId a graph to perform the query on @@ -40,6 +48,15 @@ public interface RedisGraphTransaction extends */ Response query(String graphId, String query, long timeout); + /** + * Execute a Cypher read-only query with timeout. + * @param graphId a graph to perform the query on + * @param query Cypher query + * @param timeout + * @return a response which builds the result set with the query answer. + */ + Response readOnlyQuery(String graphId, String query, long timeout); + /** * Execute a Cypher query with arguments * @param graphId a graph to perform the query on @@ -60,6 +77,15 @@ public interface RedisGraphTransaction extends */ Response query(String graphId, String query, Map params); + /** + * Executes a cypher read-only query with parameters. + * @param graphId a graph to perform the query on. + * @param query Cypher query. + * @param params parameters map. + * @return a response which builds the result set with the query answer. + */ + Response readOnlyQuery(String graphId, String query, Map params); + /** * Executes a cypher query with parameters and timeout. * @param graphId a graph to perform the query on. @@ -70,6 +96,16 @@ public interface RedisGraphTransaction extends */ Response query(String graphId, String query, Map params, long timeout); + /** + * Executes a cypher read-only query with parameters and timeout. + * @param graphId a graph to perform the query on. + * @param query Cypher query. + * @param params parameters map. + * @param timeout + * @return a response which builds the result set with the query answer. + */ + Response readOnlyQuery(String graphId, String query, Map params, long timeout); + /** * Invokes stored procedures without arguments * @param graphId a graph to perform the query on diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java b/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java index 5d6fc32..57fce53 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java @@ -69,7 +69,7 @@ public ResultSet query(String graphId, String query) { * @param query Cypher query * @return a result set */ - public ResultSet queryReadOnly(String graphId, String query) { + public ResultSet readOnlyQuery(String graphId, String query) { return sendReadOnlyQuery(graphId, query); } @@ -93,7 +93,7 @@ public ResultSet query(String graphId, String query, long timeout) { * @return a result set */ @Override - public ResultSet queryReadOnly(String graphId, String query, long timeout) { + public ResultSet readOnlyQuery(String graphId, String query, long timeout) { return sendReadOnlyQuery(graphId, query, timeout); } @@ -130,7 +130,7 @@ public ResultSet query(String graphId, String query, Map params) * @param params parameters map. * @return a result set. */ - public ResultSet queryReadOnly(String graphId, String query, Map params) { + public ResultSet readOnlyQuery(String graphId, String query, Map params) { String preparedQuery = Utils.prepareQuery(query, params); return sendReadOnlyQuery(graphId, preparedQuery); } @@ -158,7 +158,7 @@ public ResultSet query(String graphId, String query, Map params, * @return a result set. */ @Override - public ResultSet queryReadOnly(String graphId, String query, Map params, long timeout) { + public ResultSet readOnlyQuery(String graphId, String query, Map params, long timeout) { String preparedQuery = Utils.prepareQuery(query, params); return sendReadOnlyQuery(graphId, preparedQuery, timeout); } diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraphTransaction.java b/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraphTransaction.java index c96c749..2f2fd73 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraphTransaction.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraphTransaction.java @@ -47,6 +47,23 @@ public ResultSet build(Object o) { }); } + /** + * Execute a Cypher read-oly query. + * @param graphId a graph to perform the query on + * @param query Cypher query + * @return a response which builds the result set with the query answer. + */ + @Override + public Response readOnlyQuery(String graphId, String query) { + client.sendCommand(RedisGraphCommand.RO_QUERY, graphId, query, "--COMPACT"); + return getResponse(new Builder() { + @Override + public ResultSet build(Object o) { + return new ResultSetImpl((List)o, redisGraph, caches.getGraphCache(graphId)); + } + }); + } + /** * Execute a Cypher query with timeout. * @@ -67,6 +84,26 @@ public ResultSet build(Object o) { }); } + /** + * Execute a Cypher read-only query with timeout. + * + * NOTE: timeout is simply sent to DB. Socket timeout will not be changed. + * @param graphId a graph to perform the query on + * @param query Cypher query + * @param timeout + * @return a response which builds the result set with the query answer. + */ + @Override + public Response readOnlyQuery(String graphId, String query, long timeout) { + client.sendCommand(RedisGraphCommand.RO_QUERY, graphId, query, "--COMPACT", "TIMEOUT", Long.toString(timeout)); + return getResponse(new Builder() { + @Override + public ResultSet build(Object o) { + return new ResultSetImpl((List)o, redisGraph, caches.getGraphCache(graphId)); + } + }); + } + /** * Execute a Cypher query with arguments * @@ -108,6 +145,25 @@ public ResultSet build(Object o) { }); } + /** + * Executes a cypher read-only query with parameters. + * @param graphId a graph to perform the query on. + * @param query Cypher query. + * @param params parameters map. + * @return a response which builds the result set with the query answer. + */ + @Override + public Response readOnlyQuery(String graphId, String query, Map params) { + String preparedQuery = Utils.prepareQuery(query, params); + client.sendCommand(RedisGraphCommand.RO_QUERY, graphId, preparedQuery, "--COMPACT"); + return getResponse(new Builder() { + @Override + public ResultSet build(Object o) { + return new ResultSetImpl((List)o, redisGraph, caches.getGraphCache(graphId)); + } + }); + } + /** * Executes a cypher query with parameters and timeout. * @@ -131,6 +187,29 @@ public ResultSet build(Object o) { }); } + /** + * Executes a cypher read-only query with parameters and timeout. + * + * NOTE: timeout is simply sent to DB. Socket timeout will not be changed. + * timeout. + * @param graphId a graph to perform the query on. + * @param query Cypher query. + * @param params parameters map. + * @param timeout + * @return a response which builds the result set with the query answer. + */ + @Override + public Response readOnlyQuery(String graphId, String query, Map params, long timeout) { + String preparedQuery = Utils.prepareQuery(query, params); + client.sendCommand(RedisGraphCommand.RO_QUERY, graphId, preparedQuery, "--COMPACT", "TIMEOUT", Long.toString(timeout)); + return getResponse(new Builder() { + @Override + public ResultSet build(Object o) { + return new ResultSetImpl((List)o, redisGraph, caches.getGraphCache(graphId)); + } + }); + } + /** * Invokes stored procedures without arguments, in multi/exec context * @param graphId a graph to perform the query on diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index d44dfc9..f2410d5 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -479,7 +479,6 @@ public void testEscapedQuery() { Assert.assertNotNull(api.query("social", "CREATE (:escaped{s1:%s,s2:%s})", "S\"'", "S'\"")); Assert.assertNotNull(api.query("social", "MATCH (n) where n.s1=%s and n.s2=%s RETURN n", "S\"'", "S'\"")); Assert.assertNotNull(api.query("social", "MATCH (n) where n.s1='S\"' RETURN n")); - Assert.assertNotNull(api.queryReadOnly("social", "MATCH (n) where n.s1='S\"' RETURN n")); } @@ -868,22 +867,39 @@ public void testParameters(){ Object param = parameters[i]; params.put("param", param); ResultSet resultSet = api.query("social", "RETURN $param", params); - ResultSet resultSetRo = api.queryReadOnly("social", "RETURN $param", params); Assert.assertEquals(1, resultSet.size()); - Assert.assertEquals(1, resultSetRo.size()); Record r = resultSet.next(); - Record rRo = resultSetRo.next(); Object o = r.getValue(0); - Object oRo = rRo.getValue(0); Object expected = expected_anwsers[i]; if(i == parameters.length-1) { expected = Arrays.asList((Object[])expected); } Assert.assertEquals(expected, o); + } + } + + + @Test + public void testParametersReadOnly(){ + Object[] parameters = {1, 2.3, true, false, null, "str", 'a', "b" ,Arrays.asList(1,2,3), new Integer[]{1,2,3}}; + Object[] expected_anwsers = {1L, 2.3, true, false, null, "str", "a", "b", Arrays.asList(1L, 2L, 3L), new Long[]{1L, 2L, 3L}}; + Map params = new HashMap<>(); + for (int i=0; i < parameters.length; i++) { + Object param = parameters[i]; + params.put("param", param); + ResultSet resultSetRo = api.readOnlyQuery("social", "RETURN $param", params); + Assert.assertEquals(1, resultSetRo.size()); + Record rRo = resultSetRo.next(); + Object oRo = rRo.getValue(0); + Object expected = expected_anwsers[i]; + if(i == parameters.length-1) { + expected = Arrays.asList((Object[])expected); + } Assert.assertEquals(expected, oRo); } } + @Test public void testNullGraphEntities() { // Create two nodes connected by a single outgoing edge. @@ -968,7 +984,7 @@ public void testCachedExecutionReadOnly() { // First time should not be loaded from execution cache Map params = new HashMap<>(); params.put("val", 1L); - ResultSet resultSet = api.queryReadOnly("social","MATCH (n:N {val:$val}) RETURN n.val", params); + ResultSet resultSet = api.readOnlyQuery("social","MATCH (n:N {val:$val}) RETURN n.val", params); Assert.assertEquals(1, resultSet.size()); Record r = resultSet.next(); Assert.assertEquals(params.get("val"), r.getValue(0)); @@ -977,7 +993,7 @@ public void testCachedExecutionReadOnly() { // Run in loop many times to make sure the query will be loaded // from cache at least once for (int i = 0 ; i < 64; i++){ - resultSet = api.queryReadOnly("social","MATCH (n:N {val:$val}) RETURN n.val", params); + resultSet = api.readOnlyQuery("social","MATCH (n:N {val:$val}) RETURN n.val", params); } Assert.assertEquals(1, resultSet.size()); r = resultSet.next(); @@ -988,19 +1004,16 @@ public void testCachedExecutionReadOnly() { @Test public void timeoutArgument() { ResultSet rs = api.query("social", "UNWIND range(0,100) AS x WITH x AS x WHERE x = 100 RETURN x", 1L); - ResultSet rsRo = api.queryReadOnly("social", "UNWIND range(0,100) AS x WITH x AS x WHERE x = 100 RETURN x", 1L); Assert.assertEquals(1, rs.size()); Assert.assertEquals(1, rsRo.size()); Record r = rs.next(); - Record rRo = rsRo.next(); Assert.assertEquals(Long.valueOf(100), r.getValue(0)); - Assert.assertEquals(Long.valueOf(100), rRo.getValue(0)); } @Test public void testSimpleReadOnly() { api.query("social","CREATE (:person{name:'filipe',age:30})"); - ResultSet rsRo = api.queryReadOnly("social", "MATCH (a:person) WHERE (a.name = 'filipe') RETURN a.age"); + ResultSet rsRo = api.readOnlyQuery("social", "MATCH (a:person) WHERE (a.name = 'filipe') RETURN a.age"); Assert.assertEquals(1, rsRo.size()); Record r = rsRo.next(); Assert.assertEquals(Long.valueOf(30), r.getValue(0)); From 345285c1475ed4ae2afcf2bb25b5c1f2abfd5317 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Sun, 24 Jan 2021 16:29:32 +0000 Subject: [PATCH 5/8] [fix] Fixes per PR review: added RO to transactions. --- src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index f2410d5..e235f28 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -1005,7 +1005,6 @@ public void testCachedExecutionReadOnly() { public void timeoutArgument() { ResultSet rs = api.query("social", "UNWIND range(0,100) AS x WITH x AS x WHERE x = 100 RETURN x", 1L); Assert.assertEquals(1, rs.size()); - Assert.assertEquals(1, rsRo.size()); Record r = rs.next(); Assert.assertEquals(Long.valueOf(100), r.getValue(0)); } From 95d2a2ea5565e1ea86ce8f58188e322ca69d6704 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Tue, 26 Jan 2021 13:05:18 +0000 Subject: [PATCH 6/8] [add] Added per PR review: included RO transaction test --- .../redisgraph/RedisGraphAPITest.java | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index 31a968a..011f2be 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -1040,4 +1040,79 @@ public void testSimpleReadOnly() { Record r = rsRo.next(); Assert.assertEquals(Long.valueOf(30), r.getValue(0)); } + + @Test + public void testMultiExecWithReadOnlyQueries(){ + try (RedisGraphContext c = api.getContext()) { + RedisGraphTransaction transaction = api.getContext().multi(); + + transaction.set("x", "1"); + transaction.query("social", "CREATE (:Person {name:'a'})"); + transaction.query("g", "CREATE (:Person {name:'a'})"); + transaction.queryReadOnly("social", "MATCH (n:Person) RETURN n"); + transaction.deleteGraph("g"); + transaction.callProcedure("social", "db.labels"); + List results = transaction.exec(); + + // Redis set command + Assert.assertEquals(String.class, results.get(0).getClass()); + Assert.assertEquals("OK", results.get(0)); + + // Redis graph command + Assert.assertEquals(ResultSetImpl.class, results.get(1).getClass()); + ResultSet resultSet = (ResultSet) results.get(1); + Assert.assertEquals(1, resultSet.getStatistics().nodesCreated()); + Assert.assertEquals(1, resultSet.getStatistics().propertiesSet()); + + + Assert.assertEquals(ResultSetImpl.class, results.get(2).getClass()); + resultSet = (ResultSet) results.get(2); + Assert.assertEquals(1, resultSet.getStatistics().nodesCreated()); + Assert.assertEquals(1, resultSet.getStatistics().propertiesSet()); + + // Graph read-only query result + Assert.assertEquals(ResultSetImpl.class, results.get(5).getClass()); + resultSet = (ResultSet) results.get(5); + + Assert.assertNotNull(resultSet.getHeader()); + Header header = resultSet.getHeader(); + + List schemaNames = header.getSchemaNames(); + Assert.assertNotNull(schemaNames); + Assert.assertEquals(1, schemaNames.size()); + Assert.assertEquals("n", schemaNames.get(0)); + + Property nameProperty = new Property<>("name", "a"); + + Node expectedNode = new Node(); + expectedNode.setId(0); + expectedNode.addLabel("Person"); + expectedNode.addProperty(nameProperty); + // see that the result were pulled from the right graph + Assert.assertEquals(1, resultSet.size()); + Assert.assertTrue(resultSet.hasNext()); + Record record = resultSet.next(); + Assert.assertFalse(resultSet.hasNext()); + Assert.assertEquals(Arrays.asList("n"), record.keys()); + Assert.assertEquals(expectedNode, record.getValue("n")); + + Assert.assertEquals(ResultSetImpl.class, results.get(7).getClass()); + resultSet = (ResultSet) results.get(7); + + Assert.assertNotNull(resultSet.getHeader()); + header = resultSet.getHeader(); + + schemaNames = header.getSchemaNames(); + Assert.assertNotNull(schemaNames); + Assert.assertEquals(1, schemaNames.size()); + Assert.assertEquals("label", schemaNames.get(0)); + + Assert.assertEquals(1, resultSet.size()); + Assert.assertTrue(resultSet.hasNext()); + record = resultSet.next(); + Assert.assertFalse(resultSet.hasNext()); + Assert.assertEquals(Arrays.asList("label"), record.keys()); + Assert.assertEquals("Person", record.getValue("label")); + } + } } From 694cd22c80ddc013bd6340314096e464099d7d18 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Tue, 26 Jan 2021 15:22:14 +0000 Subject: [PATCH 7/8] [fix] Fixed wrong api being used on new test --- .../java/com/redislabs/redisgraph/RedisGraphAPITest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index 011f2be..8a137bc 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -9,7 +9,6 @@ import com.redislabs.redisgraph.impl.resultset.RecordImpl; import com.redislabs.redisgraph.impl.resultset.ResultSetImpl; import com.redislabs.redisgraph.test.utils.PathBuilder; -import redis.clients.jedis.exceptions.JedisDataException; import java.util.*; import java.util.stream.Collectors; @@ -1049,7 +1048,7 @@ public void testMultiExecWithReadOnlyQueries(){ transaction.set("x", "1"); transaction.query("social", "CREATE (:Person {name:'a'})"); transaction.query("g", "CREATE (:Person {name:'a'})"); - transaction.queryReadOnly("social", "MATCH (n:Person) RETURN n"); + transaction.readOnlyQuery("social", "MATCH (n:Person) RETURN n"); transaction.deleteGraph("g"); transaction.callProcedure("social", "db.labels"); List results = transaction.exec(); @@ -1072,7 +1071,7 @@ public void testMultiExecWithReadOnlyQueries(){ // Graph read-only query result Assert.assertEquals(ResultSetImpl.class, results.get(5).getClass()); - resultSet = (ResultSet) results.get(5); + resultSet = (ResultSet) results.get(3); Assert.assertNotNull(resultSet.getHeader()); Header header = resultSet.getHeader(); @@ -1096,8 +1095,8 @@ public void testMultiExecWithReadOnlyQueries(){ Assert.assertEquals(Arrays.asList("n"), record.keys()); Assert.assertEquals(expectedNode, record.getValue("n")); - Assert.assertEquals(ResultSetImpl.class, results.get(7).getClass()); - resultSet = (ResultSet) results.get(7); + Assert.assertEquals(ResultSetImpl.class, results.get(5).getClass()); + resultSet = (ResultSet) results.get(5); Assert.assertNotNull(resultSet.getHeader()); header = resultSet.getHeader(); From b7926c480cd192d805faaf4896081e0d79fc2825 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com> Date: Wed, 21 Apr 2021 17:33:22 +0600 Subject: [PATCH 8/8] Use JRedisGraphException --- .../redisgraph/impl/api/ContextedRedisGraph.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java b/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java index da08529..92896d0 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java @@ -72,11 +72,11 @@ protected ResultSet sendReadOnlyQuery(String graphId, String preparedQuery) { List rawResponse = (List) conn.sendCommand(RedisGraphCommand.RO_QUERY, graphId, preparedQuery, Utils.COMPACT_STRING); return new ResultSetImpl(rawResponse, this, caches.getGraphCache(graphId)); } - catch (JRedisGraphRunTimeException rt) { - throw rt; + catch (JRedisGraphException ge) { + throw ge; } - catch (JedisDataException j) { - throw new JRedisGraphCompileTimeException(j); + catch (JedisDataException de) { + throw new JRedisGraphException(de); } } @@ -118,11 +118,11 @@ protected ResultSet sendReadOnlyQuery(String graphId, String preparedQuery, long graphId, preparedQuery, Utils.COMPACT_STRING, Utils.TIMEOUT_STRING, Long.toString(timeout)); return new ResultSetImpl(rawResponse, this, caches.getGraphCache(graphId)); } - catch (JRedisGraphRunTimeException rt) { - throw rt; + catch (JRedisGraphException ge) { + throw ge; } - catch (JedisDataException j) { - throw new JRedisGraphCompileTimeException(j); + catch (JedisDataException de) { + throw new JRedisGraphException(de); } }








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/RedisGraph/JRedisGraph/pull/105.patch

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy