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/09/29 13:09:42 UTC
[1/7] tinkerpop git commit: MatchPredicateStrategy needs to come
prior to FilterRankStrategy given that MatchPredicatesStrategy will try and
pull where()/dedup()-steps into match(). If FilterRankStrategy pushes those
'right' cause these are high-ranked f [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1467-master 6c84a71f5 -> 3a0001277 (forced update)
MatchPredicateStrategy needs to come prior to FilterRankStrategy given that MatchPredicatesStrategy will try and pull where()/dedup()-steps into match(). If FilterRankStrategy pushes those 'right' cause these are high-ranked filters, MatchPredicateStategy won't be able to do its job (which uses the runtime optimizer). Also, tweaked some JavaDoc. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c0b6e799
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c0b6e799
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c0b6e799
Branch: refs/heads/TINKERPOP-1467-master
Commit: c0b6e799f79df9804ee964c336dd381eb9e19014
Parents: 7a4a836
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 28 12:56:21 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Sep 28 12:56:21 2016 -0600
----------------------------------------------------------------------
.../strategy/optimization/FilterRankingStrategy.java | 8 +++-----
.../strategy/optimization/MatchPredicateStrategy.java | 7 +++++++
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c0b6e799/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
index 04b789b..2a0a025 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
@@ -42,6 +42,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -62,6 +63,7 @@ import java.util.Set;
* <tr><td>simplePath()</td><td>4</td></tr>
* <tr><td>cyclicPath()</td><td>4</td></tr>
* <tr><td>filter(traversal)</td><td>5</td></tr>
+ * <tr><td>not(traversal)</td>td>5</td></tr>
* <tr><td>where(traversal)</td><td>6</td></tr>
* <tr><td>or(...)</td><td>7</td></tr>
* <tr><td>and(...)</td><td>8</td></tr>
@@ -80,11 +82,7 @@ import java.util.Set;
public final class FilterRankingStrategy extends AbstractTraversalStrategy<TraversalStrategy.OptimizationStrategy> implements TraversalStrategy.OptimizationStrategy {
private static final FilterRankingStrategy INSTANCE = new FilterRankingStrategy();
- private static final Set<Class<? extends OptimizationStrategy>> PRIORS = new HashSet<>();
-
- static {
- PRIORS.add(IdentityRemovalStrategy.class);
- }
+ private static final Set<Class<? extends OptimizationStrategy>> PRIORS = Collections.singleton(IdentityRemovalStrategy.class);
private FilterRankingStrategy() {
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c0b6e799/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
index 28e5677..f2928d8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
@@ -34,6 +34,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -54,6 +55,7 @@ public final class MatchPredicateStrategy extends AbstractTraversalStrategy<Trav
private static final MatchPredicateStrategy INSTANCE = new MatchPredicateStrategy();
private static final Set<Class<? extends OptimizationStrategy>> PRIORS = new HashSet<>(Arrays.asList(IdentityRemovalStrategy.class, InlineFilterStrategy.class));
+ private static final Set<Class<? extends OptimizationStrategy>> POSTS = Collections.singleton(FilterRankingStrategy.class);
private MatchPredicateStrategy() {
}
@@ -98,4 +100,9 @@ public final class MatchPredicateStrategy extends AbstractTraversalStrategy<Trav
public Set<Class<? extends OptimizationStrategy>> applyPrior() {
return PRIORS;
}
+
+ @Override
+ public Set<Class<? extends OptimizationStrategy>> applyPost() {
+ return POSTS;
+ }
}
[5/7] tinkerpop git commit: Used nextTraverser() in what was formerly
TraversalIterator.
Posted by sp...@apache.org.
Used nextTraverser() in what was formerly TraversalIterator.
This is now the preferred way rather than pulling the iterator out of getEndStep() CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/850e159b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/850e159b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/850e159b
Branch: refs/heads/TINKERPOP-1467-master
Commit: 850e159b8dc883ac3995c8d775b8f09b7a64b440
Parents: 465ae28
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 29 07:33:20 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 29 07:33:20 2016 -0400
----------------------------------------------------------------------
.../op/traversal/TraversalOpProcessor.java | 8 +--
.../gremlin/server/util/TraversalIterator.java | 60 --------------------
.../gremlin/server/util/TraverserIterator.java | 58 +++++++++++++++++++
3 files changed, 62 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/850e159b/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 f5ff44d..e1534e2 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
@@ -42,7 +42,7 @@ import org.apache.tinkerpop.gremlin.server.op.AbstractOpProcessor;
import org.apache.tinkerpop.gremlin.server.op.OpProcessorException;
import org.apache.tinkerpop.gremlin.server.util.MetricManager;
import org.apache.tinkerpop.gremlin.server.util.SideEffectIterator;
-import org.apache.tinkerpop.gremlin.server.util.TraversalIterator;
+import org.apache.tinkerpop.gremlin.server.util.TraverserIterator;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
@@ -366,7 +366,7 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
try {
// compile the traversal - without it getEndStep() has nothing in it
traversal.applyStrategies();
- handleIterator(context, new TraversalIterator(traversal));
+ handleIterator(context, new TraverserIterator(traversal));
} catch (TimeoutException ex) {
final String errorMessage = String.format("Response iteration exceeded the configured threshold for request [%s] - %s", msg.getRequestId(), ex.getMessage());
logger.warn(errorMessage);
@@ -399,8 +399,8 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
@Override
protected void iterateComplete(final ChannelHandlerContext ctx, final RequestMessage msg, final Iterator itty) {
- if (itty instanceof TraversalIterator) {
- final Traversal.Admin traversal = ((TraversalIterator) itty).getTraversal();
+ if (itty instanceof TraverserIterator) {
+ final Traversal.Admin traversal = ((TraverserIterator) itty).getTraversal();
if (!traversal.getSideEffects().isEmpty()) {
cache.put(msg.getRequestId(), traversal.getSideEffects());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/850e159b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraversalIterator.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraversalIterator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraversalIterator.java
deleted file mode 100644
index 041dc0b..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraversalIterator.java
+++ /dev/null
@@ -1,60 +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.
- */
-package org.apache.tinkerpop.gremlin.server.util;
-
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy;
-
-import java.util.Iterator;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class TraversalIterator implements Iterator<Object> {
-
- private final Traversal.Admin traversal;
- private final Iterator<Object> traversalIterator;
- private final HaltedTraverserStrategy haltedTraverserStrategy;
-
- public TraversalIterator(final Traversal.Admin traversal) {
- this.traversal = traversal;
- this.traversalIterator = traversal.getEndStep();
- this.haltedTraverserStrategy = traversal.getStrategies().getStrategy(HaltedTraverserStrategy.class).orElse(
- Boolean.valueOf(System.getProperty("is.testing", "false")) ?
- HaltedTraverserStrategy.detached() :
- HaltedTraverserStrategy.reference());
- }
-
- public Traversal.Admin getTraversal() {
- return traversal;
- }
-
- @Override
- public boolean hasNext() {
- return this.traversalIterator.hasNext();
- }
-
- @Override
- public Object next() {
- final Traverser.Admin t = this.haltedTraverserStrategy.halt((Traverser.Admin) traversalIterator.next());
- return new DefaultRemoteTraverser<>(t.get(), t.bulk());
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/850e159b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraverserIterator.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraverserIterator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraverserIterator.java
new file mode 100644
index 0000000..d4bf5c0
--- /dev/null
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraverserIterator.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy;
+
+import java.util.Iterator;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class TraverserIterator implements Iterator<Object> {
+
+ private final Traversal.Admin traversal;
+ private final HaltedTraverserStrategy haltedTraverserStrategy;
+
+ public TraverserIterator(final Traversal.Admin traversal) {
+ this.traversal = traversal;
+ this.haltedTraverserStrategy = traversal.getStrategies().getStrategy(HaltedTraverserStrategy.class).orElse(
+ Boolean.valueOf(System.getProperty("is.testing", "false")) ?
+ HaltedTraverserStrategy.detached() :
+ HaltedTraverserStrategy.reference());
+ }
+
+ public Traversal.Admin getTraversal() {
+ return traversal;
+ }
+
+ @Override
+ public boolean hasNext() {
+ return this.traversal.hasNext();
+ }
+
+ @Override
+ public Object next() {
+ final Traverser.Admin t = this.haltedTraverserStrategy.halt(traversal.nextTraverser());
+ return new DefaultRemoteTraverser<>(t.get(), t.bulk());
+ }
+}
\ No newline at end of file
[4/7] tinkerpop git commit: TINKERPOP-1477 Made DependencyGrabberTest
an integration test
Posted by sp...@apache.org.
TINKERPOP-1477 Made DependencyGrabberTest an integration test
This test has had a tendency to fail on travis and some other environments for some time now - probably better than as an integration test. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/465ae280
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/465ae280
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/465ae280
Branch: refs/heads/TINKERPOP-1467-master
Commit: 465ae2801fc85d899f540980bb9f237211d75478
Parents: e331164
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 28 17:41:42 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 28 18:25:14 2016 -0400
----------------------------------------------------------------------
.../util/DependencyGrabberIntegrateTest.java | 102 +++++++++++++++++++
.../groovy/util/DependencyGrabberTest.java | 102 -------------------
2 files changed, 102 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/465ae280/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java
new file mode 100644
index 0000000..7b3bba8
--- /dev/null
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ */
+package org.apache.tinkerpop.gremlin.groovy.util;
+
+import groovy.lang.GroovyClassLoader;
+import java.io.File;
+import org.apache.commons.io.FileUtils;
+import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact;
+import org.junit.AfterClass;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Jason Plurad (http://github.com/pluradj)
+ */
+public class DependencyGrabberIntegrateTest {
+ private static final GroovyClassLoader dummyClassLoader = new GroovyClassLoader();
+ private static final File extTestDir = new File(System.getProperty("user.dir"), TestHelper.makeTestDataDirectory(DependencyGrabberIntegrateTest.class));
+ private static final DependencyGrabber dg = new DependencyGrabber(dummyClassLoader, extTestDir.getAbsolutePath());
+
+ @AfterClass
+ public static void tearDown() {
+ FileUtils.deleteQuietly(extTestDir);
+ }
+
+ @Test
+ public void shouldInstallAndUninstallDependencies() {
+ final String pkg = "org.apache.tinkerpop";
+ final String name = "tinkergraph-gremlin";
+ final String ver = "3.0.1-incubating";
+ final Artifact a = new Artifact(pkg, name, ver);
+
+ // install the plugin
+ final File pluginDir = new File(extTestDir, name);
+ dg.copyDependenciesToPath(a);
+ assertTrue(pluginDir.exists());
+
+ // delete the plugin
+ dg.deleteDependenciesFromPath(a);
+ assertFalse(pluginDir.exists());
+ }
+
+ @Test(expected=IllegalStateException.class)
+ public void shouldThrowIllegalStateException() {
+ final String pkg = "org.apache.tinkerpop";
+ final String name = "gremlin-groovy";
+ final String ver = "3.0.1-incubating";
+ final Artifact a = new Artifact(pkg, name, ver);
+
+ // install the plugin for the first time
+ final File pluginDir = new File(extTestDir, name);
+ dg.copyDependenciesToPath(a);
+ assertTrue(pluginDir.exists());
+
+ // attempt to install plugin a second time
+ try {
+ dg.copyDependenciesToPath(a);
+ } catch (IllegalStateException ise) {
+ // validate that the plugin dir wasn't deleted by accident
+ assertTrue(pluginDir.exists());
+ // throw the IllegalStateException
+ throw ise;
+ }
+ }
+
+ @Test(expected=RuntimeException.class)
+ public void shouldThrowRuntimeException() {
+ final String pkg = "org.apache.tinkerpop";
+ final String name = "gremlin-bogus";
+ final String ver = "3.0.1-incubating";
+ final Artifact a = new Artifact(pkg, name, ver);
+
+ // attempt to install bogus plugin
+ try {
+ dg.copyDependenciesToPath(a);
+ } catch (RuntimeException re) {
+ // validate that the plugin dir was deleted
+ final File pluginDir = new File(extTestDir, name);
+ assertFalse(pluginDir.exists());
+ // throw the RuntimeException
+ throw re;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/465ae280/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberTest.java
deleted file mode 100644
index f32b757..0000000
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberTest.java
+++ /dev/null
@@ -1,102 +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.
- */
-package org.apache.tinkerpop.gremlin.groovy.util;
-
-import groovy.lang.GroovyClassLoader;
-import java.io.File;
-import org.apache.commons.io.FileUtils;
-import org.apache.tinkerpop.gremlin.TestHelper;
-import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact;
-import org.junit.AfterClass;
-import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Jason Plurad (http://github.com/pluradj)
- */
-public class DependencyGrabberTest {
- private static final GroovyClassLoader dummyClassLoader = new GroovyClassLoader();
- private static final File extTestDir = new File(System.getProperty("user.dir"), TestHelper.makeTestDataDirectory(DependencyGrabberTest.class));
- private static final DependencyGrabber dg = new DependencyGrabber(dummyClassLoader, extTestDir.getAbsolutePath());
-
- @AfterClass
- public static void tearDown() {
- FileUtils.deleteQuietly(extTestDir);
- }
-
- @Test
- public void shouldInstallAndUninstallDependencies() {
- final String pkg = "org.apache.tinkerpop";
- final String name = "tinkergraph-gremlin";
- final String ver = "3.0.1-incubating";
- final Artifact a = new Artifact(pkg, name, ver);
-
- // install the plugin
- final File pluginDir = new File(extTestDir, name);
- dg.copyDependenciesToPath(a);
- assertTrue(pluginDir.exists());
-
- // delete the plugin
- dg.deleteDependenciesFromPath(a);
- assertFalse(pluginDir.exists());
- }
-
- @Test(expected=IllegalStateException.class)
- public void shouldThrowIllegalStateException() {
- final String pkg = "org.apache.tinkerpop";
- final String name = "gremlin-groovy";
- final String ver = "3.0.1-incubating";
- final Artifact a = new Artifact(pkg, name, ver);
-
- // install the plugin for the first time
- final File pluginDir = new File(extTestDir, name);
- dg.copyDependenciesToPath(a);
- assertTrue(pluginDir.exists());
-
- // attempt to install plugin a second time
- try {
- dg.copyDependenciesToPath(a);
- } catch (IllegalStateException ise) {
- // validate that the plugin dir wasn't deleted by accident
- assertTrue(pluginDir.exists());
- // throw the IllegalStateException
- throw ise;
- }
- }
-
- @Test(expected=RuntimeException.class)
- public void shouldThrowRuntimeException() {
- final String pkg = "org.apache.tinkerpop";
- final String name = "gremlin-bogus";
- final String ver = "3.0.1-incubating";
- final Artifact a = new Artifact(pkg, name, ver);
-
- // attempt to install bogus plugin
- try {
- dg.copyDependenciesToPath(a);
- } catch (RuntimeException re) {
- // validate that the plugin dir was deleted
- final File pluginDir = new File(extTestDir, name);
- assertFalse(pluginDir.exists());
- // throw the RuntimeException
- throw re;
- }
- }
-}
[7/7] tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1467' into TINKERPOP-1467-master
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/TINKERPOP-1467' into TINKERPOP-1467-master
Conflicts:
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3a000127
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3a000127
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3a000127
Branch: refs/heads/TINKERPOP-1467-master
Commit: 3a00012775c7e96f53f063271e48ce244fe2cd1d
Parents: 850e159 0c87171
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 29 09:09:15 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 29 09:09:15 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../upgrade/release-3.1.x-incubating.asciidoc | 17 +++++
.../tinkerpop/gremlin/driver/Channelizer.java | 2 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 42 +++++++++--
.../tinkerpop/gremlin/driver/Cluster.java | 24 +++++-
.../tinkerpop/gremlin/driver/Connection.java | 56 ++++++++++++--
.../gremlin/driver/ConnectionPool.java | 21 +++---
.../tinkerpop/gremlin/driver/Handler.java | 26 +++++--
.../tinkerpop/gremlin/driver/ResultQueue.java | 4 +
.../driver/handler/WebSocketClientHandler.java | 4 +-
.../server/GremlinDriverIntegrateTest.java | 79 +++++++++++++++++++-
.../server/GremlinServerAuthIntegrateTest.java | 5 +-
.../GremlinServerAuthOldIntegrateTest.java | 4 +-
.../GremlinServerSessionIntegrateTest.java | 6 +-
14 files changed, 247 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
----------------------------------------------------------------------
diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 7b9262e,3a03141..bd397a1
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@@ -350,11 -295,17 +355,17 @@@ public abstract class Client
public final static class ClusteredClient extends Client {
private ConcurrentMap<Host, ConnectionPool> hostConnectionPools = new ConcurrentHashMap<>();
+ private final AtomicReference<CompletableFuture<Void>> closing = new AtomicReference<>(null);
- ClusteredClient(final Cluster cluster) {
- super(cluster);
+ ClusteredClient(final Cluster cluster, final Client.Settings settings) {
+ super(cluster, settings);
}
+ @Override
+ public boolean isClosing() {
+ return closing.get() != null;
+ }
+
/**
* Submits a Gremlin script to the server and returns a {@link ResultSet} once the write of the request is
* complete.
@@@ -650,10 -503,12 +670,12 @@@
private ConnectionPool connectionPool;
+ private final AtomicReference<CompletableFuture<Void>> closing = new AtomicReference<>(null);
+
- SessionedClient(final Cluster cluster, final String sessionId, final boolean manageTransactions) {
- super(cluster);
- this.sessionId = sessionId;
- this.manageTransactions = manageTransactions;
+ SessionedClient(final Cluster cluster, final Client.Settings settings) {
+ super(cluster, settings);
+ this.sessionId = settings.getSession().get().sessionId;
+ this.manageTransactions = settings.getSession().get().manageTransactions;
}
String getSessionId() {
@@@ -697,134 -557,13 +724,139 @@@
* Close the bound {@link ConnectionPool}.
*/
@Override
- public CompletableFuture<Void> closeAsync() {
- return connectionPool.closeAsync();
+ public synchronized CompletableFuture<Void> closeAsync() {
+ if (closing.get() != null)
+ return closing.get();
+
+ final CompletableFuture<Void> connectionPoolClose = connectionPool.closeAsync();
+ closing.set(connectionPoolClose);
+ return connectionPoolClose;
}
}
+
+ /**
+ * Settings given to {@link Cluster#connect(Settings)} that configures how a {@link Client} will behave.
+ */
+ public static class Settings {
+ private final Optional<SessionSettings> session;
+
+ private Settings(final Builder builder) {
+ this.session = builder.session;
+ }
+
+ public static Builder build() {
+ return new Builder();
+ }
+
+ /**
+ * Determines if the {@link Client} is to be constructed with a session. If the value is present, then a
+ * session is expected.
+ */
+ public Optional<SessionSettings> getSession() {
+ return session;
+ }
+
+ public static class Builder {
+ private Optional<SessionSettings> session = Optional.empty();
+
+ private Builder() {}
+
+ /**
+ * Enables a session. By default this will create a random session name and configure transactions to be
+ * unmanaged. This method will override settings provided by calls to the other overloads of
+ * {@code useSession}.
+ */
+ public Builder useSession(final boolean enabled) {
+ session = enabled ? Optional.of(SessionSettings.build().create()) : Optional.empty();
+ return this;
+ }
+
+ /**
+ * Enables a session. By default this will create a session with the provided name and configure
+ * transactions to be unmanaged. This method will override settings provided by calls to the other
+ * overloads of {@code useSession}.
+ */
+ public Builder useSession(final String sessionId) {
+ session = sessionId != null && !sessionId.isEmpty() ?
+ Optional.of(SessionSettings.build().sessionId(sessionId).create()) : Optional.empty();
+ return this;
+ }
+
+ /**
+ * Enables a session. This method will override settings provided by calls to the other overloads of
+ * {@code useSession}.
+ */
+ public Builder useSession(final SessionSettings settings) {
+ session = Optional.ofNullable(settings);
+ return this;
+ }
+
+ public Settings create() {
+ return new Settings(this);
+ }
+
+ }
+ }
+
+ /**
+ * Settings for a {@link Client} that involve a session.
+ */
+ public static class SessionSettings {
+ private final boolean manageTransactions;
+ private final String sessionId;
+
+ private SessionSettings(final Builder builder) {
+ manageTransactions = builder.manageTransactions;
+ sessionId = builder.sessionId;
+ }
+
+ /**
+ * If enabled, transactions will be "managed" such that each request will represent a complete transaction.
+ */
+ public boolean manageTransactions() {
+ return manageTransactions;
+ }
+
+ /**
+ * Provides the identifier of the session.
+ */
+ public String getSessionId() {
+ return sessionId;
+ }
+
+ public static SessionSettings.Builder build() {
+ return new SessionSettings.Builder();
+ }
+
+ public static class Builder {
+ private boolean manageTransactions = false;
+ private String sessionId = UUID.randomUUID().toString();
+
+ private Builder() {}
+
+ /**
+ * If enabled, transactions will be "managed" such that each request will represent a complete transaction.
+ * By default this value is {@code false}.
+ */
+ public Builder manageTransactions(final boolean manage) {
+ manageTransactions = manage;
+ return this;
+ }
+
+ /**
+ * Provides the identifier of the session. This value cannot be null or empty. By default it is set to
+ * a random {@code UUID}.
+ */
+ public Builder sessionId(final String sessionId) {
+ if (null == sessionId || sessionId.isEmpty())
+ throw new IllegalArgumentException("sessionId cannot be null or empty");
+ this.sessionId = sessionId;
+ return this;
+ }
+
+ public SessionSettings create() {
+ return new SessionSettings(this);
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------
diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index f79e719,473991a..33e4ae0
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@@ -84,7 -84,9 +85,9 @@@ public final class Cluster
* submitted or can be directly initialized via {@link Client#init()}.
*/
public <T extends Client> T connect() {
- return (T) new Client.ClusteredClient(this, Client.Settings.build().create());
- final Client client = new Client.ClusteredClient(this);
++ final Client client = new Client.ClusteredClient(this, Client.Settings.build().create());
+ manager.trackClient(client);
+ return (T) client;
}
/**
@@@ -121,19 -123,11 +124,21 @@@
* @param manageTransactions enables auto-transactions when set to true
*/
public <T extends Client> T connect(final String sessionId, final boolean manageTransactions) {
- if (null == sessionId || sessionId.isEmpty())
- throw new IllegalArgumentException("sessionId cannot be null or empty");
- final Client client = new Client.SessionedClient(this, sessionId, manageTransactions);
+ final Client.SessionSettings sessionSettings = Client.SessionSettings.build()
+ .manageTransactions(manageTransactions)
+ .sessionId(sessionId).create();
+ final Client.Settings settings = Client.Settings.build().useSession(sessionSettings).create();
+ return connect(settings);
+ }
+
+ /**
+ * Creates a new {@link Client} based on the settings provided.
+ */
+ public <T extends Client> T connect(final Client.Settings settings) {
- return settings.getSession().isPresent() ? (T) new Client.SessionedClient(this, settings) :
- (T) new Client.ClusteredClient(this, settings);
++ final Client client = settings.getSession().isPresent() ? new Client.SessionedClient(this, settings) :
++ new Client.ClusteredClient(this, settings);
+ manager.trackClient(client);
+ return (T) client;
}
@Override
@@@ -862,12 -687,10 +867,14 @@@
private final ScheduledExecutorService executor;
+ private final int nioPoolSize;
+ private final int workerPoolSize;
+ private final int port;
+
private final AtomicReference<CompletableFuture<Void>> closeFuture = new AtomicReference<>();
+ private final List<WeakReference<Client>> openedClients = new ArrayList<>();
+
private Manager(final Builder builder) {
this.loadBalancingStrategy = builder.loadBalancingStrategy;
this.authProps = builder.authProps;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
----------------------------------------------------------------------
diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index 1ef9b98,766db2e..267624c
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@@ -35,7 -35,8 +35,8 @@@ import java.util.concurrent.Completable
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
++import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
@@@ -153,15 -150,12 +154,16 @@@ final class Connection
return pending;
}
- public CompletableFuture<Void> closeAsync() {
+ public synchronized CompletableFuture<Void> closeAsync() {
+ if (isClosed()) return closeFuture.get();
+
final CompletableFuture<Void> future = new CompletableFuture<>();
- if (!closeFuture.compareAndSet(null, future))
- return closeFuture.get();
+ closeFuture.set(future);
+ // stop any pings being sent at the server for keep-alive
+ final ScheduledFuture keepAlive = keepAliveFuture.get();
+ if (keepAlive != null) keepAlive.cancel(true);
+
// make sure all requests in the queue are fully processed before killing. if they are then shutdown
// can be immediate. if not this method will signal the readCompleted future defined in the write()
// operation to check if it can close. in this way the connection no longer receives writes, but
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a000127/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 96cde54,bf66b0d..d8aff4a
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@@ -26,9 -25,7 +26,8 @@@ import org.apache.tinkerpop.gremlin.dri
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
- import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
+import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
[6/7] tinkerpop git commit: Corrected a number of problems in close()
operations for the driver.
Posted by sp...@apache.org.
Corrected a number of problems in close() operations for the driver.
This was more of a commit than I wanted for tp31, but close() was really messed up. Fixed a number of race conditions and other logic that would allow the driver to hang on close. Also made it so that the Cluster makes an attempt to clean up any Client instances that it spawns.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0c871715
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0c871715
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0c871715
Branch: refs/heads/TINKERPOP-1467-master
Commit: 0c871715a794170841a3ea9e125b9389ee6ff54b
Parents: 0070d3d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 29 08:40:07 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 29 08:41:46 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../upgrade/release-3.1.x-incubating.asciidoc | 17 +++++
.../tinkerpop/gremlin/driver/Channelizer.java | 6 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 42 +++++++++--
.../tinkerpop/gremlin/driver/Cluster.java | 22 +++++-
.../tinkerpop/gremlin/driver/Connection.java | 57 ++++++++++++--
.../gremlin/driver/ConnectionPool.java | 21 +++---
.../tinkerpop/gremlin/driver/Handler.java | 27 +++++--
.../tinkerpop/gremlin/driver/ResultQueue.java | 4 +
.../driver/handler/WebSocketClientHandler.java | 4 +-
.../server/GremlinDriverIntegrateTest.java | 79 +++++++++++++++++++-
.../server/GremlinServerAuthIntegrateTest.java | 5 +-
.../GremlinServerAuthOldIntegrateTest.java | 4 +-
.../GremlinServerSessionIntegrateTest.java | 6 +-
14 files changed, 247 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d0aa8e8..9f45477 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.1.5 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Improved handling of `Cluster.close()` and `Client.close()` to prevent the methods from hanging.
* Fixed output redirection and potential memory leak in `GremlinGroovyScriptEngine`.
* Corrected naming of `g_withPath_V_asXaX_out_out_mapXa_name_it_nameX` and `g_withPath_V_asXaX_out_mapXa_nameX` in `MapTest`.
* Improved session cleanup when a close is triggered by the client.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.1.x-incubating.asciidoc b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
index 400ea10..6cf9fb2 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -27,6 +27,23 @@ TinkerPop 3.1.5
*Release Date: NOT OFFICIALLY RELEASED YET*
+Please see the link:https://github.com/apache/tinkerpop/blob/3.1.4/CHANGELOG.asciidoc#tinkerpop-315-release-date-XXXXXXXXXXXX[changelog] for a complete list of all the modifications that are part of this release.
+
+Upgrading for Users
+~~~~~~~~~~~~~~~~~~~
+
+Java Driver and close()
+^^^^^^^^^^^^^^^^^^^^^^^
+
+There were a few problems noted around the `close()` of `Cluster` and `Client` instances, including issues that
+presented as system hangs. These issues have been resolved, however, it is worth noting that an unchecked exception
+that was thrown under a certain situation has changed as part of the bug fixes. When submitting an in-session request
+on a `Client` that was closed (or closing) an `IllegalStateException` is thrown. This replaces older functionality
+that threw a `ConnectionException` and relied logic far deeper in the driver to produce that error and had the
+potential to open additional resources despite the intention of the user to "close".
+
+See: https://issues.apache.org/jira/browse/TINKERPOP-1467[TINKERPOP-1467]
+
TinkerPop 3.1.4
---------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
index 40be11c..b3761b7 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
@@ -20,9 +20,6 @@ package org.apache.tinkerpop.gremlin.driver;
import io.netty.channel.Channel;
import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
-import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.handler.NioGremlinRequestEncoder;
import org.apache.tinkerpop.gremlin.driver.handler.NioGremlinResponseDecoder;
@@ -42,7 +39,6 @@ import io.netty.handler.ssl.SslContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ConcurrentMap;
@@ -156,7 +152,7 @@ public interface Channelizer extends ChannelHandler {
*/
@Override
public void close(final Channel channel) {
- channel.writeAndFlush(new CloseWebSocketFrame());
+ if (channel.isOpen()) channel.writeAndFlush(new CloseWebSocketFrame());
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 4aca9ca..3a03141 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -36,6 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
/**
@@ -245,6 +246,8 @@ public abstract class Client {
* A low-level method that allows the submission of a manually constructed {@link RequestMessage}.
*/
public CompletableFuture<ResultSet> submitAsync(final RequestMessage msg) {
+ if (isClosing()) throw new IllegalStateException("Client has been closed");
+
if (!initialized)
init();
@@ -269,6 +272,8 @@ public abstract class Client {
}
}
+ public abstract boolean isClosing();
+
/**
* Closes the client by making a synchronous call to {@link #closeAsync()}.
*/
@@ -290,11 +295,17 @@ public abstract class Client {
public final static class ClusteredClient extends Client {
private ConcurrentMap<Host, ConnectionPool> hostConnectionPools = new ConcurrentHashMap<>();
+ private final AtomicReference<CompletableFuture<Void>> closing = new AtomicReference<>(null);
ClusteredClient(final Cluster cluster) {
super(cluster);
}
+ @Override
+ public boolean isClosing() {
+ return closing.get() != null;
+ }
+
/**
* Submits a Gremlin script to the server and returns a {@link ResultSet} once the write of the request is
* complete.
@@ -364,10 +375,14 @@ public abstract class Client {
* Closes all the connection pools on all hosts.
*/
@Override
- public CompletableFuture<Void> closeAsync() {
+ public synchronized CompletableFuture<Void> closeAsync() {
+ if (closing.get() != null)
+ return closing.get();
+
final CompletableFuture[] poolCloseFutures = new CompletableFuture[hostConnectionPools.size()];
hostConnectionPools.values().stream().map(ConnectionPool::closeAsync).collect(Collectors.toList()).toArray(poolCloseFutures);
- return CompletableFuture.allOf(poolCloseFutures);
+ closing.set(CompletableFuture.allOf(poolCloseFutures));
+ return closing.get();
}
}
@@ -448,11 +463,16 @@ public abstract class Client {
* close on the {@code Client} that created it.
*/
@Override
- public CompletableFuture<Void> closeAsync() {
+ public synchronized CompletableFuture<Void> closeAsync() {
close.complete(null);
return close;
}
+ @Override
+ public boolean isClosing() {
+ return close.isDone();
+ }
+
/**
* {@inheritDoc}
*/
@@ -483,6 +503,8 @@ public abstract class Client {
private ConnectionPool connectionPool;
+ private final AtomicReference<CompletableFuture<Void>> closing = new AtomicReference<>(null);
+
SessionedClient(final Cluster cluster, final String sessionId, final boolean manageTransactions) {
super(cluster);
this.sessionId = sessionId;
@@ -526,12 +548,22 @@ public abstract class Client {
connectionPool = new ConnectionPool(host, this, Optional.of(1), Optional.of(1));
}
+ @Override
+ public boolean isClosing() {
+ return closing.get() != null;
+ }
+
/**
* Close the bound {@link ConnectionPool}.
*/
@Override
- public CompletableFuture<Void> closeAsync() {
- return connectionPool.closeAsync();
+ public synchronized CompletableFuture<Void> closeAsync() {
+ if (closing.get() != null)
+ return closing.get();
+
+ final CompletableFuture<Void> connectionPoolClose = connectionPool.closeAsync();
+ closing.set(connectionPoolClose);
+ return connectionPoolClose;
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index 6a6a2e3..473991a 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -36,6 +36,7 @@ import javax.net.ssl.TrustManager;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.lang.ref.WeakReference;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.URI;
@@ -83,7 +84,9 @@ public final class Cluster {
* submitted or can be directly initialized via {@link Client#init()}.
*/
public <T extends Client> T connect() {
- return (T) new Client.ClusteredClient(this);
+ final Client client = new Client.ClusteredClient(this);
+ manager.trackClient(client);
+ return (T) client;
}
/**
@@ -122,7 +125,9 @@ public final class Cluster {
public <T extends Client> T connect(final String sessionId, final boolean manageTransactions) {
if (null == sessionId || sessionId.isEmpty())
throw new IllegalArgumentException("sessionId cannot be null or empty");
- return (T) new Client.SessionedClient(this, sessionId, manageTransactions);
+ final Client client = new Client.SessionedClient(this, sessionId, manageTransactions);
+ manager.trackClient(client);
+ return (T) client;
}
@Override
@@ -684,6 +689,8 @@ public final class Cluster {
private final AtomicReference<CompletableFuture<Void>> closeFuture = new AtomicReference<>();
+ private final List<WeakReference<Client>> openedClients = new ArrayList<>();
+
private Manager(final Builder builder) {
this.loadBalancingStrategy = builder.loadBalancingStrategy;
this.authProps = builder.authProps;
@@ -730,6 +737,10 @@ public final class Cluster {
});
}
+ void trackClient(final Client client) {
+ openedClients.add(new WeakReference<>(client));
+ }
+
public Host add(final InetSocketAddress address) {
final Host newHost = new Host(address, Cluster.this);
final Host previous = hosts.putIfAbsent(address, newHost);
@@ -745,6 +756,13 @@ public final class Cluster {
if (closeFuture.get() != null)
return closeFuture.get();
+ for (WeakReference<Client> openedClient : openedClients) {
+ final Client client = openedClient.get();
+ if (client != null && !client.isClosing()) {
+ client.close();
+ }
+ }
+
final CompletableFuture<Void> closeIt = new CompletableFuture<>();
closeFuture.set(closeIt);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index 220ad42..766db2e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@ -35,6 +35,8 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -148,22 +150,26 @@ final class Connection {
return pending;
}
- public CompletableFuture<Void> closeAsync() {
+ public synchronized CompletableFuture<Void> closeAsync() {
+ if (isClosed()) return closeFuture.get();
+
final CompletableFuture<Void> future = new CompletableFuture<>();
- if (!closeFuture.compareAndSet(null, future))
- return closeFuture.get();
+ closeFuture.set(future);
// make sure all requests in the queue are fully processed before killing. if they are then shutdown
// can be immediate. if not this method will signal the readCompleted future defined in the write()
// operation to check if it can close. in this way the connection no longer receives writes, but
// can continue to read. If a request never comes back the future won't get fulfilled and the connection
// will maintain a "pending" request, that won't quite ever go away. The build up of such a dead requests
- // on a connection in the connection pool will force the pool to replace the connection for a fresh one
+ // on a connection in the connection pool will force the pool to replace the connection for a fresh one.
if (pending.isEmpty()) {
if (null == channel)
future.complete(null);
else
shutdown(future);
+ } else {
+ // there may be some pending requests. schedule a job to wait for those to complete and then shutdown
+ new CheckForPending(future).runUntilDone(cluster.executor(), 1000, TimeUnit.MILLISECONDS);
}
return future;
@@ -256,7 +262,7 @@ final class Connection {
shutdown(closeFuture.get());
}
- private void shutdown(final CompletableFuture<Void> future) {
+ private synchronized void shutdown(final CompletableFuture<Void> future) {
// shutdown can be called directly from closeAsync() or after write() and therefore this method should only
// be called once. once shutdown is initiated, it shouldn't be executed a second time or else it sends more
// messages at the server and leads to ugly log messages over there.
@@ -286,6 +292,7 @@ final class Connection {
}
channelizer.close(channel);
+
final ChannelPromise promise = channel.newPromise();
promise.addListener(f -> {
if (f.cause() != null)
@@ -307,4 +314,44 @@ final class Connection {
public String toString() {
return connectionLabel;
}
+
+ /**
+ * Self-cancelling tasks that periodically checks for the pending queue to clear before shutting down the
+ * {@code Connection}. Once it does that, it self cancels the scheduled job in the executor.
+ */
+ private final class CheckForPending implements Runnable {
+ private volatile ScheduledFuture<?> self;
+ private final CompletableFuture<Void> future;
+
+ CheckForPending(final CompletableFuture<Void> future) {
+ this.future = future;
+ }
+
+ @Override
+ public void run() {
+ logger.info("Checking for pending messages to complete before close on {}", this);
+ if (pending.isEmpty()) {
+ shutdown(future);
+ boolean interrupted = false;
+ try {
+ while(null == self) {
+ try {
+ Thread.sleep(1);
+ } catch (InterruptedException e) {
+ interrupted = true;
+ }
+ }
+ self.cancel(false);
+ } finally {
+ if(interrupted) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+ }
+
+ void runUntilDone(final ScheduledExecutorService executor, final long period, final TimeUnit unit) {
+ self = executor.scheduleAtFixedRate(this, period, period, unit);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
index 9955e82..4691b1b 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
@@ -219,27 +219,26 @@ final class ConnectionPool {
/**
* Permanently kills the pool.
*/
- public CompletableFuture<Void> closeAsync() {
- logger.info("Signalled closing of connection pool on {} with core size of {}", host, minPoolSize);
+ public synchronized CompletableFuture<Void> closeAsync() {
+ if (closeFuture.get() != null) return closeFuture.get();
- CompletableFuture<Void> future = closeFuture.get();
- if (future != null)
- return future;
+ logger.info("Signalled closing of connection pool on {} with core size of {}", host, minPoolSize);
announceAllAvailableConnection();
- future = CompletableFuture.allOf(killAvailableConnections());
-
- return closeFuture.compareAndSet(null, future) ? future : closeFuture.get();
+ final CompletableFuture<Void> future = killAvailableConnections();
+ closeFuture.set(future);
+ return future;
}
- private CompletableFuture[] killAvailableConnections() {
+ private CompletableFuture<Void> killAvailableConnections() {
final List<CompletableFuture<Void>> futures = new ArrayList<>(connections.size());
for (Connection connection : connections) {
final CompletableFuture<Void> future = connection.closeAsync();
- future.thenRunAsync(open::decrementAndGet, cluster.executor());
+ future.thenRun(open::decrementAndGet);
futures.add(future);
}
- return futures.toArray(new CompletableFuture[futures.size()]);
+
+ return CompletableFuture.allOf(futures.toArray(new CompletableFuture[futures.size()]));
}
void replaceConnection(final Connection connection) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
index 773322a..65eb662 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
@@ -29,11 +29,11 @@ import io.netty.util.Attribute;
import io.netty.util.AttributeKey;
import io.netty.util.ReferenceCountUtil;
import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
import java.util.HashMap;
@@ -83,11 +83,24 @@ final class Handler {
if (response.getStatus().getCode() == ResponseStatusCode.AUTHENTICATE) {
final Attribute<SaslClient> saslClient = channelHandlerContext.attr(saslClientKey);
final Attribute<Subject> subject = channelHandlerContext.attr(subjectKey);
- RequestMessage.Builder messageBuilder = RequestMessage.build(Tokens.OPS_AUTHENTICATION);
+ final RequestMessage.Builder messageBuilder = RequestMessage.build(Tokens.OPS_AUTHENTICATION);
// First time through we don't have a sasl client
if (saslClient.get() == null) {
subject.set(login());
- saslClient.set(saslClient(getHostName(channelHandlerContext)));
+ try {
+ saslClient.set(saslClient(getHostName(channelHandlerContext)));
+ } catch (SaslException saslException) {
+ // push the sasl error into a failure response from the server. this ensures that standard
+ // processing for the ResultQueue is kept. without this SaslException trap and subsequent
+ // conversion to an authentication failure, the close() of the connection might not
+ // succeed as it will appear as though pending messages remain present in the queue on the
+ // connection and the shutdown won't proceed
+ final ResponseMessage clientSideError = ResponseMessage.build(response.getRequestId())
+ .code(ResponseStatusCode.FORBIDDEN).statusMessage(saslException.getMessage()).create();
+ channelHandlerContext.fireChannelRead(clientSideError);
+ return;
+ }
+
messageBuilder.addArg(Tokens.ARGS_SASL_MECHANISM, getMechanism());
messageBuilder.addArg(Tokens.ARGS_SASL, saslClient.get().hasInitialResponse() ?
evaluateChallenge(subject, saslClient, NULL_CHALLENGE) : null);
@@ -214,12 +227,12 @@ final class Handler {
// there are that many failures someone would take notice and hopefully stop the client.
logger.error("Could not process the response", cause);
- // the channel took an error because of something pretty bad so release all the completeable
- // futures out there
- pending.entrySet().stream().forEach(kv -> kv.getValue().markError(cause));
+ // the channel took an error because of something pretty bad so release all the futures out there
+ pending.values().forEach(val -> val.markError(cause));
+ pending.clear();
// serialization exceptions should not close the channel - that's worth a retry
- if (!ExceptionUtils.getThrowableList(cause).stream().anyMatch(t -> t instanceof SerializationException))
+ if (!IteratorUtils.anyMatch(ExceptionUtils.getThrowableList(cause).iterator(), t -> t instanceof SerializationException))
ctx.close();
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 89a0225..e55456e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -76,6 +76,10 @@ final class ResultQueue {
return this.size() == 0;
}
+ public boolean isComplete() {
+ return readComplete.isDone();
+ }
+
void drainTo(final Collection<Result> collection) {
if (error.get() != null) throw new RuntimeException(error.get());
resultLinkedBlockingQueue.drainTo(collection);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
index 922775e..e2a5668 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
@@ -95,9 +95,9 @@ public final class WebSocketClientHandler extends SimpleChannelInboundHandler<Ob
@Override
public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception {
- logger.warn("Exception caught during WebSocket processing - closing connection", cause);
if (!handshakeFuture.isDone()) handshakeFuture.setFailure(cause);
- ctx.close();
+
+ // let the GremlinResponseHandler take care of exception logging, channel closing, and cleanup
ctx.fireExceptionCaught(cause);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 1a04b6b..bf66b0d 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -25,7 +25,6 @@ import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer;
@@ -746,11 +745,13 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
client.close();
try {
- client.submit("x[0]+1");
+ client.submit("x[0]+1").all().get();
fail("Should have thrown an exception because the connection is closed");
} catch (Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
- assertThat(root, instanceOf(ConnectionException.class));
+ assertThat(root, instanceOf(IllegalStateException.class));
+ } finally {
+ cluster.close();
}
}
@@ -1248,6 +1249,78 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
}
}
+ @Test
+ public void shouldCloseAllClientsOnCloseOfCluster() throws Exception {
+ final Cluster cluster = Cluster.open();
+ final Client sessionlessOne = cluster.connect();
+ final Client session = cluster.connect("session");
+ final Client sessionlessTwo = cluster.connect();
+ final Client sessionlessThree = cluster.connect();
+ final Client sessionlessFour = cluster.connect();
+
+ assertEquals(2, sessionlessOne.submit("1+1").all().get().get(0).getInt());
+ assertEquals(2, session.submit("1+1").all().get().get(0).getInt());
+ assertEquals(2, sessionlessTwo.submit("1+1").all().get().get(0).getInt());
+ assertEquals(2, sessionlessThree.submit("1+1").all().get().get(0).getInt());
+ // dont' send anything on the 4th client
+
+ // close one of these Clients before the Cluster
+ sessionlessThree.close();
+ cluster.close();
+
+ try {
+ sessionlessOne.submit("1+1").all().get();
+ fail("Should have tossed an exception because cluster was closed");
+ } catch (Exception ex) {
+ final Throwable root = ExceptionUtils.getRootCause(ex);
+ assertThat(root, instanceOf(IllegalStateException.class));
+ assertEquals("Client has been closed", root.getMessage());
+ }
+
+ try {
+ session.submit("1+1").all().get();
+ fail("Should have tossed an exception because cluster was closed");
+ } catch (Exception ex) {
+ final Throwable root = ExceptionUtils.getRootCause(ex);
+ assertThat(root, instanceOf(IllegalStateException.class));
+ assertEquals("Client has been closed", root.getMessage());
+ }
+
+ try {
+ sessionlessTwo.submit("1+1").all().get();
+ fail("Should have tossed an exception because cluster was closed");
+ } catch (Exception ex) {
+ final Throwable root = ExceptionUtils.getRootCause(ex);
+ assertThat(root, instanceOf(IllegalStateException.class));
+ assertEquals("Client has been closed", root.getMessage());
+ }
+
+ try {
+ sessionlessThree.submit("1+1").all().get();
+ fail("Should have tossed an exception because cluster was closed");
+ } catch (Exception ex) {
+ final Throwable root = ExceptionUtils.getRootCause(ex);
+ assertThat(root, instanceOf(IllegalStateException.class));
+ assertEquals("Client has been closed", root.getMessage());
+ }
+
+ try {
+ sessionlessFour.submit("1+1").all().get();
+ fail("Should have tossed an exception because cluster was closed");
+ } catch (Exception ex) {
+ final Throwable root = ExceptionUtils.getRootCause(ex);
+ assertThat(root, instanceOf(IllegalStateException.class));
+ assertEquals("Client has been closed", root.getMessage());
+ }
+
+ // allow call to close() even though closed through cluster
+ sessionlessOne.close();
+ session.close();
+ sessionlessTwo.close();
+
+ cluster.close();
+ }
+
private void assertFutureTimeout(final CompletableFuture<List<Result>> futureFirst) {
try
{
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
index 3e1b7e9..887d408 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
@@ -23,7 +23,6 @@ import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
-import org.ietf.jgss.GSSException;
import org.junit.Test;
import java.util.HashMap;
@@ -128,7 +127,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
fail("This should not succeed as the client did not provide credentials");
} catch(Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
- assertEquals(GSSException.class, root.getClass());
+ assertEquals(ResponseException.class, root.getClass());
} finally {
cluster.close();
}
@@ -157,7 +156,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
final Client client = cluster.connect();
try {
- client.submit("1+1").all();
+ client.submit("1+1").all().get();
} catch(Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
assertEquals(ResponseException.class, root.getClass());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
index f2e5622..2f332be 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
@@ -131,7 +131,7 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
fail("This should not succeed as the client did not provide credentials");
} catch(Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
- assertEquals(GSSException.class, root.getClass());
+ assertEquals(ResponseException.class, root.getClass());
// removed this assert as the text of the message changes based on kerberos config - stupid kerberos
// assertThat(root.getMessage(), startsWith("Invalid name provided"));
@@ -163,7 +163,7 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
final Client client = cluster.connect();
try {
- client.submit("1+1").all();
+ client.submit("1+1").all().get();
} catch(Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
assertEquals(ResponseException.class, root.getClass());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c871715/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
index 99b3a1b..3c1fef9 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
@@ -26,7 +26,6 @@ import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
@@ -189,7 +188,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
fail("Session should be dead");
} catch (Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
- assertThat(root, instanceOf(ConnectionException.class));
+ assertThat(root, instanceOf(IllegalStateException.class));
} finally {
cluster.close();
}
@@ -229,7 +228,8 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
cluster.close();
}
- assertEquals(1, recordingAppender.getMessages().stream()
+ // there will be on for the timeout and a second for closing the cluster
+ assertEquals(2, recordingAppender.getMessages().stream()
.filter(msg -> msg.equals("INFO - Session shouldHaveTheSessionTimeout closed\n")).count());
}
[2/7] tinkerpop git commit: TINKERPOP-1477 Made DependencyGrabberTest
an integration test
Posted by sp...@apache.org.
TINKERPOP-1477 Made DependencyGrabberTest an integration test
This test has had a tendency to fail on travis and some other environments for some time now - probably better than as an integration test. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0070d3db
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0070d3db
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0070d3db
Branch: refs/heads/TINKERPOP-1467-master
Commit: 0070d3dbd1154c8608ac360046f0650842a77c59
Parents: bdef1a4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 28 17:41:42 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 28 17:41:42 2016 -0400
----------------------------------------------------------------------
.../util/DependencyGrabberIntegrateTest.java | 102 +++++++++++++++++++
.../groovy/util/DependencyGrabberTest.java | 102 -------------------
2 files changed, 102 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0070d3db/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java
new file mode 100644
index 0000000..7b3bba8
--- /dev/null
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ */
+package org.apache.tinkerpop.gremlin.groovy.util;
+
+import groovy.lang.GroovyClassLoader;
+import java.io.File;
+import org.apache.commons.io.FileUtils;
+import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact;
+import org.junit.AfterClass;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Jason Plurad (http://github.com/pluradj)
+ */
+public class DependencyGrabberIntegrateTest {
+ private static final GroovyClassLoader dummyClassLoader = new GroovyClassLoader();
+ private static final File extTestDir = new File(System.getProperty("user.dir"), TestHelper.makeTestDataDirectory(DependencyGrabberIntegrateTest.class));
+ private static final DependencyGrabber dg = new DependencyGrabber(dummyClassLoader, extTestDir.getAbsolutePath());
+
+ @AfterClass
+ public static void tearDown() {
+ FileUtils.deleteQuietly(extTestDir);
+ }
+
+ @Test
+ public void shouldInstallAndUninstallDependencies() {
+ final String pkg = "org.apache.tinkerpop";
+ final String name = "tinkergraph-gremlin";
+ final String ver = "3.0.1-incubating";
+ final Artifact a = new Artifact(pkg, name, ver);
+
+ // install the plugin
+ final File pluginDir = new File(extTestDir, name);
+ dg.copyDependenciesToPath(a);
+ assertTrue(pluginDir.exists());
+
+ // delete the plugin
+ dg.deleteDependenciesFromPath(a);
+ assertFalse(pluginDir.exists());
+ }
+
+ @Test(expected=IllegalStateException.class)
+ public void shouldThrowIllegalStateException() {
+ final String pkg = "org.apache.tinkerpop";
+ final String name = "gremlin-groovy";
+ final String ver = "3.0.1-incubating";
+ final Artifact a = new Artifact(pkg, name, ver);
+
+ // install the plugin for the first time
+ final File pluginDir = new File(extTestDir, name);
+ dg.copyDependenciesToPath(a);
+ assertTrue(pluginDir.exists());
+
+ // attempt to install plugin a second time
+ try {
+ dg.copyDependenciesToPath(a);
+ } catch (IllegalStateException ise) {
+ // validate that the plugin dir wasn't deleted by accident
+ assertTrue(pluginDir.exists());
+ // throw the IllegalStateException
+ throw ise;
+ }
+ }
+
+ @Test(expected=RuntimeException.class)
+ public void shouldThrowRuntimeException() {
+ final String pkg = "org.apache.tinkerpop";
+ final String name = "gremlin-bogus";
+ final String ver = "3.0.1-incubating";
+ final Artifact a = new Artifact(pkg, name, ver);
+
+ // attempt to install bogus plugin
+ try {
+ dg.copyDependenciesToPath(a);
+ } catch (RuntimeException re) {
+ // validate that the plugin dir was deleted
+ final File pluginDir = new File(extTestDir, name);
+ assertFalse(pluginDir.exists());
+ // throw the RuntimeException
+ throw re;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0070d3db/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberTest.java
deleted file mode 100644
index f32b757..0000000
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberTest.java
+++ /dev/null
@@ -1,102 +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.
- */
-package org.apache.tinkerpop.gremlin.groovy.util;
-
-import groovy.lang.GroovyClassLoader;
-import java.io.File;
-import org.apache.commons.io.FileUtils;
-import org.apache.tinkerpop.gremlin.TestHelper;
-import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact;
-import org.junit.AfterClass;
-import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Jason Plurad (http://github.com/pluradj)
- */
-public class DependencyGrabberTest {
- private static final GroovyClassLoader dummyClassLoader = new GroovyClassLoader();
- private static final File extTestDir = new File(System.getProperty("user.dir"), TestHelper.makeTestDataDirectory(DependencyGrabberTest.class));
- private static final DependencyGrabber dg = new DependencyGrabber(dummyClassLoader, extTestDir.getAbsolutePath());
-
- @AfterClass
- public static void tearDown() {
- FileUtils.deleteQuietly(extTestDir);
- }
-
- @Test
- public void shouldInstallAndUninstallDependencies() {
- final String pkg = "org.apache.tinkerpop";
- final String name = "tinkergraph-gremlin";
- final String ver = "3.0.1-incubating";
- final Artifact a = new Artifact(pkg, name, ver);
-
- // install the plugin
- final File pluginDir = new File(extTestDir, name);
- dg.copyDependenciesToPath(a);
- assertTrue(pluginDir.exists());
-
- // delete the plugin
- dg.deleteDependenciesFromPath(a);
- assertFalse(pluginDir.exists());
- }
-
- @Test(expected=IllegalStateException.class)
- public void shouldThrowIllegalStateException() {
- final String pkg = "org.apache.tinkerpop";
- final String name = "gremlin-groovy";
- final String ver = "3.0.1-incubating";
- final Artifact a = new Artifact(pkg, name, ver);
-
- // install the plugin for the first time
- final File pluginDir = new File(extTestDir, name);
- dg.copyDependenciesToPath(a);
- assertTrue(pluginDir.exists());
-
- // attempt to install plugin a second time
- try {
- dg.copyDependenciesToPath(a);
- } catch (IllegalStateException ise) {
- // validate that the plugin dir wasn't deleted by accident
- assertTrue(pluginDir.exists());
- // throw the IllegalStateException
- throw ise;
- }
- }
-
- @Test(expected=RuntimeException.class)
- public void shouldThrowRuntimeException() {
- final String pkg = "org.apache.tinkerpop";
- final String name = "gremlin-bogus";
- final String ver = "3.0.1-incubating";
- final Artifact a = new Artifact(pkg, name, ver);
-
- // attempt to install bogus plugin
- try {
- dg.copyDependenciesToPath(a);
- } catch (RuntimeException re) {
- // validate that the plugin dir was deleted
- final File pluginDir = new File(extTestDir, name);
- assertFalse(pluginDir.exists());
- // throw the RuntimeException
- throw re;
- }
- }
-}
[3/7] tinkerpop git commit: added a really neat explain() to
TraversalStrategy section of the docs which details how various strategies
effect the compilation process. Built the-traversal.asciidoc locally and all
is good. CTR.
Posted by sp...@apache.org.
added a really neat explain() to TraversalStrategy section of the docs which details how various strategies effect the compilation process. Built the-traversal.asciidoc locally and all is good. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e331164c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e331164c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e331164c
Branch: refs/heads/TINKERPOP-1467-master
Commit: e331164c0f0d0b3380a1075f48cd5c9dd698c04a
Parents: c0b6e79
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 28 15:52:38 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Sep 28 15:52:38 2016 -0600
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 40 ++++++++++++++++++++++----
1 file changed, 34 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e331164c/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 4f7bff5..55963f4 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2443,17 +2443,20 @@ public final class TinkerGraphStepStrategy extends AbstractTraversalStrategy<Tra
if (TraversalHelper.onGraphComputer(traversal))
return;
- TraversalHelper.getStepsOfClass(GraphStep.class, traversal).forEach(originalGraphStep -> {
- final TinkerGraphStep<?,?> tinkerGraphStep = new TinkerGraphStep<>(originalGraphStep);
- TraversalHelper.replaceStep(originalGraphStep, (Step) tinkerGraphStep, traversal);
+ for (final GraphStep originalGraphStep : TraversalHelper.getStepsOfClass(GraphStep.class, traversal)) {
+ final TinkerGraphStep<?, ?> tinkerGraphStep = new TinkerGraphStep<>(originalGraphStep);
+ TraversalHelper.replaceStep(originalGraphStep, tinkerGraphStep, traversal);
Step<?, ?> currentStep = tinkerGraphStep.getNextStep();
while (currentStep instanceof HasContainerHolder) {
- ((HasContainerHolder) currentStep).getHasContainers().forEach(tinkerGraphStep::addHasContainer);
- currentStep.getLabels().forEach(tinkerGraphStep::addLabel);
+ for (final HasContainer hasContainer : ((HasContainerHolder) currentStep).getHasContainers()) {
+ if (!GraphStep.processHasContainerIds(tinkerGraphStep, hasContainer))
+ tinkerGraphStep.addHasContainer(hasContainer);
+ }
+ TraversalHelper.copyLabels(currentStep, tinkerGraphStep, false);
traversal.removeStep(currentStep);
currentStep = currentStep.getNextStep();
}
- });
+ }
}
public static TinkerGraphStepStrategy instance() {
@@ -2477,6 +2480,31 @@ t.iterate(); null
t.toString()
----
+Finally, here is a complicated traversal that has various components that are optimized by the default TinkerPop strategies.
+
+[gremlin-groovy,modern]
+----
+g.V().hasLabel('person'). <1>
+ and(has('name','marko'),filter(has('age',gt(20)))). <2>
+ match(__.as('a').has('age',lt(32)), <3>
+ __.as('a').repeat(outE().inV()).times(2).as('b')). <4>
+ where('a',neq('b')). <5>
+ where(__.as('b').both().count().is(gt(1))). <6>
+ select('b'). <7>
+ groupCount().
+ by(out().count()). <8>
+ explain()
+----
+
+<1> `TinkerGraphStepStrategy` pulls in `has()`-step predicates for global, graph-centric index lookups.
+<2> `InlineFilterStrategy` de-nests filters to increase the likelihood of filter concatenation and aggregation.
+<3> `InlineFilterStrategy` pulls out named predicates from `match()`-step to more easily allow provider strategies to use indices.
+<4> `RepeatUnrollStrategy` will unroll loops and `IncidentToAdjacentStrategy` will turn `outE().inV()`-patterns into `out()`.
+<5> `MatchPredicateStrategy` will pull in `where()`-steps so that they can be subjected to `match()`-steps runtime query optimizer.
+<6> `RangeByIsCountStrategy` will limit the traversal to only the number of traversers required for the `count().is(x)`-check.
+<7> `PathRetractionStrategy` will remove paths from the traversers and increase the likelihood of bulking as path data is not required after `select('b')`.
+<8> `AdjacentToIncidentStrategy` will turn `out()` into `outE()` to increase data access locality.
+
WARNING: The reason that `OptimizationStrategy` and `ProviderOptimizationStrategy` are two different categories is
that optimization strategies should only rewrite the traversal using TinkerPop3 steps. This ensures that the
optimizations executed at the end of the optimization strategy round are TinkerPop3 compliant. From there, provider