You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/08/18 17:25:12 UTC
tinkerpop git commit: removed an uneeded testing resource. Changed
the logic in TraversalStrategies.py where if the cache already contains
strategies for the Graph class, don't update the cache.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 766d85d70 -> 9a2d90fcb
removed an uneeded testing resource. Changed the logic in TraversalStrategies.py where if the cache already contains strategies for the Graph class, don't update the cache.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9a2d90fc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9a2d90fc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9a2d90fc
Branch: refs/heads/TINKERPOP-1278
Commit: 9a2d90fcb6795ae6945d0e2054cfc15a30c2d599
Parents: 766d85d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Aug 18 11:24:56 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Aug 18 11:25:07 2016 -0600
----------------------------------------------------------------------
.../jython/gremlin_python/structure/graph.py | 3 +-
.../driver/gremlin-server-rest-modern.yaml | 49 --------------------
2 files changed, 2 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a2d90fc/gremlin-python/src/main/jython/gremlin_python/structure/graph.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/structure/graph.py b/gremlin-python/src/main/jython/gremlin_python/structure/graph.py
index b451ec6..ccddbe5 100644
--- a/gremlin-python/src/main/jython/gremlin_python/structure/graph.py
+++ b/gremlin-python/src/main/jython/gremlin_python/structure/graph.py
@@ -25,7 +25,8 @@ from gremlin_python.process.traversal import TraversalStrategies
class Graph(object):
def __init__(self):
- TraversalStrategies.global_cache[self.__class__] = TraversalStrategies()
+ if self.__class__ not in TraversalStrategies.global_cache:
+ TraversalStrategies.global_cache[self.__class__] = TraversalStrategies()
def traversal(self):
return GraphTraversalSource(self, TraversalStrategies.global_cache[self.__class__])
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a2d90fc/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-rest-modern.yaml
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-rest-modern.yaml b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-rest-modern.yaml
deleted file mode 100644
index 87e363c..0000000
--- a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-rest-modern.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-host: localhost
-port: 8182
-threadPoolWorker: 1
-gremlinPool: 8
-scriptEvaluationTimeout: 30000
-channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
-graphs: {
- graph: ../gremlin-server/conf/tinkergraph-empty.properties}
-plugins:
- - tinkerpop.tinkergraph
-scriptEngines: {
- gremlin-groovy: {
- imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI],
- scripts: [../gremlin-server/scripts/generate-modern.groovy]
- },
- gremlin-jython:{
- }
-}
-serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
-metrics: {
- slf4jReporter: {enabled: true, interval: 180000}}
-strictTransactionManagement: false
-threadPoolBoss: 1
-maxInitialLineLength: 4096
-maxHeaderSize: 8192
-maxChunkSize: 8192
-maxContentLength: 65536
-maxAccumulationBufferComponents: 1024
-resultIterationBatchSize: 64