Multi exec #42
Merged
Multi exec #42
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #42 +/- ##
==========================================
+ Coverage 68.32% 68.35% +0.02%
==========================================
Files 16 20 +4
Lines 401 474 +73
Branches 68 72 +4
==========================================
+ Hits 274 324 +50
- Misses 102 123 +21
- Partials 25 27 +2
Continue to review full report at Codecov.
|
gkorland
suggested changes
Jul 9, 2019
pom.xml
Outdated
| <repositories> | ||
| <repository> | ||
| <id>snapshots-repo</id> | ||
| <url>https://oss.sonatype.org/content/repositories/snapshots</url> |
| */ | ||
| public Response<ResultSet> graphQuery(String graphId, String query, Object ...args){ | ||
| String preparedQuery = Utils.prepareQuery(query, args); | ||
| graphCaches.putIfAbsent(graphId, new GraphCache(graphId, redisGraph)); |
Contributor
There was a problem hiding this comment.
@DvirDukhan I think you should avoid creating GraphCache on each query
| graphCaches.putIfAbsent(graphId, new GraphCache(graphId, redisGraph)); | ||
| client.sendCommand(Command.QUERY, graphId, preparedQuery, "--COMPACT"); | ||
| return getResponse(new Builder<ResultSet>() { | ||
| @Override |
Contributor
There was a problem hiding this comment.
Do you really need to create a new builder on each call, or can you reuse a "shared" builder?
| * @return response with result set with the procedure data | ||
| */ | ||
| public Response<ResultSet> graphCallProcedure(String graphId, String procedure){ | ||
| return graphCallProcedure(graphId, procedure, new ArrayList<>(), new HashMap<>()); |
Contributor
There was a problem hiding this comment.
I think you should set the ArrayList(0), HashMap(0)
Contributor
There was a problem hiding this comment.
or can you reuse the same const DS?
| * @return response with result set with the procedure data | ||
| */ | ||
| public Response<ResultSet> graphCallProcedure(String graphId, String procedure, List<String> args ){ | ||
| return graphCallProcedure(graphId, procedure, args, new HashMap<>()); |
| * @return response with the deletion running time statistics | ||
| */ | ||
| public Response<String> graphDeleteGraph(String graphId){ | ||
| graphCaches.remove(graphId); |
Contributor
There was a problem hiding this comment.
Shouldn't the remove be after the delete command return?
| 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")); | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
please add another test with two transactions and watch
|
fixes #34 |
gkorland
reviewed
Jul 21, 2019
pom.xml
Outdated
| <groupId>redis.clients</groupId> | ||
| <artifactId>jedis</artifactId> | ||
| <version>3.0.1</version> | ||
| <version>3.1.0-m4</version> |
gkorland
reviewed
Jul 21, 2019
|
|
||
| protected int id; | ||
| protected final Map<String, Property> propertyMap = new HashMap<>(); | ||
| int id; |
Contributor
There was a problem hiding this comment.
do you really need it as packaged?
gkorland
reviewed
Jul 21, 2019
| class GraphCacheList { | ||
|
|
||
| private Object mutex = new Object(); | ||
| private final Object mutex = new Object(); |
Contributor
There was a problem hiding this comment.
why do you need this mutex? can't you just synchronized on data?
gkorland
reviewed
Jul 21, 2019
| try { | ||
| api.close(); | ||
| } catch (IOException e) { | ||
| e.printStackTrace(); |
Contributor
Author
There was a problem hiding this comment.
@After annotation
gkorland
reviewed
Jul 21, 2019
| */ | ||
| @Override | ||
| protected ResultSet sendQuery(String graphId, String preparedQuery) { | ||
| Jedis conn = getConnection(); |
Contributor
Author
There was a problem hiding this comment.
just try, no need to close resource at the end of the scope
gkorland
reviewed
Jul 21, 2019
| */ | ||
| @Override | ||
| public String deleteGraph(String graphId) { | ||
| Object response = getConnection().sendCommand(RedisGraphCommand.DELETE, graphId); |
gkorland
reviewed
Jul 21, 2019
| @Override | ||
| protected ResultSet sendQuery(String graphId, String preparedQuery) { | ||
| Jedis conn = getConnection(); | ||
| List<Object> rawResponse = (List<Object>) conn.sendCommand(RedisGraphCommand.QUERY, graphId, preparedQuery, "--COMPACT"); |
…in general queries
…into multi-exec # Conflicts: # src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java # src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetImpl.java
Codecov Report
@@ Coverage Diff @@
## master #42 +/- ##
==========================================
- Coverage 68.32% 68.14% -0.19%
==========================================
Files 16 20 +4
Lines 401 474 +73
Branches 68 72 +4
==========================================
+ Hits 274 323 +49
- Misses 102 124 +22
- Partials 25 27 +2
Continue to review full report at Codecov.
|
…into multi-exec
gkorland
reviewed
Jul 22, 2019
| conn.close(); | ||
| throw e; | ||
| } | ||
| return new ResultSetImpl(rawResponse, this, graphId, caches.getGraphCache(graphId)); |
Contributor
There was a problem hiding this comment.
move into the catch block
gkorland
approved these changes
Jul 23, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
added multi-exec support