[tinkerpop] 01/05: TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 015ccf08481ec6b78d8a92961084f907f5793b16
Author: Stephen Mallette
AuthorDate: Tue Mar 5 15:39:06 2019 -0500
TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11
---
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/console/Console.groovy | 1 +
gremlin-core/pom.xml | 34 --
.../process/traversal/dsl/GremlinDslProcessor.java | 2 +-
.../traversal/step/map/OrderGlobalStep.java| 4 +--
gremlin-groovy/pom.xml | 7 +
.../server/op/AbstractEvalOpProcessorTest.java | 1 +
.../process/computer/GraphComputerTest.java| 1 +
gremlin-tools/gremlin-benchmark/README.asciidoc| 31
gremlin-tools/gremlin-benchmark/pom.xml| 17 +++
pom.xml| 33 -
11 files changed, 113 insertions(+), 19 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a20b65f..bd319ba 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -693,6 +693,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Bumped `httpclient` to 4.5.7.
* Bumped `slf4j` to 1.7.25.
* Bumped `commons-codec` to 1.12.
+* Bumped to Groovy 2.5.6.
* Fixed partial response failures when using authentication in
`gremlin-python`.
* Fixed concurrency issues in `TraverserSet.toString()` and
`ObjectWritable.toString()`.
* Fixed a bug in `InlineFilterStrategy` that mixed up and's and or's when
folding merging conditions together.
diff --git
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index d5b9b62..3f5e53c 100644
---
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -47,6 +47,7 @@ import org.codehaus.groovy.tools.shell.IO
import org.codehaus.groovy.tools.shell.InteractiveShellRunner
import org.codehaus.groovy.tools.shell.commands.SetCommand
import org.fusesource.jansi.Ansi
+import picocli.CommandLine
import sun.misc.Signal
import sun.misc.SignalHandler
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 5753390..0c82d3a 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -115,7 +115,36 @@ limitations under the License.
com.google.testing.compile
compile-testing
-0.10
+0.15
+test
+
+
+com.google.guava
+guava
+
+
+com.google.errorprone
+error_prone_annotations
+
+
+
+
+
+com.google.guava
+guava
+23.4-android
+test
+
+
+com.google.errorprone
+error_prone_annotations
+
+
+
+
+com.google.errorprone
+error_prone_annotations
+2.0.19
test
@@ -148,8 +177,7 @@ limitations under the License.
org.apache.maven.plugins
maven-compiler-plugin
-1.8
-1.8
+11
-parameters
-proc:none
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index f198f16..1a87392 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -78,7 +78,7 @@ import java.util.stream.Stream;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@SupportedAnnotationTypes("org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDsl")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_11)
public class GremlinDslProcessor extends AbstractProcessor {
private Messager messager;
private Elements elementUtils;
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
index
[tinkerpop] 03/05: TINKERPOP-2076 Made expectations around mock more explicit
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 8e0a847377f27885de5181c853898817098dc820
Author: Stephen Mallette
AuthorDate: Wed Mar 6 14:56:17 2019 -0500
TINKERPOP-2076 Made expectations around mock more explicit
The upgrade of mockito must have tightened some requirements around
stubbing and the use of nulls. Setting expected arguments seemed to get the
test working as it was before.
---
.../tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
index f708159..8e12700 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.server.op;
import io.netty.channel.ChannelHandlerContext;
+import org.apache.tinkerpop.gremlin.driver.Tokens;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
@@ -41,11 +42,13 @@ import static org.mockito.Matchers.anyString;
public class AbstractEvalOpProcessorTest {
-@org.junit.Ignore
@Test
public void evalOpInternalShouldHandleAllEvaluationExceptions() throws
OpProcessorException {
final AbstractEvalOpProcessor processor = new StandardOpProcessor();
-final RequestMessage request = RequestMessage.build("test").create();
+final RequestMessage request = RequestMessage.build("test")
+.addArg(Tokens.ARGS_GREMLIN, "1+1")
+.addArg(Tokens.ARGS_LANGUAGE, "gremlin-groovy")
+.create();
final Settings settings = new Settings();
final ChannelHandlerContext ctx =
Mockito.mock(ChannelHandlerContext.class);
final ArgumentCaptor responseCaptor =
ArgumentCaptor.forClass(ResponseMessage.class);
[tinkerpop] 02/05: TINKERPOP-2076 Bumped Hadoop to 2.7.7
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch TINKERPOP-2076 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 27268e2eb52531097f82a1e20f6f10224bd1e606 Author: Stephen Mallette AuthorDate: Wed Mar 6 11:25:01 2019 -0500 TINKERPOP-2076 Bumped Hadoop to 2.7.7 --- CHANGELOG.asciidoc | 1 + pom.xml| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index bd319ba..2bfd4d1 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -694,6 +694,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima * Bumped `slf4j` to 1.7.25. * Bumped `commons-codec` to 1.12. * Bumped to Groovy 2.5.6. +* Bumped to Hadoop 2.7.7. * Fixed partial response failures when using authentication in `gremlin-python`. * Fixed concurrency issues in `TraverserSet.toString()` and `ObjectWritable.toString()`. * Fixed a bug in `InlineFilterStrategy` that mixed up and's and or's when folding merging conditions together. diff --git a/pom.xml b/pom.xml index 7f3d2ca..444a4e3 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ limitations under the License. 2.6 3.8.1 2.5.7 -2.7.2 +2.7.7 1.2 3.1.0 1.1
[tinkerpop] branch TINKERPOP-2076 updated (a9f9ca6 -> d4c8669)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch TINKERPOP-2076 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. discard a9f9ca6 TINKERPOP-2076 Fixed Gremlin Server integration tests after Java 11 discard bb7da67 TINKERPOP-2076 Fixed failing GraphComputer test after Java 11 upgrade discard ead68bd TINKERPOP-2076 Made expectations around mock more explicit discard 845f459 TINKERPOP-2076 Bumped Hadoop to 2.7.7 discard f273576 TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11 add ce2f3b6 Updated binary NOTICE files for groovy - got behind somehow CTR add d717990 Merge branch 'tp34' new 015ccf0 TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11 new 27268e2 TINKERPOP-2076 Bumped Hadoop to 2.7.7 new 8e0a847 TINKERPOP-2076 Made expectations around mock more explicit new cd77100 TINKERPOP-2076 Fixed failing GraphComputer test after Java 11 upgrade new d4c8669 TINKERPOP-2076 Fixed Gremlin Server integration tests after Java 11 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a9f9ca6) \ N -- N -- N refs/heads/TINKERPOP-2076 (d4c8669) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gremlin-console/src/main/static/NOTICE | 2 +- gremlin-server/src/main/static/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] branch tp34 updated (b2eefb0 -> ce2f3b6)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch tp34 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. from b2eefb0 Merge branch 'tp33' into tp34 add ce2f3b6 Updated binary NOTICE files for groovy - got behind somehow CTR No new revisions were added by this update. Summary of changes: gremlin-console/src/main/static/NOTICE | 2 +- gremlin-server/src/main/static/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] branch master updated (b779cdf -> d717990)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. from b779cdf Merge branch 'tp34' add ce2f3b6 Updated binary NOTICE files for groovy - got behind somehow CTR new d717990 Merge branch 'tp34' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gremlin-console/src/main/static/NOTICE | 2 +- gremlin-server/src/main/static/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] 01/01: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit d717990d24998c18d178dbab4baac01c6b0fe89e Merge: b779cdf ce2f3b6 Author: stephen AuthorDate: Fri Nov 8 21:33:07 2019 -0500 Merge branch 'tp34' gremlin-console/src/main/static/NOTICE | 2 +- gremlin-server/src/main/static/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] 01/05: TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch TINKERPOP-2076 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit f2735761161e394294f2e74ee26b025d7ec20439 Author: Stephen Mallette AuthorDate: Tue Mar 5 15:39:06 2019 -0500 TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11 --- CHANGELOG.asciidoc | 1 + .../tinkerpop/gremlin/console/Console.groovy | 1 + gremlin-console/src/main/static/NOTICE | 2 +- gremlin-core/pom.xml | 34 -- .../process/traversal/dsl/GremlinDslProcessor.java | 2 +- .../traversal/step/map/OrderGlobalStep.java| 4 +-- gremlin-groovy/pom.xml | 7 + gremlin-server/src/main/static/NOTICE | 2 +- .../server/op/AbstractEvalOpProcessorTest.java | 1 + .../process/computer/GraphComputerTest.java| 1 + gremlin-tools/gremlin-benchmark/README.asciidoc| 31 gremlin-tools/gremlin-benchmark/pom.xml| 17 +++ pom.xml| 33 - 13 files changed, 115 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index a20b65f..bd319ba 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -693,6 +693,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima * Bumped `httpclient` to 4.5.7. * Bumped `slf4j` to 1.7.25. * Bumped `commons-codec` to 1.12. +* Bumped to Groovy 2.5.6. * Fixed partial response failures when using authentication in `gremlin-python`. * Fixed concurrency issues in `TraverserSet.toString()` and `ObjectWritable.toString()`. * Fixed a bug in `InlineFilterStrategy` that mixed up and's and or's when folding merging conditions together. diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy index d5b9b62..3f5e53c 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy @@ -47,6 +47,7 @@ import org.codehaus.groovy.tools.shell.IO import org.codehaus.groovy.tools.shell.InteractiveShellRunner import org.codehaus.groovy.tools.shell.commands.SetCommand import org.fusesource.jansi.Ansi +import picocli.CommandLine import sun.misc.Signal import sun.misc.SignalHandler diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE index 5dbb856..19eda67 100644 --- a/gremlin-console/src/main/static/NOTICE +++ b/gremlin-console/src/main/static/NOTICE @@ -18,7 +18,7 @@ Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. -Apache Groovy 2.5.4 (AL ASF) +Apache Groovy 2.5.6 (AL ASF) This product includes/uses ANTLR (http://www.antlr2.org/) developed by Terence Parr 1989-2006 diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml index 5753390..0c82d3a 100644 --- a/gremlin-core/pom.xml +++ b/gremlin-core/pom.xml @@ -115,7 +115,36 @@ limitations under the License. com.google.testing.compile compile-testing -0.10 +0.15 +test + + +com.google.guava +guava + + +com.google.errorprone +error_prone_annotations + + + + + +com.google.guava +guava +23.4-android +test + + +com.google.errorprone +error_prone_annotations + + + + +com.google.errorprone +error_prone_annotations +2.0.19 test @@ -148,8 +177,7 @@ limitations under the License. org.apache.maven.plugins maven-compiler-plugin -1.8 -1.8 +11 -parameters -proc:none diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java index f198f16..1a87392 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java +++
[tinkerpop] 05/05: TINKERPOP-2076 Fixed Gremlin Server integration tests after Java 11
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit a9f9ca6feb66cb9b477741c8a4ccb0ea79236692
Author: Stephen Mallette
AuthorDate: Thu Mar 7 07:37:53 2019 -0500
TINKERPOP-2076 Fixed Gremlin Server integration tests after Java 11
---
.../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 12 +---
.../gremlin/server/GremlinServerHttpIntegrateTest.java | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
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 6a289fe..05dda72 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
@@ -489,7 +489,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final ResponseException rex = (ResponseException) inner;
assertEquals("java.lang.ArithmeticException",
rex.getRemoteExceptionHierarchy().get().get(0));
assertEquals(1, rex.getRemoteExceptionHierarchy().get().size());
-assertThat(rex.getRemoteStackTrace().get(),
startsWith("java.lang.ArithmeticException: Division by zero\n\tat
java.math.BigDecimal.divide(BigDecimal.java"));
+assertThat(rex.getRemoteStackTrace().get(),
startsWith("java.lang.ArithmeticException: Division by zero\n\tat
java.base/java.math.BigDecimal.divide(BigDecimal.java"));
}
// should not die completely just because we had a bad serialization
error. that kind of stuff happens
@@ -924,12 +924,11 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Cluster cluster =
TestClientFactory.build().serializer(Serializers.GRAPHSON_V2D0).create();
final Client client = cluster.connect();
-final Instant now = Instant.now();
-final List r = client.submit("java.time.Instant.ofEpochMilli("
+ now.toEpochMilli() + ")").all().join();
+final List r =
client.submit("java.time.Instant.EPOCH").all().join();
assertEquals(1, r.size());
final Instant then = r.get(0).get(Instant.class);
-assertEquals(now, then);
+assertEquals(Instant.EPOCH, then);
cluster.close();
}
@@ -958,12 +957,11 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Cluster cluster =
TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
final Client client = cluster.connect();
-final Instant now = Instant.now();
-final List r = client.submit("java.time.Instant.ofEpochMilli("
+ now.toEpochMilli() + ")").all().join();
+final List r =
client.submit("java.time.Instant.EPOCH").all().join();
assertEquals(1, r.size());
final Instant then = r.get(0).get(Instant.class);
-assertEquals(now, then);
+assertEquals(Instant.EPOCH, then);
cluster.close();
}
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index 0bd9ecf..43e5495 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -773,7 +773,7 @@ public class GremlinServerHttpIntegrateTest extends
AbstractGremlinServerIntegra
final JsonNode node = mapper.readTree(json);
assertEquals("java.lang.ArithmeticException",
node.get(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS).get(0).asText());
assertEquals(1,
node.get(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS).size());
-assertThat(node.get(Tokens.STATUS_ATTRIBUTE_STACK_TRACE).asText(),
startsWith("java.lang.ArithmeticException: Division by zero\n\tat
java.math.BigDecimal.divide(BigDecimal.java"));
+assertThat(node.get(Tokens.STATUS_ATTRIBUTE_STACK_TRACE).asText(),
startsWith("java.lang.ArithmeticException: Division by zero\n\tat
java.base/java.math.BigDecimal.divide(BigDecimal.java"));
}
}
[tinkerpop] 04/05: TINKERPOP-2076 Fixed failing GraphComputer test after Java 11 upgrade
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit bb7da67841d4aa71917790cd7463d42d79ca6233
Author: Stephen Mallette
AuthorDate: Wed Mar 6 15:26:00 2019 -0500
TINKERPOP-2076 Fixed failing GraphComputer test after Java 11 upgrade
Needed to explicitly count elements in ConcurrentSkipListSet as size() is
not a constant-time operation. Wasn't failing at all on Java 8 but 11 made it
fail every time.
---
.../process/computer/GraphComputerTest.java| 27 ++
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index d9bf2e1..a9ebd17 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -1168,7 +1168,7 @@ public class GraphComputerTest extends
AbstractGremlinProcessTest {
/
/
-@org.junit.Ignore
+
@Test
@LoadGraphWith(MODERN)
public void shouldStartAndEndWorkersForVertexProgramAndMapReduce() throws
Exception {
@@ -1176,17 +1176,17 @@ public class GraphComputerTest extends
AbstractGremlinProcessTest {
MapReduceI.WORKER_END.clear();
assertEquals(3, graphProvider.getGraphComputer(graph).program(new
VertexProgramJ()).mapReduce(new
MapReduceI()).submit().get().memory().get("a").intValue());
if (MapReduceI.WORKER_START.size() == 2) {
-assertEquals(2, MapReduceI.WORKER_START.size());
+assertEquals(2, MapReduceI.countTrue(MapReduceI.WORKER_START));
assertTrue(MapReduceI.WORKER_START.contains(MapReduce.Stage.MAP)
&& MapReduceI.WORKER_START.contains(MapReduce.Stage.REDUCE));
} else {
-assertEquals(3, MapReduceI.WORKER_START.size());
+assertEquals(3, MapReduceI.countTrue(MapReduceI.WORKER_START));
assertTrue(MapReduceI.WORKER_START.contains(MapReduce.Stage.MAP)
&& MapReduceI.WORKER_START.contains(MapReduce.Stage.COMBINE) &&
MapReduceI.WORKER_START.contains(MapReduce.Stage.REDUCE));
}
if (MapReduceI.WORKER_END.size() == 2) {
-assertEquals(2, MapReduceI.WORKER_END.size());
+assertEquals(2, MapReduceI.countTrue(MapReduceI.WORKER_END));
assertTrue(MapReduceI.WORKER_END.contains(MapReduce.Stage.MAP) &&
MapReduceI.WORKER_END.contains(MapReduce.Stage.REDUCE));
} else {
-assertEquals(3, MapReduceI.WORKER_END.size());
+assertEquals(3, MapReduceI.countTrue(MapReduceI.WORKER_END));
assertTrue(MapReduceI.WORKER_END.contains(MapReduce.Stage.MAP) &&
MapReduceI.WORKER_END.contains(MapReduce.Stage.COMBINE) &&
MapReduceI.WORKER_END.contains(MapReduce.Stage.REDUCE));
}
}
@@ -1273,14 +1273,14 @@ public class GraphComputerTest extends
AbstractGremlinProcessTest {
@Override
public void map(final Vertex vertex, final MapEmitter emitter) {
emitter.emit(1);
-assertEquals(1, WORKER_START.size());
+assertEquals(1, countTrue(WORKER_START));
assertTrue(WORKER_START.contains(Stage.MAP));
}
@Override
public void combine(final NullObject key, final Iterator
values, final ReduceEmitter emitter) {
emitter.emit(2);
-assertEquals(2, WORKER_START.size());
+assertEquals(2, countTrue(WORKER_START));
assertTrue(WORKER_START.contains(Stage.MAP) &&
WORKER_START.contains(Stage.COMBINE));
assertFalse(WORKER_END.isEmpty());
}
@@ -1289,10 +1289,10 @@ public class GraphComputerTest extends
AbstractGremlinProcessTest {
public void reduce(final NullObject key, final Iterator
values, final ReduceEmitter emitter) {
emitter.emit(3);
if (WORKER_START.size() == 2) {
-assertEquals(2, WORKER_START.size());
+assertEquals(2, countTrue(WORKER_START));
assertTrue(WORKER_START.contains(Stage.MAP) &&
WORKER_START.contains(Stage.REDUCE));
} else {
-assertEquals(3, WORKER_START.size());
+assertEquals(3, countTrue(WORKER_START));
assertTrue(WORKER_START.contains(Stage.MAP) &&
WORKER_START.contains(Stage.COMBINE) && WORKER_START.contains(Stage.REDUCE));
}
assertFalse(WORKER_END.isEmpty());
@@ -1316,6 +1316,15 @@ public class GraphComputerTest extends
AbstractGremlinProcessTest {
public String getMemoryKey() {
return "a";
}
[tinkerpop] 02/05: TINKERPOP-2076 Bumped Hadoop to 2.7.7
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch TINKERPOP-2076 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 845f459c3220c5a8d89417a8049e313bc453a4db Author: Stephen Mallette AuthorDate: Wed Mar 6 11:25:01 2019 -0500 TINKERPOP-2076 Bumped Hadoop to 2.7.7 --- CHANGELOG.asciidoc | 1 + pom.xml| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index bd319ba..2bfd4d1 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -694,6 +694,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima * Bumped `slf4j` to 1.7.25. * Bumped `commons-codec` to 1.12. * Bumped to Groovy 2.5.6. +* Bumped to Hadoop 2.7.7. * Fixed partial response failures when using authentication in `gremlin-python`. * Fixed concurrency issues in `TraverserSet.toString()` and `ObjectWritable.toString()`. * Fixed a bug in `InlineFilterStrategy` that mixed up and's and or's when folding merging conditions together. diff --git a/pom.xml b/pom.xml index 7f3d2ca..444a4e3 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ limitations under the License. 2.6 3.8.1 2.5.7 -2.7.2 +2.7.7 1.2 3.1.0 1.1
[tinkerpop] 03/05: TINKERPOP-2076 Made expectations around mock more explicit
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit ead68bdaa798cdba0470d9675740358b2005d294
Author: Stephen Mallette
AuthorDate: Wed Mar 6 14:56:17 2019 -0500
TINKERPOP-2076 Made expectations around mock more explicit
The upgrade of mockito must have tightened some requirements around
stubbing and the use of nulls. Setting expected arguments seemed to get the
test working as it was before.
---
.../tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
index f708159..8e12700 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.server.op;
import io.netty.channel.ChannelHandlerContext;
+import org.apache.tinkerpop.gremlin.driver.Tokens;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
@@ -41,11 +42,13 @@ import static org.mockito.Matchers.anyString;
public class AbstractEvalOpProcessorTest {
-@org.junit.Ignore
@Test
public void evalOpInternalShouldHandleAllEvaluationExceptions() throws
OpProcessorException {
final AbstractEvalOpProcessor processor = new StandardOpProcessor();
-final RequestMessage request = RequestMessage.build("test").create();
+final RequestMessage request = RequestMessage.build("test")
+.addArg(Tokens.ARGS_GREMLIN, "1+1")
+.addArg(Tokens.ARGS_LANGUAGE, "gremlin-groovy")
+.create();
final Settings settings = new Settings();
final ChannelHandlerContext ctx =
Mockito.mock(ChannelHandlerContext.class);
final ArgumentCaptor responseCaptor =
ArgumentCaptor.forClass(ResponseMessage.class);
[tinkerpop] 01/01: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit b779cdf6fb864bcb8ee1f8d6cd5f453b115f8720
Merge: a2dfcd0 b2eefb0
Author: stephen
AuthorDate: Fri Nov 8 16:10:09 2019 -0500
Merge branch 'tp34'
.../util/{CoreTestHelper.java => TestSupport.java} | 15 +--
.../jsr223/DefaultScriptCustomizerTest.java| 6 +++---
.../jsr223/ScriptFileGremlinPluginTest.java| 8 +++-
.../StandardVerificationStrategyTest.java | 5 ++---
.../gremlin/structure/util/GraphFactoryTest.java | 16
.../org/apache/tinkerpop/gremlin/TestHelper.java | 22 +++---
6 files changed, 28 insertions(+), 44 deletions(-)
[tinkerpop] branch master updated (a2dfcd0 -> b779cdf)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from a2dfcd0 Merge branch 'tp34'
add 8e03e13 Renamed CoreTestHelper and other minor cleanup CTR
add b2eefb0 Merge branch 'tp33' into tp34
new b779cdf Merge branch 'tp34'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../util/{CoreTestHelper.java => TestSupport.java} | 15 +--
.../jsr223/DefaultScriptCustomizerTest.java| 6 +++---
.../jsr223/ScriptFileGremlinPluginTest.java| 8 +++-
.../StandardVerificationStrategyTest.java | 5 ++---
.../gremlin/structure/util/GraphFactoryTest.java | 16
.../org/apache/tinkerpop/gremlin/TestHelper.java | 22 +++---
6 files changed, 28 insertions(+), 44 deletions(-)
rename
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/{CoreTestHelper.java
=> TestSupport.java} (95%)
[tinkerpop] branch tp34 updated (ef941e3 -> b2eefb0)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch tp34
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from ef941e3 Merge branch 'tp33' into tp34
add 8e03e13 Renamed CoreTestHelper and other minor cleanup CTR
add b2eefb0 Merge branch 'tp33' into tp34
No new revisions were added by this update.
Summary of changes:
.../util/{CoreTestHelper.java => TestSupport.java} | 15 +--
.../jsr223/DefaultScriptCustomizerTest.java| 6 +++---
.../jsr223/ScriptFileGremlinPluginTest.java| 8 +++-
.../StandardVerificationStrategyTest.java | 5 ++---
.../gremlin/structure/util/GraphFactoryTest.java | 16
.../org/apache/tinkerpop/gremlin/TestHelper.java | 22 +++---
6 files changed, 28 insertions(+), 44 deletions(-)
rename
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/{CoreTestHelper.java
=> TestSupport.java} (95%)
[tinkerpop] branch tp33 updated (a40bc3d -> 8e03e13)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch tp33
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from a40bc3d TestHelper.RANDOM should be used in all tests so the seed
gets captured
add 8e03e13 Renamed CoreTestHelper and other minor cleanup CTR
No new revisions were added by this update.
Summary of changes:
.../util/{CoreTestHelper.java => TestSupport.java} | 15 +--
.../gremlin/jsr223/DefaultScriptCustomizerTest.java | 6 +++---
.../gremlin/jsr223/ScriptFileGremlinPluginTest.java | 8 +++-
.../gremlin/structure/util/GraphFactoryTest.java| 16
.../org/apache/tinkerpop/gremlin/TestHelper.java| 21 ++---
.../gremlin/hadoop/HadoopGraphProvider.java | 1 +
6 files changed, 26 insertions(+), 41 deletions(-)
rename
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/{CoreTestHelper.java
=> TestSupport.java} (95%)
[GitHub] [tinkerpop] spmallette merged pull request #1188: [TINKERPOP-2274] Fixed the issues revealed while compiling and runnin…
spmallette merged pull request #1188: [TINKERPOP-2274] Fixed the issues revealed while compiling and runnin… URL: https://github.com/apache/tinkerpop/pull/1188 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[tinkerpop] 01/01: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit a2dfcd0f8174ce59d617efd47b8b596797bcd2b8 Merge: 4240b35 ef941e3 Author: stephen AuthorDate: Fri Nov 8 07:23:36 2019 -0500 Merge branch 'tp34' docs/preprocessor/install-plugins.groovy | 2 +- gremlin-archetype/pom.xml | 1 + .../tinkerpop/gremlin/console/ConsoleFs.groovy | 8 +- .../console/commands/UninstallCommand.groovy | 12 +- .../jsr223/DriverRemoteAcceptorIntegrateTest.java | 25 +-- .../console/jsr223/DriverRemoteAcceptorTest.java | 4 +- gremlin-core/pom.xml | 6 + .../tinkerpop/gremlin/structure/io/Storage.java| 101 +-- .../tinkerpop/gremlin/util/CoreTestHelper.java | 188 + .../SerializerTest.java => AssertHelper.java} | 27 +-- .../org/apache/tinkerpop/gremlin/TestHelper.java | 147 .../jsr223/DefaultScriptCustomizerTest.java| 6 +- .../gremlin/jsr223/ScriptEngineCacheTest.java | 8 +- .../jsr223/ScriptFileGremlinPluginTest.java| 11 +- .../gremlin/process/traversal/OrderTest.java | 3 +- .../optimization/EarlyLimitStrategyTest.java | 4 +- .../optimization/OrderLimitStrategyTest.java | 2 +- .../StandardVerificationStrategyTest.java | 6 +- .../gremlin/structure/io/GraphMigratorTest.java| 4 +- .../tinkerpop/gremlin/structure/io/IoCoreTest.java | 4 +- .../structure/io/graphson/GraphSONTokensTest.java | 4 +- .../structure/io/graphson/GraphSONUtilTest.java| 4 +- .../gremlin/structure/util/ComparatorsTest.java| 4 +- .../gremlin/structure/util/ElementHelperTest.java | 4 +- .../gremlin/structure/util/GraphFactoryTest.java | 32 ++-- .../structure/util/GraphVariableHelperTest.java| 4 +- .../gremlin/structure/util/StringFactoryTest.java | 4 +- .../apache/tinkerpop/gremlin/util/GremlinTest.java | 4 +- .../tinkerpop/gremlin/util/SerializerTest.java | 4 +- .../tinkerpop/gremlin/util/TimeUtilTest.java | 4 +- .../gremlin/util/function/FunctionUtilsTest.java | 5 +- .../gremlin/util/iterator/IteratorUtilsTest.java | 4 +- .../tinkerpop/gremlin/util/tools/MultiMapTest.java | 5 +- .../gremlin/groovy/util/DependencyGrabber.groovy | 74 .../gremlin/groovy/engine/GremlinExecutorTest.java | 4 +- .../GremlinGroovyScriptEngineFileSandboxTest.java | 5 +- .../util/DependencyGrabberIntegrateTest.java | 76 + .../gremlin/util/TinkerGraphProvider.java | 4 +- .../gremlin/server/util/GremlinServerInstall.java | 7 +- .../gremlin/server/GremlinDriverIntegrateTest.java | 6 +- .../tinkerpop/gremlin/server/ServerTestHelper.java | 57 +-- .../gremlin/util/Log4jRecordingAppender.java | 17 +- .../gremlin/AbstractFileGraphProvider.java | 12 +- .../apache/tinkerpop/gremlin/GraphProvider.java| 3 +- .../org/apache/tinkerpop/gremlin/TestHelper.java | 142 ++-- .../gremlin/jsr223/BindingsScriptEngineTest.java | 3 +- .../gremlin/structure/io/IoGraphTest.java | 8 +- .../tinkerpop/gremlin/structure/io/IoTest.java | 31 ++-- hadoop-gremlin/README.md | 52 ++ hadoop-gremlin/pom.xml | 29 .../apache/tinkerpop/gremlin/hadoop/Constants.java | 22 +++ .../computer/AbstractHadoopGraphComputer.java | 12 +- .../hadoop/structure/io/FileSystemStorage.java | 101 ++- .../hadoop/structure/io/InputOutputHelper.java | 2 +- .../computer/AbstractHadoopGraphComputerTest.java | 59 --- .../structure/io/RecordReaderWriterTest.java | 5 +- pom.xml| 18 +- .../tinkerpop/gremlin/spark/structure/Spark.java | 7 +- .../spark/structure/io/SparkContextStorage.java| 107 +--- .../structure/io/AbstractIoRegistryCheck.java | 7 +- .../hadoop/structure/io/AbstractStorageCheck.java | 48 +++--- .../structure/io/FileSystemStorageCheck.java | 24 ++- .../spark/process/computer/LocalPropertyTest.java | 2 +- .../SparkHadoopGraphGryoSerializerProvider.java| 1 + .../gremlin/spark/structure/SparkTest.java | 3 +- .../structure/io/SparkContextStorageCheck.java | 26 +-- .../io/gryo/GryoSerializerIntegrateTest.java | 4 +- .../gremlin/tinkergraph/TinkerGraphProvider.java | 4 +- .../tinkergraph/TinkerGraphUUIDProvider.java | 4 +- .../structure/IoDataGenerationTest.java| 127 +++--- .../tinkergraph/structure/TinkerGraphTest.java | 13 +- 71 files changed, 1036 insertions(+), 741 deletions(-) diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactoryTest.java index c146f72,514b28c..5fc6951 ---
[tinkerpop] branch tp33 updated (16b6d5a -> a40bc3d)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch tp33 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. from 16b6d5a Bump Travis to xenial builds add 1088cd9 [TINKERPOP-2274] Fixed the issues revealed while compiling and running tests under Windows add 9cd001b [TINKERPOP-2274] Changed back the default persistent use of Spark Context for tests, still making it non-periststent for the tests that are reveal locks under Windows. This should speed up the integration tests back too. add ec62bae Update pom.xml add 26a2dfd Merge branch 'TINKERPOP-2274-clean' of https://github.com/rpopov/tinkerpop into TINKERPOP-2274-clean add e061038 [TINKERPOP-2274] Made the FileSystemCheck tests use non-persistent Spark context this way avoiding locks in the file system. add eeb7e11 [TINKERPOP-2274] Fixed the use of a directory in place of file that had failed the integration tests. Fixed. add d339ba3 [TINKERPOP-2274] Split the TestHelper from gremlin-core/test into two classes - CoreTestHelper in the gremlin-core/main, so that it poublishes common methods, available to be inherited, whereas the only duplicated code is left in core/test TestHelper not published, thus avoiding name conflict with TestHelper from gremlin-test add 954f1a5 [TINKERPOP-2274] Removed references to CoreTestHelper outsde the gremlin-core project add 5c4cace Squashed commit of the following: add ff071b6 Merge branch 'pr-1188' into tp33 add 5a3535d Minor syntax error caused :install command to fail CTR add 88578a8 Updated javadoc for the CoreTestHelper add 5e43fdc Aligned maven version to what was previously enforced - 3.3.9 add a40bc3d TestHelper.RANDOM should be used in all tests so the seed gets captured No new revisions were added by this update. Summary of changes: docs/preprocessor/install-plugins.groovy | 2 +- gremlin-archetype/pom.xml | 1 + .../tinkerpop/gremlin/console/ConsoleFs.groovy | 8 +- .../console/commands/UninstallCommand.groovy | 12 +- .../jsr223/DriverRemoteAcceptorIntegrateTest.java | 25 +-- .../console/jsr223/DriverRemoteAcceptorTest.java | 4 +- gremlin-core/pom.xml | 6 + .../tinkerpop/gremlin/structure/io/Storage.java| 101 ++-- .../tinkerpop/gremlin/util/CoreTestHelper.java | 177 + .../org/apache/tinkerpop/gremlin/TestHelper.java | 119 +- .../jsr223/DefaultScriptCustomizerTest.java| 6 +- .../gremlin/jsr223/ScriptEngineCacheTest.java | 4 +- .../jsr223/ScriptFileGremlinPluginTest.java| 11 +- .../gremlin/process/traversal/OrderTest.java | 3 +- .../optimization/EarlyLimitStrategyTest.java | 4 +- .../optimization/OrderLimitStrategyTest.java | 2 +- .../gremlin/structure/util/GraphFactoryTest.java | 28 ++-- .../gremlin/groovy/util/DependencyGrabber.groovy | 74 - .../gremlin/groovy/engine/GremlinExecutorTest.java | 4 +- .../GremlinGroovyScriptEngineFileSandboxTest.java | 5 +- .../util/DependencyGrabberIntegrateTest.java | 76 + .../gremlin/util/TinkerGraphProvider.java | 4 +- .../apache/tinkerpop/gremlin/server/Settings.java | 8 +- .../gremlin/server/util/GremlinServerInstall.java | 7 +- .../gremlin/server/GremlinDriverIntegrateTest.java | 6 +- .../gremlin/server/ResponseHandlerContextTest.java | 6 +- .../tinkerpop/gremlin/server/ServerTestHelper.java | 57 +-- .../gremlin/util/Log4jRecordingAppender.java | 17 +- .../apache/tinkerpop/gremlin/GraphProvider.java| 3 +- .../org/apache/tinkerpop/gremlin/TestHelper.java | 136 ++-- .../gremlin/jsr223/BindingsScriptEngineTest.java | 3 +- .../bulkloading/BulkLoaderVertexProgramTest.java | 2 +- .../gremlin/structure/io/IoGraphTest.java | 8 +- .../tinkerpop/gremlin/structure/io/IoTest.java | 31 ++-- hadoop-gremlin/README.md | 52 ++ hadoop-gremlin/pom.xml | 29 .../apache/tinkerpop/gremlin/hadoop/Constants.java | 22 +++ .../computer/AbstractHadoopGraphComputer.java | 12 +- .../hadoop/structure/io/FileSystemStorage.java | 101 +++- .../hadoop/structure/io/InputOutputHelper.java | 2 +- .../gremlin/hadoop/HadoopGraphProvider.java| 10 +- .../computer/AbstractHadoopGraphComputerTest.java | 59 --- .../structure/io/AbstractIoRegistryCheck.java | 7 +- .../hadoop/structure/io/AbstractStorageCheck.java | 48 +++--- .../structure/io/FileSystemStorageCheck.java | 24 ++- .../structure/io/RecordReaderWriterTest.java | 5 +- pom.xml| 18 ++- .../tinkerpop/gremlin/spark/structure/Spark.java | 7 +-
[tinkerpop] branch master updated (4240b35 -> a2dfcd0)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. from 4240b35 Merge branch 'tp34' add 1088cd9 [TINKERPOP-2274] Fixed the issues revealed while compiling and running tests under Windows add 9cd001b [TINKERPOP-2274] Changed back the default persistent use of Spark Context for tests, still making it non-periststent for the tests that are reveal locks under Windows. This should speed up the integration tests back too. add ec62bae Update pom.xml add 26a2dfd Merge branch 'TINKERPOP-2274-clean' of https://github.com/rpopov/tinkerpop into TINKERPOP-2274-clean add e061038 [TINKERPOP-2274] Made the FileSystemCheck tests use non-persistent Spark context this way avoiding locks in the file system. add eeb7e11 [TINKERPOP-2274] Fixed the use of a directory in place of file that had failed the integration tests. Fixed. add d339ba3 [TINKERPOP-2274] Split the TestHelper from gremlin-core/test into two classes - CoreTestHelper in the gremlin-core/main, so that it poublishes common methods, available to be inherited, whereas the only duplicated code is left in core/test TestHelper not published, thus avoiding name conflict with TestHelper from gremlin-test add 954f1a5 [TINKERPOP-2274] Removed references to CoreTestHelper outsde the gremlin-core project add 5c4cace Squashed commit of the following: add ff071b6 Merge branch 'pr-1188' into tp33 add 5a3535d Minor syntax error caused :install command to fail CTR add 88578a8 Updated javadoc for the CoreTestHelper add 5e43fdc Aligned maven version to what was previously enforced - 3.3.9 add a40bc3d TestHelper.RANDOM should be used in all tests so the seed gets captured add ef941e3 Merge branch 'tp33' into tp34 new a2dfcd0 Merge branch 'tp34' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: docs/preprocessor/install-plugins.groovy | 2 +- gremlin-archetype/pom.xml | 1 + .../tinkerpop/gremlin/console/ConsoleFs.groovy | 8 +- .../console/commands/UninstallCommand.groovy | 12 +- .../jsr223/DriverRemoteAcceptorIntegrateTest.java | 25 +-- .../console/jsr223/DriverRemoteAcceptorTest.java | 4 +- gremlin-core/pom.xml | 6 + .../tinkerpop/gremlin/structure/io/Storage.java| 101 +-- .../tinkerpop/gremlin/util/CoreTestHelper.java | 188 + .../org/apache/tinkerpop/gremlin/AssertHelper.java | 20 ++- .../org/apache/tinkerpop/gremlin/TestHelper.java | 147 .../jsr223/DefaultScriptCustomizerTest.java| 6 +- .../gremlin/jsr223/ScriptEngineCacheTest.java | 8 +- .../jsr223/ScriptFileGremlinPluginTest.java| 11 +- .../gremlin/process/traversal/OrderTest.java | 3 +- .../optimization/EarlyLimitStrategyTest.java | 4 +- .../optimization/OrderLimitStrategyTest.java | 2 +- .../StandardVerificationStrategyTest.java | 6 +- .../gremlin/structure/io/GraphMigratorTest.java| 4 +- .../tinkerpop/gremlin/structure/io/IoCoreTest.java | 4 +- .../structure/io/graphson/GraphSONTokensTest.java | 4 +- .../structure/io/graphson/GraphSONUtilTest.java| 4 +- .../gremlin/structure/util/ComparatorsTest.java| 4 +- .../gremlin/structure/util/ElementHelperTest.java | 4 +- .../gremlin/structure/util/GraphFactoryTest.java | 32 ++-- .../structure/util/GraphVariableHelperTest.java| 4 +- .../gremlin/structure/util/StringFactoryTest.java | 4 +- .../apache/tinkerpop/gremlin/util/GremlinTest.java | 4 +- .../tinkerpop/gremlin/util/SerializerTest.java | 4 +- .../tinkerpop/gremlin/util/TimeUtilTest.java | 4 +- .../gremlin/util/function/FunctionUtilsTest.java | 5 +- .../gremlin/util/iterator/IteratorUtilsTest.java | 4 +- .../tinkerpop/gremlin/util/tools/MultiMapTest.java | 5 +- .../gremlin/groovy/util/DependencyGrabber.groovy | 74 .../gremlin/groovy/engine/GremlinExecutorTest.java | 4 +- .../GremlinGroovyScriptEngineFileSandboxTest.java | 5 +- .../util/DependencyGrabberIntegrateTest.java | 76 + .../gremlin/util/TinkerGraphProvider.java | 4 +- .../gremlin/server/util/GremlinServerInstall.java | 7 +- .../gremlin/server/GremlinDriverIntegrateTest.java | 6 +- .../tinkerpop/gremlin/server/ServerTestHelper.java | 57 +-- .../gremlin/util/Log4jRecordingAppender.java | 17 +- .../gremlin/AbstractFileGraphProvider.java | 12 +- .../apache/tinkerpop/gremlin/GraphProvider.java| 3 +- .../org/apache/tinkerpop/gremlin/TestHelper.java | 142
[tinkerpop] branch tp34 updated (c8d63b4 -> ef941e3)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch tp34 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. from c8d63b4 Fixed changelog merge error CTR add 1088cd9 [TINKERPOP-2274] Fixed the issues revealed while compiling and running tests under Windows add 9cd001b [TINKERPOP-2274] Changed back the default persistent use of Spark Context for tests, still making it non-periststent for the tests that are reveal locks under Windows. This should speed up the integration tests back too. add ec62bae Update pom.xml add 26a2dfd Merge branch 'TINKERPOP-2274-clean' of https://github.com/rpopov/tinkerpop into TINKERPOP-2274-clean add e061038 [TINKERPOP-2274] Made the FileSystemCheck tests use non-persistent Spark context this way avoiding locks in the file system. add eeb7e11 [TINKERPOP-2274] Fixed the use of a directory in place of file that had failed the integration tests. Fixed. add d339ba3 [TINKERPOP-2274] Split the TestHelper from gremlin-core/test into two classes - CoreTestHelper in the gremlin-core/main, so that it poublishes common methods, available to be inherited, whereas the only duplicated code is left in core/test TestHelper not published, thus avoiding name conflict with TestHelper from gremlin-test add 954f1a5 [TINKERPOP-2274] Removed references to CoreTestHelper outsde the gremlin-core project add 5c4cace Squashed commit of the following: add ff071b6 Merge branch 'pr-1188' into tp33 add 5a3535d Minor syntax error caused :install command to fail CTR add 88578a8 Updated javadoc for the CoreTestHelper add 5e43fdc Aligned maven version to what was previously enforced - 3.3.9 add a40bc3d TestHelper.RANDOM should be used in all tests so the seed gets captured add ef941e3 Merge branch 'tp33' into tp34 No new revisions were added by this update. Summary of changes: docs/preprocessor/install-plugins.groovy | 2 +- gremlin-archetype/pom.xml | 1 + .../tinkerpop/gremlin/console/ConsoleFs.groovy | 8 +- .../console/commands/UninstallCommand.groovy | 12 +- .../jsr223/DriverRemoteAcceptorIntegrateTest.java | 25 +-- .../console/jsr223/DriverRemoteAcceptorTest.java | 4 +- gremlin-core/pom.xml | 6 + .../tinkerpop/gremlin/structure/io/Storage.java| 101 +-- .../tinkerpop/gremlin/util/CoreTestHelper.java | 188 + .../org/apache/tinkerpop/gremlin/AssertHelper.java | 20 ++- .../org/apache/tinkerpop/gremlin/TestHelper.java | 147 .../jsr223/DefaultScriptCustomizerTest.java| 6 +- .../gremlin/jsr223/ScriptEngineCacheTest.java | 8 +- .../jsr223/ScriptFileGremlinPluginTest.java| 11 +- .../gremlin/process/traversal/OrderTest.java | 3 +- .../optimization/EarlyLimitStrategyTest.java | 4 +- .../optimization/OrderLimitStrategyTest.java | 2 +- .../StandardVerificationStrategyTest.java | 6 +- .../gremlin/structure/io/GraphMigratorTest.java| 4 +- .../tinkerpop/gremlin/structure/io/IoCoreTest.java | 4 +- .../structure/io/graphson/GraphSONTokensTest.java | 4 +- .../structure/io/graphson/GraphSONUtilTest.java| 4 +- .../gremlin/structure/util/ComparatorsTest.java| 4 +- .../gremlin/structure/util/ElementHelperTest.java | 4 +- .../gremlin/structure/util/GraphFactoryTest.java | 32 ++-- .../structure/util/GraphVariableHelperTest.java| 4 +- .../gremlin/structure/util/StringFactoryTest.java | 4 +- .../apache/tinkerpop/gremlin/util/GremlinTest.java | 4 +- .../tinkerpop/gremlin/util/SerializerTest.java | 4 +- .../tinkerpop/gremlin/util/TimeUtilTest.java | 4 +- .../gremlin/util/function/FunctionUtilsTest.java | 5 +- .../gremlin/util/iterator/IteratorUtilsTest.java | 4 +- .../tinkerpop/gremlin/util/tools/MultiMapTest.java | 5 +- .../gremlin/groovy/util/DependencyGrabber.groovy | 74 .../gremlin/groovy/engine/GremlinExecutorTest.java | 4 +- .../GremlinGroovyScriptEngineFileSandboxTest.java | 5 +- .../util/DependencyGrabberIntegrateTest.java | 76 + .../gremlin/util/TinkerGraphProvider.java | 4 +- .../apache/tinkerpop/gremlin/server/Settings.java | 8 +- .../gremlin/server/util/GremlinServerInstall.java | 7 +- .../gremlin/server/GremlinDriverIntegrateTest.java | 6 +- .../gremlin/server/ResponseHandlerContextTest.java | 6 +- .../tinkerpop/gremlin/server/ServerTestHelper.java | 57 +-- .../gremlin/util/Log4jRecordingAppender.java | 17 +- .../gremlin/AbstractFileGraphProvider.java | 12 +- .../apache/tinkerpop/gremlin/GraphProvider.java| 3 +- .../org/apache/tinkerpop/gremlin/TestHelper.java | 142 ++-- .../gremlin/jsr223/BindingsScriptEngineTest.java | 3 +-
[tinkerpop] 01/01: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 4240b353f0cfc0fc9c8ad2d8803319d5ca6830ee Merge: 96f5609 c8d63b4 Author: stephen AuthorDate: Fri Nov 8 06:29:32 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-)
[tinkerpop] branch tp34 updated (b5b3bd7 -> c8d63b4)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch tp34 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. from b5b3bd7 Merge branch 'tp33' into tp34 add c8d63b4 Fixed changelog merge error CTR No new revisions were added by this update. Summary of changes: CHANGELOG.asciidoc | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-)
[tinkerpop] branch master updated (96f5609 -> 4240b35)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. from 96f5609 Merge branch 'tp34' add c8d63b4 Fixed changelog merge error CTR new 4240b35 Merge branch 'tp34' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.asciidoc | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-)
