[tinkerpop] branch master updated (22eaae7 -> bb43b91)
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 22eaae7 Merge branch 'tp33'
new 91a9051 Updated NOTICE copyright date CTR
new 56687a1 Add LICENSE and NOTICE for javascript
new bb43b91 Merge branch 'tp33'
The 14925 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:
NOTICE | 2 +-
gremlin-console/src/main/static/NOTICE | 2 +-
.../src/main/javascript/gremlin-javascript}/LICENSE | 0
gremlin-javascript/src/main/javascript/gremlin-javascript/NOTICE | 5 +
gremlin-python/src/main/jython/NOTICE| 2 +-
gremlin-server/src/main/static/NOTICE| 2 +-
6 files changed, 9 insertions(+), 4 deletions(-)
copy {gremlin-python/src/main/jython =>
gremlin-javascript/src/main/javascript/gremlin-javascript}/LICENSE (100%)
create mode 100644
gremlin-javascript/src/main/javascript/gremlin-javascript/NOTICE
[tinkerpop] branch tp33 updated (a30ff44 -> 56687a1)
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 a30ff44 Bump to kerby 1.0.0 CTR
add 91a9051 Updated NOTICE copyright date CTR
add 56687a1 Add LICENSE and NOTICE for javascript
No new revisions were added by this update.
Summary of changes:
NOTICE | 2 +-
gremlin-console/src/main/static/NOTICE | 2 +-
.../src/main/javascript/gremlin-javascript}/LICENSE | 0
gremlin-javascript/src/main/javascript/gremlin-javascript/NOTICE | 5 +
gremlin-python/src/main/jython/NOTICE| 2 +-
gremlin-server/src/main/static/NOTICE| 2 +-
6 files changed, 9 insertions(+), 4 deletions(-)
copy {gremlin-python/src/main/jython =>
gremlin-javascript/src/main/javascript/gremlin-javascript}/LICENSE (100%)
create mode 100644
gremlin-javascript/src/main/javascript/gremlin-javascript/NOTICE
[tinkerpop] branch tp33 updated (507182c -> a30ff44)
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 507182c Changed assertion logic in pageRank() feature test add a30ff44 Bump to kerby 1.0.0 CTR No new revisions were added by this update. Summary of changes: NOTICE| 4 ++-- gremlin-server/pom.xml| 2 +- .../apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java | 15 +-- gremlin-test/pom.xml | 2 +- hadoop-gremlin/pom.xml| 9 + 5 files changed, 22 insertions(+), 10 deletions(-)
[tinkerpop] branch master updated: Bump to kerby 1.0.0 CTR
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
The following commit(s) were added to refs/heads/master by this push:
new a30ff44 Bump to kerby 1.0.0 CTR
new 22eaae7 Merge branch 'tp33'
a30ff44 is described below
commit a30ff44128157ac8620f3bdb51eb3ed27e62b600
Author: Stephen Mallette
AuthorDate: Mon Feb 11 14:48:15 2019 -0500
Bump to kerby 1.0.0 CTR
---
NOTICE| 4 ++--
gremlin-server/pom.xml| 2 +-
.../apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java | 15 +--
gremlin-test/pom.xml | 2 +-
hadoop-gremlin/pom.xml| 9 +
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/NOTICE b/NOTICE
index 738fb3f..f915549 100644
--- a/NOTICE
+++ b/NOTICE
@@ -18,8 +18,8 @@
https://github.com/Activiti/Activiti/tree/activiti-5.16/modules/activiti-bpmn-co
Apache Kerby
Apache Kerby
-Copyright 2015-2016 The Apache Software Foundation
+Copyright 2015-2017 The Apache Software Foundation
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
from
-https://github.com/apache/directory-kerby/blob/kerby-all-1.0.0-RC2/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
+https://github.com/apache/directory-kerby/blob/kerby-all-1.0.0/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 125b64b..1c0aa88 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -103,7 +103,7 @@ limitations under the License.
org.apache.kerby
kerb-simplekdc
-1.0.0-RC2
+1.0.0
test
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
index ecc4599..48c4546 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
@@ -6,16 +6,16 @@
* 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.auth;
@@ -51,7 +51,8 @@ public final class JaasKrbUtil {
private JaasKrbUtil() { }
-public static Subject loginUsingPassword(String principal, String
password) throws LoginException {
+public static Subject loginUsingPassword(
+String principal, String password) throws LoginException {
Set principals = new HashSet();
principals.add(new KerberosPrincipal(principal));
@@ -66,7 +67,8 @@ public final class JaasKrbUtil {
return loginContext.getSubject();
}
-public static Subject loginUsingTicketCache(String principal, File
cacheFile) throws LoginException {
+public static Subject loginUsingTicketCache(
+String principal, File cacheFile) throws LoginException {
Set principals = new HashSet();
principals.add(new KerberosPrincipal(principal));
@@ -80,7 +82,8 @@ public final class JaasKrbUtil {
return loginContext.getSubject();
}
-public static Subject loginUsingKeytab(String principal, File keytabFile)
throws LoginException {
+public static Subject loginUsingKeytab(
+String principal, File keytabFile) throws LoginException {
Set principals = new HashSet();
principals.add(new KerberosPrincipal(principal));
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 8b55d37..c953776 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -34,7 +34,7 @@ limitations under the License.
commons-io
commons-io
-2.4
+2.5
junit
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 4352ade..b8b2929 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -76,6 +76,10 @@ limitations under the License.
commons-logging
[tinkerpop] branch TINKERPOP-1435 updated (3c8fe40 -> 38e64db)
This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch TINKERPOP-1435 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git. from 3c8fe40 TINKERPOP-1435 Added Char support to graphson and python new aa766ef TINKERPOP-1435 added Duration for graphson in python new 38e64db TINKERPOP-1435 Add char serialization for GraphSON 3.0 in python The 14012 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_python/structure/io/graphsonV2d0.py| 16 +++ .../gremlin_python/structure/io/graphsonV3d0.py| 32 +- gremlin-python/src/main/jython/setup.py| 3 +- .../jython/tests/structure/io/test_graphsonV2d0.py | 11 .../jython/tests/structure/io/test_graphsonV3d0.py | 22 +++ 5 files changed, 82 insertions(+), 2 deletions(-)
[GitHub] FlorianHockmann commented on issue #1057: Changed loop break check to break out of the connection creation loop
FlorianHockmann commented on issue #1057: Changed loop break check to break out of the connection creation loop URL: https://github.com/apache/tinkerpop/pull/1057#issuecomment-462410371 Thanks for this contribution. I also noticed problems with the way the connection pool now handles resizing and closing of broken connections ([TINKERPOP-2135](https://issues.apache.org/jira/browse/TINKERPOP-2135)) which are probably related. Improving this situation will most likely require a bigger change, but since you have described a concrete problem in TINKERPOP-2155 and because your change is really minimal, I think that it makes sense to merge this to have your problem fixed. We can still improve the other aspects later. So: VOTE +1. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] spmallette commented on issue #1057: Changed loop break check to break out of the connection creation loop
spmallette commented on issue #1057: Changed loop break check to break out of the connection creation loop URL: https://github.com/apache/tinkerpop/pull/1057#issuecomment-462399865 thanks for submitting this - in principle your change makes sense to me so VOTE +1 but i'll let @FlorianHockmann provide his thoughts since he probably knows the most about this. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] dkuppitz commented on issue #1058: TINKERPOP-2154 GraphBinary: Release working buffers on failure
dkuppitz commented on issue #1058: TINKERPOP-2154 GraphBinary: Release working buffers on failure URL: https://github.com/apache/tinkerpop/pull/1058#issuecomment-462397190 VOTE +1 This is an automated message from the Apache Git Service. To respond to the message, please log on 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
svn commit: r1853383 - /tinkerpop/site/index.html
Author: spmallette Date: Mon Feb 11 15:26:45 2019 New Revision: 1853383 URL: http://svn.apache.org/viewvc?rev=1853383&view=rev Log: Deploy TinkerPop homepage Modified: tinkerpop/site/index.html Modified: tinkerpop/site/index.html URL: http://svn.apache.org/viewvc/tinkerpop/site/index.html?rev=1853383&r1=1853382&r2=1853383&view=diff == --- tinkerpop/site/index.html (original) +++ tinkerpop/site/index.html Mon Feb 11 15:26:45 2019 @@ -170,9 +170,9 @@ limitations under the License. TinkerPop 3.4.0 (Released: 2-Jan-2019) Downloads - https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.4/apache-tinkerpop-gremlin-console-3.4.0-bin.zip"; class="btn btn-primary">Gremlin Console - https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.4/apache-tinkerpop-gremlin-server-3.4.0-bin.zip"; class="btn btn-primary">Gremlin Server - https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.4/apache-tinkerpop-3.4.0-src.zip"; class="btn btn-primary">Source + https://www.apache.org/dyn/closer.lua/tinkerpop/3.4.0/apache-tinkerpop-gremlin-console-3.4.0-bin.zip"; class="btn btn-primary">Gremlin Console + https://www.apache.org/dyn/closer.lua/tinkerpop/3.4.0/apache-tinkerpop-gremlin-server-3.4.0-bin.zip"; class="btn btn-primary">Gremlin Server + https://www.apache.org/dyn/closer.lua/tinkerpop/3.4.0/apache-tinkerpop-3.4.0-src.zip"; class="btn btn-primary">Source @@ -442,7 +442,7 @@ limitations under the License. development, testing, documentation, etc. skills to the group. These individuals contribute to TinkerPop beyond the ever-changing requirements of their day-to-day jobs and maintain responsibility for their contributions through time. - + http://markorodriguez.com";>Marko A. Rodriguez (2009 - PMC): Gremlin language, Gremlin machine, documentation. http://ketrinadrawsalot.tumblr.com";>Ketrina Yim (2009 - Committer): Illustrator, creator of Gremlin and his merry band of robots. @@ -460,7 +460,7 @@ limitations under the License. http://www.michaelpollmeier.com/";>Michael Pollmeier (2016 - Committer): Gremlin language, Gremlin-Scala. https://github.com/davebshow";>David Brown (2016 - Committer): Python libraries, Gremlin Server testing. https://github.com/robertdale";>Robert Dale (2016 - PMC): Gremlin Console/Server, documentation, mailing list support. -https://github.com/jorgebay";>Jorge Bay (2017 - PMC): JavaScript and .NET libraries, mailing list support. +https://github.com/jorgebay";>Jorge Bay (2017 - PMC): GraphBinary serialization, JavaScript and .NET libraries, mailing list support. https://github.com/FlorianHockmann/";>Florian Hockmann (2017 - PMC): .NET libraries, mailing list support. http://www.kelvinlawrence.net/";>Kelvin Lawrence (2017 - Committer): Documentation and mailing list support. http://harshthakkar.in/";>Harsh Thakkar (2018 - Committer): Gremlin-SPARQL module.
[tinkerpop] branch master updated: Fixed bad download links on home page - grrrr CTR
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 The following commit(s) were added to refs/heads/master by this push: new a8becb8 Fixed bad download links on home page - g CTR a8becb8 is described below commit a8becb8f79e04e4533d4611fd5ee7934ca6e8bc9 Author: Stephen Mallette AuthorDate: Mon Feb 11 10:25:24 2019 -0500 Fixed bad download links on home page - g CTR --- docs/site/home/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/site/home/index.html b/docs/site/home/index.html index 28b5989..c097864 100644 --- a/docs/site/home/index.html +++ b/docs/site/home/index.html @@ -29,9 +29,9 @@ limitations under the License. TinkerPop 3.4.0 (Released: 2-Jan-2019) Downloads - https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.4/apache-tinkerpop-gremlin-console-3.4.0-bin.zip"; class="btn btn-primary">Gremlin Console - https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.4/apache-tinkerpop-gremlin-server-3.4.0-bin.zip"; class="btn btn-primary">Gremlin Server - https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.4/apache-tinkerpop-3.4.0-src.zip"; class="btn btn-primary">Source + https://www.apache.org/dyn/closer.lua/tinkerpop/3.4.0/apache-tinkerpop-gremlin-console-3.4.0-bin.zip"; class="btn btn-primary">Gremlin Console + https://www.apache.org/dyn/closer.lua/tinkerpop/3.4.0/apache-tinkerpop-gremlin-server-3.4.0-bin.zip"; class="btn btn-primary">Gremlin Server + https://www.apache.org/dyn/closer.lua/tinkerpop/3.4.0/apache-tinkerpop-3.4.0-src.zip"; class="btn btn-primary">Source
[tinkerpop] branch master updated: Dynamically register SparqlStrategy for GraphSON CTR
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
The following commit(s) were added to refs/heads/master by this push:
new e21e225 Dynamically register SparqlStrategy for GraphSON CTR
e21e225 is described below
commit e21e225af3e9895aef7d733d1624aa416c79be11
Author: Stephen Mallette
AuthorDate: Mon Feb 11 10:05:21 2019 -0500
Dynamically register SparqlStrategy for GraphSON CTR
---
CHANGELOG.asciidoc | 1 +
.../structure/io/graphson/GraphSONModule.java | 21 +
2 files changed, 22 insertions(+)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 487844b..ff4b1e0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
This release also includes changes from <>.
* Added GraphBinary serializer for TraversalMetrics
+* Added registration for `SparqlStrategy` for GraphSON.
* Fixed up `SparqlStrategy` so that it could be used properly with
`RemoteStrategy`.
* Fixed `ByteBuffer` serialization for GraphBinary.
* Added fallback resolver to `TypeSerializerRegistry` for GraphBinary.
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index c3ba80c..6a3c6a5 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -96,6 +96,7 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import java.util.stream.Stream;
@@ -116,6 +117,18 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
}
/**
+ * Attempt to load {@code SparqlStrategy} if it's on the path. Dynamically
loading it from core makes it easier
+ * for users as they won't have to register special modules for
serialization purposes.
+ */
+private static Optional> tryLoadSparqlStrategy() {
+try {
+return
Optional.of(Class.forName("org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy"));
+} catch (Exception ignored) {
+return Optional.empty();
+}
+}
+
+/**
* Version 3.0 of GraphSON.
*/
static final class GraphSONModuleV3d0 extends GraphSONModule {
@@ -193,6 +206,8 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
GraphFilterStrategy.class,
VertexProgramStrategy.class
).forEach(strategy -> put(strategy,
strategy.getSimpleName()));
+
+GraphSONModule.tryLoadSparqlStrategy().ifPresent(s ->
put(s, s.getSimpleName()));
}});
/**
@@ -314,6 +329,8 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
GraphFilterStrategy.class,
VertexProgramStrategy.class
).forEach(strategy -> addDeserializer(strategy, new
TraversalSerializersV3d0.TraversalStrategyProxyJacksonDeserializer(strategy)));
+
+GraphSONModule.tryLoadSparqlStrategy().ifPresent(s ->
addDeserializer(s, new
TraversalSerializersV3d0.TraversalStrategyProxyJacksonDeserializer(s)));
}
public static Builder build() {
@@ -416,6 +433,8 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
GraphFilterStrategy.class,
VertexProgramStrategy.class
).forEach(strategy -> put(strategy,
strategy.getSimpleName()));
+
+GraphSONModule.tryLoadSparqlStrategy().ifPresent(s ->
put(s, s.getSimpleName()));
}});
/**
@@ -527,6 +546,8 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
GraphFilterStrategy.class,
VertexProgramStrategy.class
).forEach(strategy -> addDeserializer(strategy, new
TraversalSerializersV2d0.TraversalStrategyProxyJacksonDeserializer(strategy)));
+
+GraphSONModule.tryLoadSparqlStrategy().ifPresent(s ->
addDeserializer(s, new
TraversalSerializersV2d0.TraversalStrategyProxyJacksonDeserializer(s)));
}
public static Builder build() {
[GitHub] spmallette commented on issue #1058: TINKERPOP-2154 GraphBinary: Release working buffers on failure
spmallette commented on issue #1058: TINKERPOP-2154 GraphBinary: Release working buffers on failure URL: https://github.com/apache/tinkerpop/pull/1058#issuecomment-462303780 i guess there isn't a better way to do that kind of stuff since we allocate within the serializers themselves. oh well. needs a changelog entry but VOTE +1 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 master updated: Avoid using ByteBuf#readCharSequence() for Netty 4.0 compat CTR
This is an automated email from the ASF dual-hosted git repository.
jorgebg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push:
new 8061512 Avoid using ByteBuf#readCharSequence() for Netty 4.0 compat
CTR
8061512 is described below
commit 806151291eb9fbb685720464977f2516a0fab23d
Author: Jorge Bay Gondra
AuthorDate: Mon Feb 11 11:58:10 2019 +0100
Avoid using ByteBuf#readCharSequence() for Netty 4.0 compat CTR
---
.../tinkerpop/gremlin/driver/ser/binary/types/StringSerializer.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/StringSerializer.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/StringSerializer.java
index 93dbfe4..5267b5d 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/StringSerializer.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/StringSerializer.java
@@ -34,8 +34,10 @@ public class StringSerializer extends
SimpleTypeSerializer {
@Override
protected String readValue(final ByteBuf buffer, final GraphBinaryReader
context) {
-final int length = buffer.readInt();
-return buffer.readCharSequence(length,
StandardCharsets.UTF_8).toString();
+// Use Netty 4.0 API (avoid ByteBuf#readCharSequence() method) to
maximize compatibility
+final byte[] bytes = new byte[buffer.readInt()];
+buffer.readBytes(bytes);
+return new String(bytes, StandardCharsets.UTF_8);
}
@Override
