You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by di...@apache.org on 2020/11/25 20:28:15 UTC
[tinkerpop] branch master updated (b6234e2 -> 245a83d)
This is an automated email from the ASF dual-hosted git repository.
divijv pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from b6234e2 Merge branch '3.4-dev'
add 4624355 TINKERPOP-2445 Remove unnecessary initialization of serializers (#1355)
add 43f7292 TINKERPOP-2445 Parallelize connection creation (#1360)
new 245a83d Merge branch '3.4-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 4 +
gremlin-driver/pom.xml | 10 ++
.../tinkerpop/gremlin/driver/Channelizer.java | 13 ++-
.../apache/tinkerpop/gremlin/driver/Client.java | 124 +++++++++++++--------
.../tinkerpop/gremlin/driver/Connection.java | 18 +--
.../tinkerpop/gremlin/driver/ConnectionPool.java | 53 ++++++---
.../driver/exception/ConnectionException.java | 10 +-
.../driver/exception/NoHostAvailableException.java | 21 ++--
.../driver/handler/WebSocketClientHandler.java | 8 +-
.../tinkerpop/gremlin/driver/ClientTest.java | 82 ++++++++++++++
.../gremlin/server/handler/OpSelectorHandler.java | 4 +-
.../gremlin/server/handler/ServerSerializers.java | 9 ++
.../gremlin/server/GremlinDriverIntegrateTest.java | 26 ++++-
.../server/GremlinServerAuthIntegrateTest.java | 4 +-
.../server/GremlinServerSslIntegrateTest.java | 11 +-
pom.xml | 13 +++
16 files changed, 307 insertions(+), 103 deletions(-)
copy spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/payload/MessagePayload.java => gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/NoHostAvailableException.java (67%)
create mode 100644 gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientTest.java
[tinkerpop] 01/01: Merge branch '3.4-dev'
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
divijv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 245a83d0f2e639da49c3d0333257936806233b6b
Merge: b6234e2 43f7292
Author: Divij Vaidya <di...@amazon.com>
AuthorDate: Wed Nov 25 12:27:23 2020 -0800
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 4 +
gremlin-driver/pom.xml | 10 ++
.../tinkerpop/gremlin/driver/Channelizer.java | 13 ++-
.../apache/tinkerpop/gremlin/driver/Client.java | 124 +++++++++++++--------
.../tinkerpop/gremlin/driver/Connection.java | 18 +--
.../tinkerpop/gremlin/driver/ConnectionPool.java | 53 ++++++---
.../driver/exception/ConnectionException.java | 10 +-
.../driver/exception/NoHostAvailableException.java | 31 ++++++
.../driver/handler/WebSocketClientHandler.java | 8 +-
.../tinkerpop/gremlin/driver/ClientTest.java | 82 ++++++++++++++
.../gremlin/server/handler/OpSelectorHandler.java | 4 +-
.../gremlin/server/handler/ServerSerializers.java | 9 ++
.../gremlin/server/GremlinDriverIntegrateTest.java | 26 ++++-
.../server/GremlinServerAuthIntegrateTest.java | 4 +-
.../server/GremlinServerSslIntegrateTest.java | 11 +-
pom.xml | 13 +++
16 files changed, 331 insertions(+), 89 deletions(-)
diff --cc gremlin-driver/pom.xml
index d9dceaa,7bffa41..c73c6fe
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@@ -96,8 -94,18 +96,18 @@@ limitations under the License
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
index 09b7599,3981867..6f5b6d3
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
@@@ -19,8 -19,7 +19,12 @@@
package org.apache.tinkerpop.gremlin.server.handler;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
++<<<<<<< HEAD
+import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
++=======
+ import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0;
++>>>>>>> 3.4-dev
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@@ -30,15 -29,9 +34,20 @@@ final class ServerSerializers
private ServerSerializers() {}
/**
++<<<<<<< HEAD
+ * Default binary serializer used by the server when the serializer requested does not match what is on the server.
+ * This defaults to GraphBinary 1.0.
++=======
+ * Default serializer used by the server when the serializer requested does not match what is on the server.
+ * Using GraphSON 1.0 on 3.3.5 because that's what it has long been set to in previous versions.
++>>>>>>> 3.4-dev
*/
- static final MessageSerializer DEFAULT_SERIALIZER = new GraphSONMessageSerializerV1d0();
+ static final MessageSerializer DEFAULT_BINARY_SERIALIZER = new GraphBinaryMessageSerializerV1();
+
+ /**
+ * Default binary serializer used by the server when the serializer requested does not match what is on the server.
+ * This defaults to GraphSON 3.0.
+ */
+ static final MessageSerializer DEFAULT_TEXT_SERIALIZER = new GraphSONMessageSerializerV3d0();
}
diff --cc pom.xml
index 6b95e43,8fd981c..01f74d3
--- a/pom.xml
+++ b/pom.xml
@@@ -159,7 -159,8 +159,8 @@@ limitations under the License
<netty.version>4.1.52.Final</netty.version>
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.27</snakeyaml.version>
- <spark.version>2.4.0</spark.version>
+ <spark.version>3.0.0</spark.version>
+ <powermock.version>1.6.4</powermock.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@@ -731,9 -722,21 +732,21 @@@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
+ <artifactId>hamcrest</artifactId>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>