You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/04/16 17:47:49 UTC
[1/4] tinkerpop git commit: TINKERPOP-1934 Bumped httpclient to 4.5.5
[Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1936 87e1f00e6 -> e68df44ca (forced update)
TINKERPOP-1934 Bumped httpclient to 4.5.5
Removed httpcore NOTICE entry as this more recent version does not contain that designation in its NOTICE file.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f9e0cf50
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f9e0cf50
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f9e0cf50
Branch: refs/heads/TINKERPOP-1936
Commit: f9e0cf50eed22c6e6e54650b073a98e5314888e9
Parents: 1592c4f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 5 08:11:59 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 6 21:28:53 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +++++
gremlin-console/pom.xml | 1 -
gremlin-console/src/main/static/NOTICE | 6 ------
gremlin-server/pom.xml | 1 -
pom.xml | 5 +++++
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 2b48a6f..0f3a71a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -20,6 +20,11 @@ limitations under the License.
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
+[[release-3-2-9]]
+=== TinkerPop 3.2.9 (Release Date: NOT OFFICIALLY RELEASED YET)
+
+* Bumped to httpclient 4.5.5.
+
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 46b4fcc..51ad5ca 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -39,7 +39,6 @@ limitations under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index 91e622f..4931f7e 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -29,12 +29,6 @@ Licensed under the Creative Commons Attribution Licence v2.5
http://creativecommons.org/licenses/by/2.5/
------------------------------------------------------------------------
-Apache Http Components Core 4.4.3 (AL ASF)
-------------------------------------------------------------------------
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
-
-------------------------------------------------------------------------
Apache Ivy 2.3.0 (AL ASF)
------------------------------------------------------------------------
Portions of Ivy were originally developed by
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 1bc5920..dd04865 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -96,7 +96,6 @@ limitations under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.5</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e99dd5a..5ac2d88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -652,6 +652,11 @@ limitations under the License.
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.5</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
[3/4] tinkerpop git commit: Merge branch 'TINKERPOP-1934' into tp32
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1934' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a7c8ea10
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a7c8ea10
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a7c8ea10
Branch: refs/heads/TINKERPOP-1936
Commit: a7c8ea102425e9df5f9f3eca20df333db8cdf936
Parents: 54df6dc f9e0cf5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 16 07:48:42 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 16 07:48:42 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +++++
gremlin-console/pom.xml | 1 -
gremlin-console/src/main/static/NOTICE | 6 ------
gremlin-server/pom.xml | 1 -
pom.xml | 5 +++++
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[2/4] tinkerpop git commit: TINKERPOP-1912 Removed MD5 checksums from
release
Posted by sp...@apache.org.
TINKERPOP-1912 Removed MD5 checksums from release
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/54df6dcb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/54df6dcb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/54df6dcb
Branch: refs/heads/TINKERPOP-1936
Commit: 54df6dcbd081ec685723cdfc508af5513fb66dd0
Parents: 35bf95a
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Apr 10 13:31:47 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Apr 11 09:27:19 2018 -0700
----------------------------------------------------------------------
bin/validate-distribution.sh | 3 ++-
docs/src/dev/developer/release.asciidoc | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/54df6dcb/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index 0121a1a..b071ea0 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -83,10 +83,11 @@ fi
echo -n "* downloading ${COMPONENT} (${ZIP_FILENAME})... "
curl -Lsf ${URL} -o ${ZIP_FILENAME} || { echo "Failed to download ${COMPONENT}" ; exit 1; }
-for ext in "asc" "md5" "sha1"
+for ext in "asc" "sha1"
do
curl -Lsf ${URL}.${ext} -o ${ZIP_FILENAME}.${ext} || { echo "Failed to download ${COMPONENT} (${ext})" ; exit 1 ; }
done
+curl -Lsf ${URL}.md5 -o ${ZIP_FILENAME}.md5 && { echo "MD5 checksums should not be released (${ZIP_FILENAME}.md5)" ; exit 1 ; }
echo "OK"
# validate zip file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/54df6dcb/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index c7c5bb7..608bb31 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -209,6 +209,7 @@ for generating javadoc and without that the binary distributions won't contain t
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-console/xx.yy.zz/gremlin-console-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-server/xx.yy.zz/gremlin-server-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/tinkerpop/xx.yy.zz/tinkerpop-xx.yy.zz-source-release.zip* dev/xx.yy.zz`
+.. `rm -f dev/*.md5
.. `cd dev/xx.yy.zz`
.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-tinkerpop-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e 's/tinkerpop-tinkerpop/tinkerpop/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
.. `cd ..; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
[4/4] tinkerpop git commit: TINKERPOP-1936 Improved performance of
Bytecode deserialization.
Posted by sp...@apache.org.
TINKERPOP-1936 Improved performance of Bytecode deserialization.
GraphSON deserialization of Bytecode was using generic List deserialization which became especially costly for Jackson in 2.5.x because of changes that synchronized access to the deserialization cache and because the collection deserialization were no longer cacheable when type deserialization was in play. This change removed the use of generic type lists in deserialization and more directly handled the parsing of the lists thus bypassing the collection deserializer for this specific case.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e68df44c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e68df44c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e68df44c
Branch: refs/heads/TINKERPOP-1936
Commit: e68df44caaafd9f4037da8e03be660a4124555eb
Parents: a7c8ea1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 12 10:25:20 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 16 13:47:35 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../io/graphson/TraversalSerializersV2d0.java | 35 +++++++++++++-------
2 files changed, 24 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e68df44c/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0f3a71a..51c9f68 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
=== TinkerPop 3.2.9 (Release Date: NOT OFFICIALLY RELEASED YET)
* Bumped to httpclient 4.5.5.
+* Improved performance of GraphSON deserialization of `Bytecode`.
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e68df44c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
index a696280..040fd1d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
@@ -248,8 +248,6 @@ final class TraversalSerializersV2d0 {
//////////////////
final static class BytecodeJacksonDeserializer extends StdDeserializer<Bytecode> {
- private static final JavaType listJavaType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, Object.class);
- private static final JavaType listListJavaType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, listJavaType);
public BytecodeJacksonDeserializer() {
super(Bytecode.class);
@@ -260,17 +258,30 @@ final class TraversalSerializersV2d0 {
final Bytecode bytecode = new Bytecode();
while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
- if (jsonParser.getCurrentName().equals(GraphSONTokens.SOURCE)) {
+ final String current = jsonParser.getCurrentName();
+ if (current.equals(GraphSONTokens.SOURCE) || current.equals(GraphSONTokens.STEP)) {
jsonParser.nextToken();
- final List<List<Object>> instructions = deserializationContext.readValue(jsonParser, listListJavaType);
- for (final List<Object> instruction : instructions) {
- bytecode.addSource((String) instruction.get(0), Arrays.copyOfRange(instruction.toArray(), 1, instruction.size()));
- }
- } else if (jsonParser.getCurrentName().equals(GraphSONTokens.STEP)) {
- jsonParser.nextToken();
- final List<List<Object>> instructions = deserializationContext.readValue(jsonParser, listListJavaType);
- for (final List<Object> instruction : instructions) {
- bytecode.addStep((String) instruction.get(0), Arrays.copyOfRange(instruction.toArray(), 1, instruction.size()));
+
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+
+ // there should be a list now and the first item in the list is always string and is the step name
+ // skip the start array
+ jsonParser.nextToken();
+
+ final String stepName = jsonParser.getText();
+
+ // iterate through the rest of the list for arguments until it gets to the end
+ final List<Object> arguments = new ArrayList<>();
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ // we don't know the types here, so let the deserializer figure that business out
+ arguments.add(deserializationContext.readValue(jsonParser, Object.class));
+ }
+
+ // if it's not a "source" then it must be a "step"
+ if (current.equals(GraphSONTokens.SOURCE))
+ bytecode.addSource(stepName, arguments.toArray());
+ else
+ bytecode.addStep(stepName, arguments.toArray());
}
}
}