From 95fa46f4a542da24d20eeb979c3313b814c2ec3e Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sun, 12 Aug 2018 10:11:27 +0300 Subject: [PATCH 1/3] #11 added support for Graph.DELETE --- src/main/java/com/redislabs/redisgraph/Command.java | 3 ++- .../java/com/redislabs/redisgraph/RedisGraphAPI.java | 12 ++++++++++++ .../redislabs/redisgraph/impl/StatisticsImpl.java | 4 +--- .../com/redislabs/redisgraph/RedisGraphAPITest.java | 6 +----- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/redislabs/redisgraph/Command.java b/src/main/java/com/redislabs/redisgraph/Command.java index 4e9f695..35dbd98 100644 --- a/src/main/java/com/redislabs/redisgraph/Command.java +++ b/src/main/java/com/redislabs/redisgraph/Command.java @@ -8,7 +8,8 @@ * */ public enum Command implements ProtocolCommand { - QUERY("graph.QUERY"); + QUERY("graph.QUERY"), + DELETE("graph.DELETE"); private final byte[] raw; diff --git a/src/main/java/com/redislabs/redisgraph/RedisGraphAPI.java b/src/main/java/com/redislabs/redisgraph/RedisGraphAPI.java index ccac748..053e702 100644 --- a/src/main/java/com/redislabs/redisgraph/RedisGraphAPI.java +++ b/src/main/java/com/redislabs/redisgraph/RedisGraphAPI.java @@ -47,6 +47,18 @@ public ResultSet query(String query) { return new ResultSetImpl(sendCommand(conn, Command.QUERY, graphId, query).getObjectMultiBulkReply()); } } + + /** + * Delete the all graph + * + * @return + */ + public String deleteGraph() { + try (Jedis conn = _conn()) { + return sendCommand(conn, Command.DELETE, graphId).getBulkReply(); + } + } + private BinaryClient sendCommand(Jedis conn, ProtocolCommand provider, String ...args) { BinaryClient client = conn.getClient(); diff --git a/src/main/java/com/redislabs/redisgraph/impl/StatisticsImpl.java b/src/main/java/com/redislabs/redisgraph/impl/StatisticsImpl.java index 984ab28..0f67062 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/StatisticsImpl.java +++ b/src/main/java/com/redislabs/redisgraph/impl/StatisticsImpl.java @@ -1,6 +1,5 @@ package com.redislabs.redisgraph.impl; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -26,8 +25,7 @@ public String getStringValue(Statistics.Label label) { private Map getStatistics(){ if(statistics.size() == 0) { for(byte[] touple : this.raw) { - String row = SafeEncoder.encode(touple); - String[] rowTouple = row.split(":"); + String[] rowTouple = SafeEncoder.encode(touple).split(":"); this.statistics.put( Statistics.Label.getEnum(rowTouple[0]), rowTouple[1].trim()); } } diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index f039852..4e7498d 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -19,11 +19,7 @@ public RedisGraphAPITest() { @Before public void flushDB() throws Exception{ - // api.deleteGraph(); - TODO add this back once we implement this API - - Method method = RedisGraphAPI.class.getDeclaredMethod("_conn"); - method.setAccessible(true); - ((Jedis)method.invoke(api)).flushDB(); + api.deleteGraph(); } @Test From 67c4f771a08ad8f48bb44a6a6b2d0330c79215ac Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sun, 12 Aug 2018 13:55:48 +0300 Subject: [PATCH 2/3] Fix JDoc text --- .../java/com/redislabs/redisgraph/RedisGraphAPI.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/redislabs/redisgraph/RedisGraphAPI.java b/src/main/java/com/redislabs/redisgraph/RedisGraphAPI.java index 053e702..ac08f62 100644 --- a/src/main/java/com/redislabs/redisgraph/RedisGraphAPI.java +++ b/src/main/java/com/redislabs/redisgraph/RedisGraphAPI.java @@ -49,15 +49,15 @@ public ResultSet query(String query) { } /** - * Delete the all graph + * Deletes the entire graph * - * @return + * @return delete running time statistics */ - public String deleteGraph() { - try (Jedis conn = _conn()) { + public String deleteGraph() { + try (Jedis conn = _conn()) { return sendCommand(conn, Command.DELETE, graphId).getBulkReply(); - } - } + } + } private BinaryClient sendCommand(Jedis conn, ProtocolCommand provider, String ...args) { From 073e3029691e73c43424c8075484e77fafcff0ff Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sun, 12 Aug 2018 13:56:43 +0300 Subject: [PATCH 3/3] Rename @Before function name --- src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index 4e7498d..5f7db8c 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -18,7 +18,7 @@ public RedisGraphAPITest() { } @Before - public void flushDB() throws Exception{ + public void deleteGraph() throws Exception{ api.deleteGraph(); } @@ -89,4 +89,4 @@ public void testQuery() throws Exception { Assert.assertEquals( "32.000000", record.getString(0)); } -} \ No newline at end of file +}