Merge branch 'tp32' into tp33

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

Branch: refs/heads/master
Commit: 097ad015ee0595b290824543ebded7558f623a8c
Parents: 7f06a18 d3be13b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Mar 12 12:13:10 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Mar 12 12:13:10 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../jsr223/JavaTranslatorBenchmark.java         | 76 ++++++++++++++++++++
 .../gremlin/jsr223/JavaTranslator.java          | 58 ++++++++++++---
 3 files changed, 125 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/097ad015/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/097ad015/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
----------------------------------------------------------------------
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
index 0806c6d,df12055..2df8db5
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
@@@ -50,10 -50,13 +50,11 @@@ import java.util.concurrent.ConcurrentH
   */
  public final class JavaTranslator<S extends TraversalSource, T extends 
Traversal.Admin<?, ?>> implements Translator.StepTranslator<S, T> {
  
 -    private static final boolean IS_TESTING = 
Boolean.valueOf(System.getProperty("is.testing", "false"));
 -
      private final S traversalSource;
-     private final Class anonymousTraversal;
+     private final Class<?> anonymousTraversal;
      private static final Map<Class<?>, Map<String, List<Method>>> 
GLOBAL_METHOD_CACHE = new ConcurrentHashMap<>();
- 
+     private final Map<Class<?>, Map<String,Method>> localMethodCache = new 
ConcurrentHashMap<>();
+     private final Method anonymousTraversalStart;
  
      private JavaTranslator(final S traversalSource) {
          this.traversalSource = traversalSource;

Reply via email to