This is an automated email from the ASF dual-hosted git repository.
valentyn pushed a commit to branch master-http
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master-http by this push:
new 49020b6beb cleanup CTR
49020b6beb is described below
commit 49020b6beb585f7b34d24bb523416c7a037b1b3f
Author: Valentyn Kahamlyk <valentyn.kaham...@improving.com>
AuthorDate: Fri Jun 14 11:55:43 2024 -0700
cleanup CTR
---
.../gremlin/process/traversal/GremlinLang.java | 2 +-
.../conf/gremlin-server-integration.yaml | 68 --------------------
gremlin-server/scripts/generate-all.groovy | 73 ----------------------
.../server/GremlinResultSetIntegrateTest.java | 2 +
4 files changed, 3 insertions(+), 142 deletions(-)
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java
index 61d9b2f172..f8a4548315 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java
@@ -81,7 +81,7 @@ public class GremlinLang implements Cloneable, Serializable {
final Object[] flattenedArguments = flattenArguments(arguments);
// todo: figure out solution for AbstractLambdaTraversal
- if (name.equals("CardinalityValueTraversal")) {
+ if ("CardinalityValueTraversal".equals(name)) {
gremlin.append("Cardinality.").append(flattenedArguments[0])
.append("(").append(flattenedArguments[1]).append(")");
return;
diff --git a/gremlin-server/conf/gremlin-server-integration.yaml
b/gremlin-server/conf/gremlin-server-integration.yaml
deleted file mode 100644
index 8c668c4f4a..0000000000
--- a/gremlin-server/conf/gremlin-server-integration.yaml
+++ /dev/null
@@ -1,68 +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.
-
-###############################################################################
-# IMPORTANT
-###############################################################################
-# Changes to this file need to be appropriately replicated to
-#
-# - docker/gremlin-server/gremlin-server-integration.yaml
-# - docker/gremlin-server/gremlin-server-integration-krb5.yaml
-# - docker/gremlin-server/gremlin-server-integration-secure.yaml
-#
-# Without such changes, the test docker server can't be started for independent
-# testing with Gremlin Language Variants. Note this file's relation to
-# gremlin-server/src/test/resources/scripts/test-server-start.groovy
-###############################################################################
-
-host: 0.0.0.0
-port: 45940
-evaluationTimeout: 30000
-graphs: {
- graph: conf/tinkergraph-empty.properties,
- classic: conf/tinkergraph-empty.properties,
- modern: conf/tinkergraph-empty.properties,
- crew: conf/tinkergraph-empty.properties,
- grateful: conf/tinkergraph-empty.properties,
- sink: conf/tinkergraph-empty.properties,
- tx: conf/tinkertransactiongraph-empty.properties
-}
-scriptEngines: {
- gremlin-lang : {},
- gremlin-groovy: {
- plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
-
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
-
org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin:
{expectedCompilationTime: 30000},
- org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
- org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/generate-all.groovy]}}}}
-serializers:
- - { className:
org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4, config: {
ioRegistries:
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
- - { className:
org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4 }
-metrics: {
- slf4jReporter: {enabled: true, interval: 180000}}
-gremlinPool: 8
-strictTransactionManagement: false
-idleConnectionTimeout: 0
-keepAliveInterval: 0
-maxInitialLineLength: 4096
-maxHeaderSize: 8192
-maxChunkSize: 8192
-maxContentLength: 10485760
-maxAccumulationBufferComponents: 1024
-resultIterationBatchSize: 64
-writeBufferLowWaterMark: 32768
-writeBufferHighWaterMark: 65536
diff --git a/gremlin-server/scripts/generate-all.groovy
b/gremlin-server/scripts/generate-all.groovy
deleted file mode 100644
index 896cbf2138..0000000000
--- a/gremlin-server/scripts/generate-all.groovy
+++ /dev/null
@@ -1,73 +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.
- */
-
-// !!! remove
-// An example of an initialization script that can be configured to run in
Gremlin Server.
-// Functions defined here will go into global cache and will not be removed
from there
-// unless there is a reset of the ScriptEngine.
-def addItUp(x, y) { x + y }
-
-// an init script that returns a Map allows explicit setting of global
bindings.
-def globals = [:]
-
-// Generates the modern graph into an "empty" TinkerGraph via LifeCycleHook.
-// Note that the name of the key in the "global" map is unimportant.
-globals << [hook : [
- onStartUp: { ctx ->
- // a wild bit of trickery here. the process tests use an INTEGER id
manager when LoadGraphWith is used. this
- // closure provides a way to to manually override the various id managers
for TinkerGraph - the graph on which
- // all of these remote tests are executed - so that the tests will pass
nicely. an alternative might have been
- // to have a special test TinkerGraph config for setting up the id manager
properly, but based on how we do
- // things now, that test config would have been mixed in with release
artifacts and there would have been ugly
- // exclusions to make packaging work properly.
- allowSetOfIdManager = { graph, idManagerFieldName, idManager ->
- java.lang.reflect.Field idManagerField =
graph.class.getSuperclass().getDeclaredField(idManagerFieldName)
- idManagerField.setAccessible(true)
- idManagerField.set(graph, idManager)
- }
-
- [classic, modern, crew, sink, grateful].each{
- allowSetOfIdManager(it, "vertexIdManager",
TinkerGraph.DefaultIdManager.INTEGER)
- allowSetOfIdManager(it, "edgeIdManager",
TinkerGraph.DefaultIdManager.INTEGER)
- allowSetOfIdManager(it, "vertexPropertyIdManager",
TinkerGraph.DefaultIdManager.LONG)
- }
- TinkerFactory.generateClassic(classic)
- TinkerFactory.generateModern(modern)
- TinkerFactory.generateTheCrew(crew)
- TinkerFactory.generateGratefulDead(grateful)
- TinkerFactory.generateKitchenSink(sink)
- }
-] as LifeCycleHook]
-
-// add default TraversalSource instances for each graph instance
-globals << [gclassic : traversal().withEmbedded(classic)]
-globals << [gmodern : traversal().withEmbedded(modern)]
-globals << [g : traversal().withEmbedded(graph)]
-globals << [gcrew : traversal().withEmbedded(crew)]
-globals << [ggraph : traversal().withEmbedded(graph)]
-globals << [ggrateful : traversal().withEmbedded(grateful)]
-globals << [gsink : traversal().withEmbedded(sink)]
-globals << [gtx : traversal().withEmbedded(tx)]
-
-// dynamically detect existence of gimmutable as it is only used in gremlin-go
testing suite
-def dynamicGimmutable =
context.getBindings(javax.script.ScriptContext.GLOBAL_SCOPE)["immutable"]
-if (dynamicGimmutable != null)
- globals << [gimmutable : traversal().withEmbedded(dynamicGimmutable)]
-
-globals
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
index fc3e42f6e7..b0a9bc3cf9 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
@@ -44,6 +44,7 @@ import org.apache.tinkerpop.gremlin.util.ser.SerializersV4;
import org.hamcrest.CoreMatchers;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -95,6 +96,7 @@ public class GremlinResultSetIntegrateTest extends
AbstractGremlinServerIntegrat
}
@Test
+ @Ignore("[Discuss] is this valid use case?")
public void shouldHandleVertexResultFromTraversalBulked() throws Exception
{
final Graph graph = TinkerGraph.open();
final GraphTraversalSource g = graph.traversal();
