[GitHub] [tinkerpop] javeme opened a new pull request #1224: TINKERPOP-1733 Support g.E().properties().hasKey('xx') & hasValue('xx')
javeme opened a new pull request #1224: TINKERPOP-1733 Support
g.E().properties().hasKey('xx') & hasValue('xx')
URL: https://github.com/apache/tinkerpop/pull/1224
https://issues.apache.org/jira/browse/TINKERPOP-2313
https://issues.apache.org/jira/browse/TINKERPOP-1733
Currently, an exception will be thrown for this query: `XxProperty cannot be
cast to Element`
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
[GitHub] [tinkerpop] javeme edited a comment on issue #1222: TINKERPOP-1733 Support g.E().properties().hasKey('xx') & hasValue('xx')
javeme edited a comment on issue #1222: TINKERPOP-1733 Support
g.E().properties().hasKey('xx') & hasValue('xx')
URL: https://github.com/apache/tinkerpop/pull/1222#issuecomment-553719012
> It seems there is no effect on HadoopProperty dedup:
According to the implementation of [Property
comparison](https://github.com/apache/tinkerpop/blob/be4defb541e9ce99712a53200dbe7794c63f06a3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java#L485),
in addition to comparing to the key and value, the parent element is also
compared:
```java
ElementHelper.areEqual(final Property a, final Object b) {
return a.key().equals(((Property) b).key()) &&
a.value().equals(((Property) b).value()) && areEqual(a.element(), ((Property)
b).element());
}
```
For [StarOutEdge and
StarInEdge](https://github.com/apache/tinkerpop/blob/c2d7bd9c31b9d48f88017c1a077cb69437924d38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraph.java#L818),
the same edges with two directions are not equal.
For
[TinkerEdge](https://github.com/apache/tinkerpop/blob/cff4c161615f2b50bda27b6ba523c7f52b833532/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java#L41)
the same edges with two directions are equal.
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
[GitHub] [tinkerpop] javeme commented on issue #1222: TINKERPOP-1733 Support g.E().properties().hasKey('xx') & hasValue('xx')
javeme commented on issue #1222: TINKERPOP-1733 Support
g.E().properties().hasKey('xx') & hasValue('xx')
URL: https://github.com/apache/tinkerpop/pull/1222#issuecomment-558476632
@spmallette Thanks.
> close yours as a "duplicate" and re-reference this PR to that issue
Done.
> if this capability can be safely targetted at the tp34 branch without
breaking changes I think that would be a nice feature to have along our current
3.4.x release line
Yes, it is compatible with 3.4.x. Let's push to tp34 branch.
> it needs to go an extra step to ensure that metaproperties also work
Sure I also think it is needed to make these steps wholly consistent. I've
tested the metaproperties case, and it's OK with this patch:
```java
gremlin> graph = TinkerFactory.createTheCrew()
==>tinkergraph[vertices:6 edges:14]
gremlin> g = graph.traversal()
==>graphtraversalsource[tinkergraph[vertices:6 edges:14], standard]
gremlin>
g.V().properties().hasKey('location').properties().hasKey('startTime')
==>p[startTime->1997]
==>p[startTime->2001]
==>p[startTime->2004]
==>p[startTime->2005]
==>p[startTime->1990]
==>p[startTime->2000]
==>p[startTime->2006]
==>p[startTime->2004]
==>p[startTime->2007]
==>p[startTime->2011]
==>p[startTime->2014]
==>p[startTime->1982]
==>p[startTime->2005]
==>p[startTime->2009]
```
> Could you please clarify what's wrong
The Travis issue is caused by HadoopProperty dedup does not work, the root
cause is Property comparison will compare the parent elements(here it's edges),
but the same edges with two directions are not equal for StarOutEdge and
StarInEdge. For TinkerEdge, the same edges with two directions are equal.
Is it necessary to unify the behavior of edges comparison? like StarEdge and
TinkerEdge. I would also be pleasure to submit a patch if necessary.
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] branch TINKERPOP-2235 updated (0c9f5da -> 4e6c6e5)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch TINKERPOP-2235 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. discard 0c9f5da TINKERPOP-2235 Refactored Scoping interface discard 108d135 TINKERPOP-2235 Major refactoring and introduction of ScalarMapStep discard 4ed453e TINKERPOP-2235 Fixed ImmutablePath again discard 8cf0990 TINKERPOP-2235 Removed some uneccessary code discard 8e42a9ab TINKERPOP-2235 Be smarter about null in SelectOneStep discard 84f12ce TINKERPOP-2235 Allow for nulls in Path toString() discard f02e8e7 TINKERPOP-2235 Improve map checks for null discard 5e12b1c TINKERPOP-2235 Minor refactoring to get rid of duplicate code discard 05c9674 TINKERPOP-2235 Adjusted semantics of null a bit for Graph discard 4ea38a4 TINKERPOP-2235 Improved upgrade docs for null handling discard af7d7e9 TINKERPOP-2235 Expand imports to match code style discard 5042c2b TINKERPOP-2235 Cleanup comments/javadoc a bit for MapStep discard 0880743 TINKERPOP-2235 Added upgrade and reference docs discard 8e4dd6b TINKERPOP-2235 Exposed the configuration option for null as a feature discard d787431 TINKERPOP-2235 Added tests and Graph level null support discard 6634336 TINKERPOP-2235 Fixed null handling in .NET discard 38f52c3 TINKERPOP-2235 Fix C# gherkin test harness discard b3e3a92 TINKERPOP-2235 Allow null to work within Gremlin add 344b737 TINKERPOP-2305 Introduce Buffer interface add a76cf5d TINKERPOP-2305 Refactor serialization method signatures add 6e10bde TINKERPOP-2035 Move to gremlin-core add 5c2cb9f TINKERPOP-2035 Add utility methods to read/write from Netty buffer add c2108bb TINKERPOP-2035 Fix gremlin-io-test and declare params as final add 2b9f40e Merge branch 'TINKERPOP-2305' into tp34 add d0838e2 Merge branch 'tp34' add 54468ec TINKERPOP-2309 Bump to Tornado 5.x add 16b6d5a Bump Travis to xenial builds add b5b3bd7 Merge branch 'tp33' into tp34 add 96f5609 Merge branch 'tp34' add c8d63b4 Fixed changelog merge error CTR add 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 add a2dfcd0 Merge branch 'tp34' add 8e03e13 Renamed CoreTestHelper and other minor cleanup CTR add b2eefb0 Merge branch 'tp33' into tp34 add b779cdf Merge branch 'tp34' add ce2f3b6 Updated binary NOTICE files for groovy - got behind somehow CTR add d717990 Merge branch 'tp34' add 00c15c0 fix unit test failure in non-English environment add 8852f4d Merge branch 'tp34' add 8367eef Added elementMap() throughout most of docs add 19763a2 Merge branch 'tp34' add 5205388 Kill dependabot with deadly config!!! add 2d0e9e0 Some minor LICENSE/NOTICE cleanup that was missed at some point CTR add 359a241 Merge branch 'tp34' add 6c7df78 Reduce the number of warmup rounds in benchmarks add f49c96e Merge branch 'tp33' into tp34 add 8fa2045 Merge branch 'tp34' add b5b48a4 Reverts TINKERPOP-2289 resolve ip address add 25e5087 Merge remote-tracking branch 'origin/revert_tinkerpop-2289' into tp33 add f831fd1 Merge branch 'tp33' into tp34 add cc0d3ce Merge branch 'tp34' add 3410bb0 Bump to gmavenplus plugin 1.8.1 CTR
[tinkerpop] branch TINKERPOP-2314 updated (10a1527 -> 035afd1)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch TINKERPOP-2314 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. discard 10a1527 TINKERPOP-2314 Employ by(String) for Map when possible add 2d0fd64 Bump to Jackson databind 2.9.10.1 CTR add 20a5093 Merge branch 'tp33' into tp34 add 050f66a Pretty big javadoc cleanup. add c7461d7 Merge branch 'tp33' into tp34 add 75e3acc Javadoc fixes add fd0ecd6 A body of commits to debug/fix a failing travis test add f4e1df5 Increase default max wait time for a connection with java driver add a75cfb6 Move SSL tests to their own test class add adebb32 Break up server/console test builds for travis add 035afd1 TINKERPOP-2314 Employ by(String) for Map when possible 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 (10a1527) \ N -- N -- N refs/heads/TINKERPOP-2314 (035afd1) 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. No new revisions were added by this update. Summary of changes: .travis.yml| 10 +- .../gremlin-server-integration-secure.yaml | 1 + .../gremlin-server/gremlin-server-integration.yaml | 1 + .../GephiTraversalVisualizationStrategy.groovy | 2 +- .../gremlin/process/computer/ComputerResult.java | 5 +- .../gremlin/process/computer/GraphComputer.java| 51 ++-- .../gremlin/process/computer/MapReduce.java| 13 +- .../gremlin/process/computer/VertexProgram.java| 6 +- .../computer/bulkloading/OneTimeBulkLoader.java| 8 +- .../computer/traversal/step/VertexComputing.java | 5 +- .../computer/util/DefaultComputerResult.java | 6 +- .../remote/traversal/AbstractRemoteTraversal.java | 4 +- .../process/remote/traversal/RemoteTraversal.java | 2 +- .../gremlin/process/traversal/Bindings.java| 5 +- .../gremlin/process/traversal/Compare.java | 2 +- .../tinkerpop/gremlin/process/traversal/Step.java | 9 +- .../gremlin/process/traversal/Traversal.java | 17 +- .../process/traversal/TraversalSideEffects.java| 10 +- .../gremlin/process/traversal/TraversalSource.java | 24 +- .../traversal/dsl/graph/GraphTraversal.java| 8 +- .../gremlin/process/traversal/step/Barrier.java| 10 +- .../gremlin/process/traversal/step/Bypassing.java | 4 +- .../process/traversal/step/FromToModulating.java | 5 +- .../process/traversal/step/GraphComputing.java | 8 +- .../process/traversal/step/LambdaHolder.java | 7 +- .../process/traversal/step/MemoryComputing.java| 4 +- .../process/traversal/step/map/GroupStep.java | 4 +- .../process/traversal/step/util/WithOptions.java | 18 +- .../step/util/event/MutationListener.java | 8 +- .../strategy/decoration/EventStrategy.java | 2 +- .../traversal/util/FastNoSuchElementException.java | 4 +- .../process/traversal/util/TraversalMatrix.java| 4 +- .../apache/tinkerpop/gremlin/structure/Column.java | 3 +- .../apache/tinkerpop/gremlin/structure/Graph.java | 24 +- .../tinkerpop/gremlin/structure/Property.java | 2 +- .../gremlin/structure/VertexProperty.java | 2 +- .../gremlin/structure/io/GraphMigrator.java| 2 +- .../tinkerpop/gremlin/structure/io/IoCore.java | 6 +- .../structure/io/graphml/GraphMLWriter.java| 2 +- .../structure/io/graphson/GraphSONReader.java | 5 +- .../io/gryo/VertexByteArrayInputStream.java| 4 +- .../structure/io/gryo/kryoshim/InputShim.java | 5 +- .../structure/io/gryo/kryoshim/KryoShim.java | 5 +- .../structure/io/gryo/kryoshim/OutputShim.java | 5 +- .../structure/io/gryo/kryoshim/SerializerShim.java | 5 +- .../gremlin/structure/util/ElementHelper.java | 38 +-- .../gremlin/structure/util/GraphFactory.java | 17 +- .../gremlin/structure/util/StringFactory.java | 8 +- .../util/star/StarGraphGraphSONDeserializer.java | 8 +- .../gremlin/util/function/TriConsumer.java | 2 +- .../apache/tinkerpop/gremlin/driver/Client.java| 6 +- .../tinkerpop/gremlin/driver/Connection.java | 2 +- .../apache/tinkerpop/gremlin/driver/Settings.java | 2 +- .../driver/ser/AbstractMessageSerializer.java | 7 +- .../ser/GraphSONMessageSerializerGremlinV2d0.java | 3 +-
[tinkerpop] branch tp34 updated (75e3acc -> adebb32)
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 75e3acc Javadoc fixes add fd0ecd6 A body of commits to debug/fix a failing travis test add f4e1df5 Increase default max wait time for a connection with java driver add a75cfb6 Move SSL tests to their own test class add adebb32 Break up server/console test builds for travis No new revisions were added by this update. Summary of changes: .travis.yml| 10 +- .../gremlin-server-integration-secure.yaml | 1 + .../gremlin-server/gremlin-server-integration.yaml | 1 + .../tinkerpop/gremlin/driver/Connection.java | 2 +- .../gremlin/server/op/session/Session.java | 8 +- .../server/op/session/SessionOpProcessor.java | 1 - .../gremlin/server/GremlinServerIntegrateTest.java | 329 +--- .../server/GremlinServerSessionIntegrateTest.java | 46 +-- .../server/GremlinServerSslIntegrateTest.java | 340 + .../gremlin/server/gremlin-server-integration.yaml | 1 + 10 files changed, 399 insertions(+), 340 deletions(-) create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
[tinkerpop] branch master updated (be4defb -> 91a25a7)
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 be4defb Merge branch 'tp34' add fd0ecd6 A body of commits to debug/fix a failing travis test add f4e1df5 Increase default max wait time for a connection with java driver add a75cfb6 Move SSL tests to their own test class add adebb32 Break up server/console test builds for travis new 91a25a7 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: .travis.yml| 10 +- .../gremlin-server-integration-secure.yaml | 1 + .../gremlin-server/gremlin-server-integration.yaml | 1 + .../tinkerpop/gremlin/driver/Connection.java | 2 +- .../gremlin/server/op/session/Session.java | 8 +- .../server/op/session/SessionOpProcessor.java | 1 - .../gremlin/server/GremlinServerIntegrateTest.java | 246 ++- .../server/GremlinServerSessionIntegrateTest.java | 46 ++-- .../server/GremlinServerSslIntegrateTest.java | 266 + .../gremlin/server/gremlin-server-integration.yaml | 1 + 10 files changed, 325 insertions(+), 257 deletions(-) create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
[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 91a25a7c9db0379a855a276d770c8bbb69cd22da
Merge: be4defb adebb32
Author: stephen
AuthorDate: Mon Nov 25 16:11:14 2019 -0500
Merge branch 'tp34'
.travis.yml| 10 +-
.../gremlin-server-integration-secure.yaml | 1 +
.../gremlin-server/gremlin-server-integration.yaml | 1 +
.../tinkerpop/gremlin/driver/Connection.java | 2 +-
.../gremlin/server/op/session/Session.java | 8 +-
.../server/op/session/SessionOpProcessor.java | 1 -
.../gremlin/server/GremlinServerIntegrateTest.java | 246 ++-
.../server/GremlinServerSessionIntegrateTest.java | 46 ++--
.../server/GremlinServerSslIntegrateTest.java | 266 +
.../gremlin/server/gremlin-server-integration.yaml | 1 +
10 files changed, 325 insertions(+), 257 deletions(-)
diff --cc
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 9a97064,5448a26..cf511e0
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@@ -18,14 -18,8 +18,8 @@@
*/
package org.apache.tinkerpop.gremlin.server;
- import io.netty.handler.ssl.ClientAuth;
- import io.netty.handler.ssl.SslContext;
- import io.netty.handler.ssl.SslContextBuilder;
- import io.netty.handler.ssl.SslProvider;
- import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
- import io.netty.handler.ssl.util.SelfSignedCertificate;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
diff --cc
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
index 000,7a3d499..772dc33
mode 00,100644..100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
@@@ -1,0 -1,340 +1,266 @@@
+ /*
+ * 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;
+
+ import io.netty.handler.ssl.ClientAuth;
+ import io.netty.handler.ssl.SslContext;
+ import io.netty.handler.ssl.SslContextBuilder;
+ import io.netty.handler.ssl.SslProvider;
+ import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+ import io.netty.handler.ssl.util.SelfSignedCertificate;
+ import org.apache.commons.lang3.exception.ExceptionUtils;
+ import org.apache.tinkerpop.gremlin.driver.Client;
+ import org.apache.tinkerpop.gremlin.driver.Cluster;
+ import org.junit.Test;
+
+ import java.util.Arrays;
+ import java.util.Collections;
+ import java.util.concurrent.TimeoutException;
+
+ import static org.hamcrest.MatcherAssert.assertThat;
+ import static org.hamcrest.core.IsInstanceOf.instanceOf;
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.fail;
+
+ public class GremlinServerSslIntegrateTest extends
AbstractGremlinServerIntegrationTest {
-private static final String PEM_SERVER_KEY =
"src/test/resources/server.key.pk8";
-private static final String PEM_SERVER_CRT =
"src/test/resources/server.crt";
-private static final String PEM_CLIENT_KEY =
"src/test/resources/client.key.pk8";
-private static final String PEM_CLIENT_CRT =
"src/test/resources/client.crt";
+
+ /**
+ * Configure specific Gremlin Server settings for specific tests.
+ */
+ @Override
+ public Settings overrideSettings(final Settings settings) {
+ final String nameOfTest = name.getMethodName();
+ switch (nameOfTest) {
+ case "shouldEnableSsl":
+
[tinkerpop] branch travis-fix updated (d114e1c -> ee70c9a)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch travis-fix in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. discard d114e1c polish up discard d1d1e85 Revert all travis logging adjustments discard 384e88b Enable all tests discard ec0b26d enabled integration tests back since it won't fail anymore discard e09efaa stop running gremlin-server unit tests discard fbedae6 more logging adjustments discard 14eb3d6 Fixed logger disabling for netty (i think) discard 01460e5 still tweaking logging - hiding some netty stuff as the log exceeds allowable length and job dies in travis. discard 912f012 turn up logging and enable a couple test discard 885786d Clean builds with full loggingrevert back to WARN discard c569729 More logs discard aae0ed7 Isolate the single failing test - cmon discard 248df27 Run just the one test case that's causing trouble discard a76044c Kill travis_wait discard 23ce610 Break up server/console test builds for travis discard 46c15eb Move SSL tests to their own test class discard 98c78e7 Temporary better error for kerberos failures discard 63e219c Extend travis wait time for gremlin-server/console tests discard 97270c0 don't upgrade, images are fairly up-to-date, and it's slow discard 77a5f87 upgrade xenial - maybe something is just broken in the OS discard 15b88b8 Give reconnect some extra time on travis discard 10ce5ca Another timeout bump to solve travis. discard 106b896 Increase default max wait time for a connection with java driver discard 4dadccb A body of commits to debug/fix a failing travis test add 2d0fd64 Bump to Jackson databind 2.9.10.1 CTR add 20a5093 Merge branch 'tp33' into tp34 add 050f66a Pretty big javadoc cleanup. add c7461d7 Merge branch 'tp33' into tp34 add 75e3acc Javadoc fixes new dde3cbf A body of commits to debug/fix a failing travis test new 0da1cfa Increase default max wait time for a connection with java driver new 00c5d1a Move SSL tests to their own test class new ee70c9a Break up server/console test builds for travis 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 (d114e1c) \ N -- N -- N refs/heads/travis-fix (ee70c9a) 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 4 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: .../GephiTraversalVisualizationStrategy.groovy | 2 +- .../gremlin/process/computer/ComputerResult.java | 5 ++- .../gremlin/process/computer/GraphComputer.java| 51 -- .../gremlin/process/computer/MapReduce.java| 13 +++--- .../gremlin/process/computer/VertexProgram.java| 6 +-- .../computer/bulkloading/OneTimeBulkLoader.java| 8 ++-- .../computer/traversal/step/VertexComputing.java | 5 ++- .../computer/util/DefaultComputerResult.java | 6 ++- .../remote/traversal/AbstractRemoteTraversal.java | 4 +- .../process/remote/traversal/RemoteTraversal.java | 2 +- .../gremlin/process/traversal/Bindings.java| 5 +-- .../gremlin/process/traversal/Compare.java | 2 +- .../tinkerpop/gremlin/process/traversal/Step.java | 9 ++-- .../gremlin/process/traversal/Traversal.java | 17 .../process/traversal/TraversalSideEffects.java| 10 +++-- .../gremlin/process/traversal/TraversalSource.java | 24 +- .../traversal/dsl/graph/GraphTraversal.java| 8 ++-- .../gremlin/process/traversal/step/Barrier.java| 10 +++-- .../gremlin/process/traversal/step/Bypassing.java | 4 +- .../process/traversal/step/FromToModulating.java | 5 ++- .../process/traversal/step/GraphComputing.java | 8 ++-- .../process/traversal/step/LambdaHolder.java | 7 ++- .../process/traversal/step/MemoryComputing.java| 4 +- .../process/traversal/step/map/GroupStep.java | 4 +- .../process/traversal/step/util/WithOptions.java | 18 +--- .../step/util/event/MutationListener.java | 8 ++-- .../strategy/decoration/EventStrategy.java | 2 +- .../traversal/util/FastNoSuchElementException.java | 4 +- .../process/traversal/util/TraversalMatrix.java| 4 +- .../apache/tinkerpop/gremlin/structure/Column.java | 3 +-
[tinkerpop] 03/04: Move SSL tests to their own test class
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 00c5d1aafe527e4a65137164a1ad3a3a21fec7ed
Author: stephen
AuthorDate: Fri Nov 15 08:44:27 2019 -0500
Move SSL tests to their own test class
---
.../gremlin/server/GremlinServerIntegrateTest.java | 309 ---
.../server/GremlinServerSslIntegrateTest.java | 340 +
2 files changed, 340 insertions(+), 309 deletions(-)
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 0510328..cbb1f1f 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -18,12 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.server;
-import io.netty.handler.ssl.ClientAuth;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
-import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
-import io.netty.handler.ssl.util.SelfSignedCertificate;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -67,7 +61,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.lang.reflect.Field;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -104,10 +97,6 @@ import static org.junit.Assert.fail;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GremlinServerIntegrateTest extends
AbstractGremlinServerIntegrationTest {
-private static final String PEM_SERVER_KEY =
"src/test/resources/server.key.pk8";
-private static final String PEM_SERVER_CRT =
"src/test/resources/server.crt";
-private static final String PEM_CLIENT_KEY =
"src/test/resources/client.key.pk8";
-private static final String PEM_CLIENT_CRT =
"src/test/resources/client.crt";
private Level previousLogLevel;
private Log4jRecordingAppender recordingAppender = null;
@@ -179,103 +168,6 @@ public class GremlinServerIntegrateTest extends
AbstractGremlinServerIntegration
case "shouldBatchResultsByTwos":
settings.resultIterationBatchSize = 2;
break;
-case "shouldEnableSsl":
-case "shouldEnableSslButFailIfClientConnectsWithoutIt":
-settings.ssl = new Settings.SslSettings();
-settings.ssl.enabled = true;
-settings.ssl.keyStore = JKS_SERVER_KEY;
-settings.ssl.keyStorePassword = KEY_PASS;
-settings.ssl.keyStoreType = KEYSTORE_TYPE_JKS;
-break;
-case "shouldEnableSslWithSslContextProgrammaticallySpecified":
-settings.ssl = new Settings.SslSettings();
-settings.ssl.enabled = true;
-settings.ssl.overrideSslContext(createServerSslContext());
-break;
-case "shouldEnableSslAndClientCertificateAuthWithLegacyPem":
-settings.ssl = new Settings.SslSettings();
-settings.ssl.enabled = true;
-settings.ssl.needClientAuth = ClientAuth.REQUIRE;
-settings.ssl.keyCertChainFile = PEM_SERVER_CRT;
-settings.ssl.keyFile = PEM_SERVER_KEY;
-settings.ssl.keyPassword = KEY_PASS;
-// Trust the client
-settings.ssl.trustCertChainFile = PEM_CLIENT_CRT;
-break;
-case
"shouldEnableSslAndClientCertificateAuthAndFailWithoutCertWithLegacyPem":
-settings.ssl = new Settings.SslSettings();
-settings.ssl.enabled = true;
-settings.ssl.needClientAuth = ClientAuth.REQUIRE;
-settings.ssl.keyCertChainFile = PEM_SERVER_CRT;
-settings.ssl.keyFile = PEM_SERVER_KEY;
-settings.ssl.keyPassword = KEY_PASS;
-// Trust the client
-settings.ssl.trustCertChainFile = PEM_CLIENT_CRT;
-break;
-case
"shouldEnableSslAndClientCertificateAuthAndFailWithoutTrustedClientCertWithLegacyPem":
-settings.ssl = new Settings.SslSettings();
-settings.ssl.enabled = true;
-settings.ssl.needClientAuth = ClientAuth.REQUIRE;
-settings.ssl.keyCertChainFile = PEM_SERVER_CRT;
-settings.ssl.keyFile = PEM_SERVER_KEY;
-settings.ssl.keyPassword = KEY_PASS;
-// Trust ONLY the server cert
-
[tinkerpop] 02/04: Increase default max wait time for a connection with java driver
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 0da1cfac6322c6919eea4274177de3df63e244d4
Author: stephen
AuthorDate: Wed Nov 13 19:07:44 2019 -0500
Increase default max wait time for a connection with java driver
Cleaned up some dead log messages from debugging
---
.travis.yml| 4 +++-
.../tinkerpop/gremlin/driver/Connection.java | 2 +-
.../gremlin/server/auth/Krb5Authenticator.java | 2 +-
.../gremlin/server/GremlinServerIntegrateTest.java | 22 +++---
.../server/GremlinServerSessionIntegrateTest.java | 6 --
5 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c9bc45e..e5f8621 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,9 @@ jobs:
name: "python"
- script: "mvn clean install -q -DskipTests && mvn verify -pl
:gremlin-javascript"
name: "javascript"
-- script: "mvn clean install -q -DskipTests && mvn verify -pl
:gremlin-server,:gremlin-console -DskipIntegrationTests=false"
+- script:
+ - "mvn clean install -q -DskipTests"
+ - "travis_wait 60 mvn verify -pl :gremlin-server,:gremlin-console
-DskipIntegrationTests=false"
name: "gremlin server/console"
- script:
- "mvn clean install -q -DskipTests"
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 e700d49..aa0868f 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
@@ -61,7 +61,7 @@ final class Connection {
public static final int MAX_IN_PROCESS = 4;
public static final int MIN_IN_PROCESS = 1;
-public static final int MAX_WAIT_FOR_CONNECTION = 3000;
+public static final int MAX_WAIT_FOR_CONNECTION = 16000;
public static final int MAX_WAIT_FOR_SESSION_CLOSE = 3000;
public static final int MAX_CONTENT_LENGTH = 65536;
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
index 0cadc99..cd5cf65 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
@@ -114,7 +114,7 @@ public class Krb5Authenticator implements Authenticator {
// GSSAPI is the only available mechanism for this
authenticator
final Map props = new HashMap();
final String[] principalParts = principalName.split("/|@");
-if (principalParts.length < 3) throw new
IllegalArgumentException("Use principal name of format
'service/fqdn@kdcrealm'");
+if (principalParts.length < 3) throw new
IllegalArgumentException("Use principal name of format 'service/fqdn@kdcrealm'
- not this nonsense" + principalName);
saslServer = Sasl.createSaslServer(mechanism,
principalParts[0], principalParts[1], props, Krb5SaslAuthenticator.this);
} catch(Exception e) {
logger.error("Creating sasl server failed: ", e);
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 20980d2..0510328 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -1196,7 +1196,7 @@ public class GremlinServerIntegrateTest extends
AbstractGremlinServerIntegration
@Test
public void shouldFailOnDeadHost() throws Exception {
-final Cluster cluster = TestClientFactory.build().create();
+final Cluster cluster =
TestClientFactory.build().maxWaitForConnection(9).create();
final Client client = cluster.connect();
// ensure that connection to server is good
@@ -1220,13 +1220,21 @@ public class GremlinServerIntegrateTest extends
AbstractGremlinServerIntegration
// restart server
this.startServer();
-// the retry interval is 1 second, wait a bit longer
-TimeUnit.SECONDS.sleep(5);
-
-List results = client.submit("1+1").all().join();
-assertEquals(1, results.size());
-assertEquals(2, results.get(0).getInt());
+// try a bunch of times to reconnect. on slower systems this may
simply take longer...looking at you travis
+for
[tinkerpop] 01/04: A body of commits to debug/fix a failing travis test
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit dde3cbfc8e07dab279f689e951ea4c7cdea051ee
Author: stephen
AuthorDate: Mon Nov 11 08:23:31 2019 -0500
A body of commits to debug/fix a failing travis test
Prevent a null pointer when session kill futuer is not present CTR
Cleanup travis logs a bit by increasing compilation time.
Noticed the logs were filled with WARN messages about init scripts taking
longer than the default time of 5 seconds to compile. Must just be slower on
Travis as we don't see this elsewhere.
Make the first request in a synchronous fashion
test if waiting helps close connections
try-catch-finally to better handle Cluster.close() in tests
Remove sleep() from test to see if that makes a difference
Increase time willing to wait for a connection
---
.../gremlin-server-integration-secure.yaml | 1 +
.../gremlin-server/gremlin-server-integration.yaml | 1 +
.../gremlin/server/op/session/Session.java | 8 +++-
.../server/op/session/SessionOpProcessor.java | 1 -
.../server/GremlinServerSessionIntegrateTest.java | 50 ++
.../gremlin/server/gremlin-server-integration.yaml | 1 +
6 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/docker/gremlin-server/gremlin-server-integration-secure.yaml
b/docker/gremlin-server/gremlin-server-integration-secure.yaml
index 2274852..c489e07 100644
--- a/docker/gremlin-server/gremlin-server-integration-secure.yaml
+++ b/docker/gremlin-server/gremlin-server-integration-secure.yaml
@@ -29,6 +29,7 @@ scriptEngines: {
gremlin-groovy: {
plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin:
{expectedCompilationTime: 3},
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/generate-all.groovy]}}},
gremlin-jython: {},
diff --git a/docker/gremlin-server/gremlin-server-integration.yaml
b/docker/gremlin-server/gremlin-server-integration.yaml
index 4ccaf32..7c5445a 100644
--- a/docker/gremlin-server/gremlin-server-integration.yaml
+++ b/docker/gremlin-server/gremlin-server-integration.yaml
@@ -29,6 +29,7 @@ scriptEngines: {
gremlin-groovy: {
plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+
org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin:
{expectedCompilationTime: 3},
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files: [scripts/generate-all.groovy]}}},
gremlin-jython: {},
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
index f41a0fb..7191d04 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
@@ -34,6 +34,7 @@ import javax.script.Bindings;
import javax.script.SimpleBindings;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -155,7 +156,12 @@ public class Session {
* session kill will mean.
*/
public void manualKill(final boolean force) {
-kill.get().cancel(true);
+// seems there is a situation where kill can get nulled. seems to only
happen in travis as a result of test
+// runs and i'm guessing it has something to do with a combination of
shutdown and session close though i'm
+// not sure why. perhaps this "fix" just masks up a deeper problem but
as i reason on it now, it seems mostly
+// bound to shutdown situations which basically means the forced end
of the session anyway, so perhaps the
+// root cause isn't something that needs immediate chasing (at least
until it can be shown otherwise anyway)
+Optional.ofNullable(kill.get()).ifPresent(f -> f.cancel(true));
kill(force);
}
diff --git
[tinkerpop] 04/04: Break up server/console test builds for travis
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit ee70c9a1854e29b83889fae982b0196353ae640a
Author: stephen
AuthorDate: Fri Nov 15 10:46:36 2019 -0500
Break up server/console test builds for travis
---
.travis.yml | 8 ++--
.../apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java | 2 +-
.../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 2 +-
.../gremlin/server/GremlinServerSessionIntegrateTest.java | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e5f8621..89a230f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,8 +41,12 @@ jobs:
name: "javascript"
- script:
- "mvn clean install -q -DskipTests"
- - "travis_wait 60 mvn verify -pl :gremlin-server,:gremlin-console
-DskipIntegrationTests=false"
- name: "gremlin server/console"
+ - "mvn verify -pl :gremlin-server -DskipTests
-DskipIntegrationTests=false"
+ name: "gremlin server"
+- script:
+- "mvn clean install -q -DskipTests"
+- "mvn verify -pl :gremlin-console -DskipIntegrationTests=false"
+ name: "gremlin console"
- script:
- "mvn clean install -q -DskipTests"
- "travis_wait 60 mvn verify -pl :spark-gremlin
-DskipIntegrationTests=false"
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
index cd5cf65..0cadc99 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
@@ -114,7 +114,7 @@ public class Krb5Authenticator implements Authenticator {
// GSSAPI is the only available mechanism for this
authenticator
final Map props = new HashMap();
final String[] principalParts = principalName.split("/|@");
-if (principalParts.length < 3) throw new
IllegalArgumentException("Use principal name of format 'service/fqdn@kdcrealm'
- not this nonsense" + principalName);
+if (principalParts.length < 3) throw new
IllegalArgumentException("Use principal name of format
'service/fqdn@kdcrealm'");
saslServer = Sasl.createSaslServer(mechanism,
principalParts[0], principalParts[1], props, Krb5SaslAuthenticator.this);
} catch(Exception e) {
logger.error("Creating sasl server failed: ", e);
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index cbb1f1f..5448a26 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -887,7 +887,7 @@ public class GremlinServerIntegrateTest extends
AbstractGremlinServerIntegration
@Test
public void shouldFailOnDeadHost() throws Exception {
-final Cluster cluster =
TestClientFactory.build().maxWaitForConnection(9).create();
+final Cluster cluster = TestClientFactory.build().create();
final Client client = cluster.connect();
// ensure that connection to server is good
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 9a3e4ff..de13d99 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
@@ -327,7 +327,7 @@ public class GremlinServerSessionIntegrateTest extends
AbstractGremlinServerInt
@Test
public void shouldEnsureSessionBindingsAreThreadSafe() throws Exception {
-final Cluster cluster =
TestClientFactory.build().maxWaitForConnection(9).
+final Cluster cluster = TestClientFactory.build().
minInProcessPerConnection(16).maxInProcessPerConnection(64).create();
final Client client = cluster.connect(name.getMethodName());
[tinkerpop] branch travis-fix updated: polish up
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/travis-fix by this push:
new d114e1c polish up
d114e1c is described below
commit d114e1c15a0ccd3853a93b37494d77ac48989a3d
Author: stephen
AuthorDate: Mon Nov 25 12:28:50 2019 -0500
polish up
---
.travis.yml | 2 +-
.../org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java | 2 +-
.../tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8208c7d..89a230f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ jobs:
name: "gremlin server"
- script:
- "mvn clean install -q -DskipTests"
-- "travis_wait 60 mvn verify -pl :gremlin-console
-DskipIntegrationTests=false"
+- "mvn verify -pl :gremlin-console -DskipIntegrationTests=false"
name: "gremlin console"
- script:
- "mvn clean install -q -DskipTests"
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
index cd5cf65..0cadc99 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
@@ -114,7 +114,7 @@ public class Krb5Authenticator implements Authenticator {
// GSSAPI is the only available mechanism for this
authenticator
final Map props = new HashMap();
final String[] principalParts = principalName.split("/|@");
-if (principalParts.length < 3) throw new
IllegalArgumentException("Use principal name of format 'service/fqdn@kdcrealm'
- not this nonsense" + principalName);
+if (principalParts.length < 3) throw new
IllegalArgumentException("Use principal name of format
'service/fqdn@kdcrealm'");
saslServer = Sasl.createSaslServer(mechanism,
principalParts[0], principalParts[1], props, Krb5SaslAuthenticator.this);
} catch(Exception e) {
logger.error("Creating sasl server failed: ", e);
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 9a3e4ff..de13d99 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
@@ -327,7 +327,7 @@ public class GremlinServerSessionIntegrateTest extends
AbstractGremlinServerInt
@Test
public void shouldEnsureSessionBindingsAreThreadSafe() throws Exception {
-final Cluster cluster =
TestClientFactory.build().maxWaitForConnection(9).
+final Cluster cluster = TestClientFactory.build().
minInProcessPerConnection(16).maxInProcessPerConnection(64).create();
final Client client = cluster.connect(name.getMethodName());
[tinkerpop] branch travis-fix updated: Revert all travis logging adjustments
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch travis-fix in repository https://gitbox.apache.org/repos/asf/tinkerpop.git The following commit(s) were added to refs/heads/travis-fix by this push: new d1d1e85 Revert all travis logging adjustments d1d1e85 is described below commit d1d1e856fa7e8e8164f464eeeacea55503b1b408 Author: stephen AuthorDate: Mon Nov 25 10:52:50 2019 -0500 Revert all travis logging adjustments --- gremlin-server/src/test/resources/log4j-test.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gremlin-server/src/test/resources/log4j-test.properties b/gremlin-server/src/test/resources/log4j-test.properties index 00b9b58..a9aeddd 100644 --- a/gremlin-server/src/test/resources/log4j-test.properties +++ b/gremlin-server/src/test/resources/log4j-test.properties @@ -15,10 +15,10 @@ # specific language governing permissions and limitations # under the License. -log4j.rootLogger=INFO, stdout +log4j.rootLogger=WARN, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n -log4j.logger.org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor=DEBUG -log4j.logger.audit.org.apache.tinkerpop.gremlin.server=DEBUG +log4j.logger.org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor=ERROR +log4j.logger.audit.org.apache.tinkerpop.gremlin.server=INFO
[tinkerpop] branch travis-fix updated: Enable all tests
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/travis-fix by this push:
new 384e88b Enable all tests
384e88b is described below
commit 384e88b32c8042540af32584b6ba1c8eaf7905f7
Author: stephen
AuthorDate: Mon Nov 25 10:12:34 2019 -0500
Enable all tests
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4576562..cb9a7b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -483,7 +483,7 @@ limitations under the License.
-
**/GremlinServerIntegrateTest.java
+**/*IntegrateTest.java
${skipIntegrationTests}
-Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost
-Dport=8182 -Dbuild.dir=${project.build.directory} -Dis.testing=true
-Djava.net.preferIPv4Stack=true
[tinkerpop] branch travis-fix updated: enabled integration tests back since it won't fail anymore
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/travis-fix by this push:
new ec0b26d enabled integration tests back since it won't fail anymore
ec0b26d is described below
commit ec0b26de3c6766fb1585fc537d5ca348624b42f9
Author: stephen
AuthorDate: Mon Nov 25 09:50:57 2019 -0500
enabled integration tests back since it won't fail anymore
still no idea why it's passing as no changes i've made can be attributed to
the fix
---
.../gremlin/server/GremlinServerIntegrateTest.java | 1738 ++--
1 file changed, 869 insertions(+), 869 deletions(-)
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index da8dd38..5448a26 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -236,621 +236,621 @@ public class GremlinServerIntegrateTest extends
AbstractGremlinServerIntegration
return scriptEngineConf;
}
-//@Test
-//public void shouldScriptEvaluationErrorForRemoteTraversal() throws
Exception {
-//final GraphTraversalSource g = traversal().withRemote(conf);
-//
-//try {
-//// tests bad lambda
-//g.inject(1).sideEffect(Lambda.consumer("(")).iterate();
-//fail("This traversal should not have executed since lambda can't
be compiled");
-//} catch (Exception ex) {
-//final Throwable t = ex.getCause();
-//assertThat(t, instanceOf(ResponseException.class));
-//assertEquals(ResponseStatusCode.SERVER_ERROR_SCRIPT_EVALUATION,
((ResponseException) t).getResponseStatusCode());
-//}
-//
-//// make a graph with a cycle in it to force a long run traversal
-//
graphGetter.get().traversal().addV("person").as("p").addE("self").to("p").iterate();
-//
-//try {
-//// tests an "unending" traversal
-//g.V().repeat(__.out()).until(__.outE().count().is(0)).iterate();
-//fail("This traversal should have timed out");
-//} catch (Exception ex) {
-//final Throwable t = ex.getCause();
-//assertThat(t, instanceOf(ResponseException.class));
-//assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT,
((ResponseException) t).getResponseStatusCode());
-//}
-//}
-//
-//@Test
-//public void shouldCloseChannelIfClientDoesntRespond() throws Exception {
-//final SimpleClient client =
TestClientFactory.createWebSocketClient();
-//client.submit("1+1");
-//
-//// since we do nothing for 2 seconds and the time limit for timeout
on the server is 1 second, the server
-//// will autoclose the channel
-//Thread.sleep(2000);
-//
-//assertThat(recordingAppender.logContainsAny(".*Closing channel -
client is disconnected after idle period of .*$"), is(true));
-//
-//client.close();
-//}
-//
-//@Test
-//public void shouldPingChannelIfClientDies() throws Exception {
-//final Client client =
TestClientFactory.build().maxConnectionPoolSize(1).minConnectionPoolSize(1).keepAliveInterval(0).create().connect();
-//client.submit("1+1").all().get();
-//
-//// since we do nothing for 3 seconds and the time limit for ping is
1 second we should get *about* 3 pings -
-//// i don't think the assertion needs to be too accurate. just need
to make sure there's a ping message out
-//// there record
-//Thread.sleep(3000);
-//
-//client.close();
-//
-//// stop the server to be sure that logs flush
-//stopServer();
-//
-//assertThat(recordingAppender.logContainsAny(".*Checking channel -
sending ping to client after idle period of .*$"), is(true));
-//}
-//
-//@Test
-//public void shouldTimeOutRemoteTraversal() throws Exception {
-//final GraphTraversalSource g = traversal().withRemote(conf);
-//
-//try {
-//// tests sleeping thread
-//
g.inject(1).sideEffect(Lambda.consumer("Thread.sleep(1)")).iterate();
-//fail("This traversal should have timed out");
-//} catch (Exception ex) {
-//final Throwable t = ex.getCause();
-//assertThat(t, instanceOf(ResponseException.class));
-//assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT,
((ResponseException) t).getResponseStatusCode());
-//}
-//
-//// make a graph with a cycle in it to force a long run traversal
-//
[tinkerpop] branch travis-fix updated: stop running gremlin-server unit tests
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch travis-fix in repository https://gitbox.apache.org/repos/asf/tinkerpop.git The following commit(s) were added to refs/heads/travis-fix by this push: new e09efaa stop running gremlin-server unit tests e09efaa is described below commit e09efaae71f2e46326ca3ea4fac19e506ee3d4b0 Author: stephen AuthorDate: Mon Nov 25 09:38:51 2019 -0500 stop running gremlin-server unit tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ad5347..8208c7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ jobs: name: "javascript" - script: - "mvn clean install -q -DskipTests" - - "mvn verify -pl :gremlin-server -DskipIntegrationTests=false" + - "mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false" name: "gremlin server" - script: - "mvn clean install -q -DskipTests"
[tinkerpop] branch travis-fix updated: more logging adjustments
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch travis-fix in repository https://gitbox.apache.org/repos/asf/tinkerpop.git The following commit(s) were added to refs/heads/travis-fix by this push: new fbedae6 more logging adjustments fbedae6 is described below commit fbedae633fe571203d7ef4664ab8b95bfe30f9df Author: stephen AuthorDate: Mon Nov 25 09:16:13 2019 -0500 more logging adjustments --- gremlin-server/src/test/resources/log4j-test.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gremlin-server/src/test/resources/log4j-test.properties b/gremlin-server/src/test/resources/log4j-test.properties index bf3367b..00b9b58 100644 --- a/gremlin-server/src/test/resources/log4j-test.properties +++ b/gremlin-server/src/test/resources/log4j-test.properties @@ -15,11 +15,10 @@ # specific language governing permissions and limitations # under the License. -log4j.rootLogger=DEBUG, stdout +log4j.rootLogger=INFO, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n -log4j.logger.io.netty.util.internal.logging.AbstractInternalLogger=INFO log4j.logger.org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor=DEBUG log4j.logger.audit.org.apache.tinkerpop.gremlin.server=DEBUG
[tinkerpop] branch travis-fix updated: Fixed logger disabling for netty (i think)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch travis-fix in repository https://gitbox.apache.org/repos/asf/tinkerpop.git The following commit(s) were added to refs/heads/travis-fix by this push: new 14eb3d6 Fixed logger disabling for netty (i think) 14eb3d6 is described below commit 14eb3d60fcdef1a1188dcf9c58c86d743853451d Author: stephen AuthorDate: Mon Nov 25 08:54:37 2019 -0500 Fixed logger disabling for netty (i think) --- gremlin-server/src/test/resources/log4j-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gremlin-server/src/test/resources/log4j-test.properties b/gremlin-server/src/test/resources/log4j-test.properties index ee1ceed..bf3367b 100644 --- a/gremlin-server/src/test/resources/log4j-test.properties +++ b/gremlin-server/src/test/resources/log4j-test.properties @@ -20,6 +20,6 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n -io.netty.util.internal.logging.AbstractInternalLogger=INFO +log4j.logger.io.netty.util.internal.logging.AbstractInternalLogger=INFO log4j.logger.org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor=DEBUG log4j.logger.audit.org.apache.tinkerpop.gremlin.server=DEBUG
[tinkerpop] branch travis-fix updated: still tweaking logging - hiding some netty stuff as the log exceeds allowable length and job dies in travis.
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch travis-fix in repository https://gitbox.apache.org/repos/asf/tinkerpop.git The following commit(s) were added to refs/heads/travis-fix by this push: new 01460e5 still tweaking logging - hiding some netty stuff as the log exceeds allowable length and job dies in travis. 01460e5 is described below commit 01460e5780509558e7ce1ddfec21641279a91aa7 Author: stephen AuthorDate: Mon Nov 25 08:38:20 2019 -0500 still tweaking logging - hiding some netty stuff as the log exceeds allowable length and job dies in travis. --- gremlin-server/src/test/resources/log4j-test.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gremlin-server/src/test/resources/log4j-test.properties b/gremlin-server/src/test/resources/log4j-test.properties index b76eae7..ee1ceed 100644 --- a/gremlin-server/src/test/resources/log4j-test.properties +++ b/gremlin-server/src/test/resources/log4j-test.properties @@ -20,5 +20,6 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n +io.netty.util.internal.logging.AbstractInternalLogger=INFO log4j.logger.org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor=DEBUG log4j.logger.audit.org.apache.tinkerpop.gremlin.server=DEBUG
[GitHub] [tinkerpop] spmallette commented on issue #1222: TINKERPOP-2313 Support g.E().properties().hasKey('xx') & hasValue('xx')
spmallette commented on issue #1222: TINKERPOP-2313 Support
g.E().properties().hasKey('xx') & hasValue('xx')
URL: https://github.com/apache/tinkerpop/pull/1222#issuecomment-558156457
we're still having issues with Travis, but I thought I'd give some basic
feedback on this pull request you've submitted. first note that we already have
a JIRA issue for this here:
https://issues.apache.org/jira/browse/TINKERPOP-1733
We should probably close yours as a "duplicate" and re-reference this PR to
that issue.
As an administrative note, if this capability can be safely targetted at the
`tp34` branch without breaking changes I think that would be a nice feature to
have along our current 3.4.x release line (if it stays on `master` it won't be
available for a while.
@dkuppitz I assume you like where this PR is going. if we make `hasKey()`
behave uniformly for `Element` and `Property` where does that leave
{{has(String)}}:
```text
gremlin> g.V(1).properties().has('name')
gremlin> g.V(1).properties().hasKey('name')
==>vp[name->marko]
```
Should it be deprecated in favor of `hasKey()` or Is there a reason to keep
that signature?
@javeme your PR was focused on edges and i'm not sure what's involved in
making sure this change makes these steps wholly consistent, but to make this
feature "complete" I think that it needs to go an extra step to ensure that
metaproperties also work:
```text
gremlin>
g.V().properties().hasKey('location').properties().hasKey('startTime')
org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty cannot be
cast to org.apache.tinkerpop.gremlin.structure.Element
Type ':help' or ':h' for help.
Display stack trace? [yN]n
```
Also, I'm sorry, but I don't completely follow the issue you described with:
```text
ElementHelper.areEqual(final Property a, final Object b)
```
Could you please clarify what's wrong? If there are issues with olap we will
need to sort those out before this can be merged. Thanks.
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] branch travis-fix updated: turn up logging and enable a couple test
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/travis-fix by this push:
new 912f012 turn up logging and enable a couple test
912f012 is described below
commit 912f0121a4919b1394500ca0de5f9b10b0df6aa8
Author: stephen
AuthorDate: Mon Nov 25 06:59:11 2019 -0500
turn up logging and enable a couple test
---
.../gremlin/server/GremlinServerIntegrateTest.java | 90 +++---
.../src/test/resources/log4j-test.properties | 6 +-
2 files changed, 48 insertions(+), 48 deletions(-)
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 8126151..da8dd38 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -851,43 +851,43 @@ public class GremlinServerIntegrateTest extends
AbstractGremlinServerIntegration
//}
//}
//
-//@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-//@Test
-//public void shouldBlockRequestWhenTooBig() throws Exception {
-//final Cluster cluster = TestClientFactory.open();
-//final Client client = cluster.connect();
-//
-//try {
-//final String fatty = IntStream.range(0,
1024).mapToObj(String::valueOf).collect(Collectors.joining());
-//final CompletableFuture result =
client.submitAsync("'" + fatty + "';'test'");
-//final ResultSet resultSet = result.get(1,
TimeUnit.MILLISECONDS);
-//resultSet.all().get(1, TimeUnit.MILLISECONDS);
-//fail("Should throw an exception.");
-//} catch (TimeoutException te) {
-//// the request should not have timed-out - the connection should
have been reset, but it seems that
-//// timeout seems to occur as well on some systems (it's not
clear why). however, the nature of this
-//// test is to ensure that the script isn't processed if it
exceeds a certain size, so in this sense
-//// it seems ok to pass in this case.
-//} catch (Exception re) {
-//final Throwable root = ExceptionUtils.getRootCause(re);
-//// Netty closes the channel to the server on a non-recoverable
error such as CorruptedFrameException
-//// and the connection is subsequently destroyed. Each of the
pending requests are given an error with
-//// the following error message.
-////
-//// went with two possible error messages here as i think that
there is some either non-deterministic
-//// behavior around the error message or it's environmentally
dependent (e.g. different jdk, versions, etc)
-//assertThat(root.getMessage(), Matchers.anyOf(is("Connection to
server is no longer active"), is("Connection reset by peer")));
-//
-//// validate that we can still send messages to the server
-//assertEquals(2,
client.submit("1+1").all().join().get(0).getInt());
-//} finally {
-//cluster.close();
-//}
-//}
+@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+@Test
+public void shouldBlockRequestWhenTooBig() throws Exception {
+final Cluster cluster = TestClientFactory.open();
+final Client client = cluster.connect();
+
+try {
+final String fatty = IntStream.range(0,
1024).mapToObj(String::valueOf).collect(Collectors.joining());
+final CompletableFuture result = client.submitAsync("'"
+ fatty + "';'test'");
+final ResultSet resultSet = result.get(1,
TimeUnit.MILLISECONDS);
+resultSet.all().get(1, TimeUnit.MILLISECONDS);
+fail("Should throw an exception.");
+} catch (TimeoutException te) {
+// the request should not have timed-out - the connection should
have been reset, but it seems that
+// timeout seems to occur as well on some systems (it's not clear
why). however, the nature of this
+// test is to ensure that the script isn't processed if it exceeds
a certain size, so in this sense
+// it seems ok to pass in this case.
+} catch (Exception re) {
+final Throwable root = ExceptionUtils.getRootCause(re);
+// Netty closes the channel to the server on a non-recoverable
error such as CorruptedFrameException
+// and the connection is subsequently destroyed. Each of the
pending requests are given an error with
+// the following error message.
+//
+// went with two possible error messages
