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 2018/09/19 01:20:00 UTC

[1/2] tinkerpop git commit: ScriptEngine cache should be static

Repository: tinkerpop
Updated Branches:
  refs/heads/master da3c601d2 -> 46742dafd


ScriptEngine cache should be static

Scripts won't share the same cache without this change and will force uncessary recompiles that are expensive CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9f0dbd85
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9f0dbd85
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9f0dbd85

Branch: refs/heads/master
Commit: 9f0dbd85015804999be0cce3996c6c30ab041ccb
Parents: 2cc9219
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 18 19:22:10 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 18 19:22:10 2018 -0400

----------------------------------------------------------------------
 .../hadoop/structure/io/script/ScriptRecordReader.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9f0dbd85/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
index 16bc057..0ea3d84 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
@@ -56,14 +56,14 @@ import java.util.Optional;
  */
 public final class ScriptRecordReader extends RecordReader<NullWritable, VertexWritable> {
 
-    protected final static String SCRIPT_FILE = "gremlin.hadoop.scriptInputFormat.script";
-    protected final static String SCRIPT_ENGINE = "gremlin.hadoop.scriptInputFormat.scriptEngine";
-    private final static String GRAPH = "graph";
-    private final static String LINE = "line";
-    private final static String READ_CALL = "parse(" + LINE + ")";
+    protected static final String SCRIPT_FILE = "gremlin.hadoop.scriptInputFormat.script";
+    protected static final String SCRIPT_ENGINE = "gremlin.hadoop.scriptInputFormat.scriptEngine";
+    private static final String GRAPH = "graph";
+    private static final String LINE = "line";
+    private static final String READ_CALL = "parse(" + LINE + ")";
     private final VertexWritable vertexWritable = new VertexWritable();
     private final LineRecordReader lineRecordReader;
-    private final GremlinScriptEngineManager manager = new CachedGremlinScriptEngineManager();
+    private static final GremlinScriptEngineManager manager = new CachedGremlinScriptEngineManager();
 
     private ScriptEngine engine;
     private CompiledScript script;


[2/2] tinkerpop git commit: Merge branch 'tp33'

Posted by sp...@apache.org.
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46742daf
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46742daf
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46742daf

Branch: refs/heads/master
Commit: 46742dafd380979658d26d4e9ae6906b4497fba9
Parents: da3c601 9f0dbd8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 18 19:23:28 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 18 19:23:28 2018 -0400

----------------------------------------------------------------------
 .../hadoop/structure/io/script/ScriptRecordReader.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------