You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/12/09 12:16:03 UTC
[1/4] tinkerpop git commit: [driver_remote] Encode Bytecode as a dict,
not a string
Repository: tinkerpop
Updated Branches:
refs/heads/master 69b314cb2 -> ffe62c1d4
[driver_remote] Encode Bytecode as a dict, not a string
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0b74ea40
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0b74ea40
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0b74ea40
Branch: refs/heads/master
Commit: 0b74ea40aacaab519357626fa4c2c580ffe6b148
Parents: 595cf3b
Author: Branden Moore <bj...@sandia.gov>
Authored: Wed Dec 7 12:53:38 2016 -0700
Committer: Branden Moore <bj...@sandia.gov>
Committed: Wed Dec 7 12:53:38 2016 -0700
----------------------------------------------------------------------
.../main/jython/gremlin_python/driver/driver_remote_connection.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b74ea40/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
index eab06f1..d975f60 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
@@ -66,7 +66,7 @@ class DriverRemoteConnection(RemoteConnection):
"op": "bytecode",
"processor": "traversal",
"args": {
- "gremlin": self._graphson_writer.writeObject(bytecode),
+ "gremlin": self._graphson_writer.toDict(bytecode),
"aliases": {"g": self.traversal_source}
}
}
[4/4] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ffe62c1d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffe62c1d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ffe62c1d
Branch: refs/heads/master
Commit: ffe62c1d4153336fb34c20864bdfa163275cbb5b
Parents: 69b314c 25f8298
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 9 07:15:42 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 9 07:15:42 2016 -0500
----------------------------------------------------------------------
.../main/jython/gremlin_python/driver/driver_remote_connection.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] tinkerpop git commit: Merge branch 'pr-513' into tp32
Posted by sp...@apache.org.
Merge branch 'pr-513' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/25f82985
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/25f82985
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/25f82985
Branch: refs/heads/master
Commit: 25f829858cc23100f0ff0aec18ce3c700e68c1f3
Parents: 966df98 0b74ea4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 9 07:15:28 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 9 07:15:28 2016 -0500
----------------------------------------------------------------------
.../main/jython/gremlin_python/driver/driver_remote_connection.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] tinkerpop git commit: Minor fix to iteration completion logic
Posted by sp...@apache.org.
Minor fix to iteration completion logic
Had to store the value of hasNext() as some graphs may open a new transaction on such calls and leave it hanging. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/966df989
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/966df989
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/966df989
Branch: refs/heads/master
Commit: 966df98921e42a2918ea9f676ac2ad3a3027d64f
Parents: 595cf3b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Dec 8 09:18:56 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Dec 8 09:21:24 2016 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/op/AbstractOpProcessor.java | 9 +++++++--
.../gremlin/server/op/traversal/TraversalOpProcessor.java | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/966df989/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
index 5482de1..c3ac475 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
@@ -154,9 +154,14 @@ public abstract class AbstractOpProcessor implements OpProcessor {
break;
}
+ // track whether there is anything left in the iterator because it needs to be accessed after
+ // the transaction could be closed - in that case a call to hasNext() could open a new transaction
+ // unintentionally
+ final boolean moreInIterator = itty.hasNext();
+
try {
// only need to reset the aggregation list if there's more stuff to write
- if (itty.hasNext())
+ if (moreInIterator)
aggregate = new ArrayList<>(resultIterationBatchSize);
else {
// iteration and serialization are both complete which means this finished successfully. note that
@@ -179,7 +184,7 @@ public abstract class AbstractOpProcessor implements OpProcessor {
throw ex;
}
- if (!itty.hasNext()) iterateComplete(ctx, msg, itty);
+ if (!moreInIterator) iterateComplete(ctx, msg, itty);
// the flush is called after the commit has potentially occurred. in this way, if a commit was
// required then it will be 100% complete before the client receives it. the "frame" at this point
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/966df989/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index 5edbe26..5461007 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -110,7 +110,7 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
}};
}
- private static Cache<UUID, TraversalSideEffects> cache = null;
+ protected static Cache<UUID, TraversalSideEffects> cache = null;
public TraversalOpProcessor() {
super(false);