Repository: cassandra Updated Branches: refs/heads/trunk 59a4624d5 -> da58565eb
Revert ProtocolVersion changes from CASSANDRA-7544 Patch by Ariel Weisberg; Reviewd by Jason Brown for CASSANDRA-14211 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da58565e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da58565e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da58565e Branch: refs/heads/trunk Commit: da58565ebc717b63fff4f4883559b5daf20cb6fa Parents: 59a4624 Author: Ariel Weisberg <aweisb...@apple.com> Authored: Thu Feb 1 12:19:37 2018 -0500 Committer: Ariel Weisberg <aweisb...@apple.com> Committed: Thu Feb 1 17:20:00 2018 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- conf/cassandra.yaml | 7 ------- ...ssandra-driver-core-3.4.0-SNAPSHOT-shaded.jar | Bin 0 -> 2624086 bytes ...ssandra-driver-core-4.0.0-SNAPSHOT-shaded.jar | Bin 2621460 -> 0 bytes ...river-internal-only-3.12.0.post0-00f6f77e.zip | Bin 0 -> 265193 bytes ...river-internal-only-3.12.0.post0-9ee88ded.zip | Bin 265110 -> 0 bytes .../cql3/functions/ScriptBasedUDFunction.java | 4 +++- .../cassandra/transport/ProtocolVersion.java | 9 ++++----- .../cassandra/cql3/PreparedStatementsTest.java | 1 + .../service/ProtocolBetaVersionTest.java | 2 +- .../cassandra/transport/ProtocolVersionTest.java | 3 +-- 12 files changed, 12 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 91b3ed8..38cf696 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Revert ProtocolVersion changes from CASSANDRA-7544 (CASSANDRA-14211) * Non-disruptive seed node list reload (CASSANDRA-14190) * Nodetool tablehistograms to print statics for all the tables (CASSANDRA-14185) * Migrate dtests to use pytest and python3 (CASSANDRA-14134) http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 5796868..e04ce18 100644 --- a/build.xml +++ b/build.xml @@ -437,7 +437,7 @@ <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" /> <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" /> <!-- UPDATE AND UNCOMMENT ON THE DRIVER RELEASE, BEFORE 4.0 RELEASE - <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="4.0.0-SNAPSHOT" classifier="shaded"> + <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.4.0-SNAPSHOT" classifier="shaded"> <exclusion groupId="io.netty" artifactId="netty-buffer"/> <exclusion groupId="io.netty" artifactId="netty-codec"/> <exclusion groupId="io.netty" artifactId="netty-handler"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 3bed3a6..9acc6d6 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -945,13 +945,6 @@ dynamic_snitch_badness_threshold: 0.1 # the keystore and truststore. For instructions on generating these files, see: # http://download.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore # -# If you are taking advantage of StartTLS outbound connections will have the issue that they can't know -# what encrypted port to connect to in a foolproof way. outgoing_encrypted_port_source deals with this confusion -# by allowing you to specify how you want a node to pick an outgoing port for intra-cluster connections. -# Valid values are "gossip" and "yaml". Gossip will always connect to the storage port for a node that is -# published via a gossip which is always going to be the plain storage port. "yaml" will always select -# the port configured as ssl_storage_port on THIS node. If you want to use SSL and have different storage -# ports across the cluster you must select "gossip" and use StartTLS on storage_port. server_encryption_options: # set to true for allowing secure incoming connections enabled: false http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/lib/cassandra-driver-core-3.4.0-SNAPSHOT-shaded.jar ---------------------------------------------------------------------- diff --git a/lib/cassandra-driver-core-3.4.0-SNAPSHOT-shaded.jar b/lib/cassandra-driver-core-3.4.0-SNAPSHOT-shaded.jar new file mode 100644 index 0000000..1290dc3 Binary files /dev/null and b/lib/cassandra-driver-core-3.4.0-SNAPSHOT-shaded.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/lib/cassandra-driver-core-4.0.0-SNAPSHOT-shaded.jar ---------------------------------------------------------------------- diff --git a/lib/cassandra-driver-core-4.0.0-SNAPSHOT-shaded.jar b/lib/cassandra-driver-core-4.0.0-SNAPSHOT-shaded.jar deleted file mode 100644 index 609c393..0000000 Binary files a/lib/cassandra-driver-core-4.0.0-SNAPSHOT-shaded.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/lib/cassandra-driver-internal-only-3.12.0.post0-00f6f77e.zip ---------------------------------------------------------------------- diff --git a/lib/cassandra-driver-internal-only-3.12.0.post0-00f6f77e.zip b/lib/cassandra-driver-internal-only-3.12.0.post0-00f6f77e.zip new file mode 100644 index 0000000..e44da16 Binary files /dev/null and b/lib/cassandra-driver-internal-only-3.12.0.post0-00f6f77e.zip differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/lib/cassandra-driver-internal-only-3.12.0.post0-9ee88ded.zip ---------------------------------------------------------------------- diff --git a/lib/cassandra-driver-internal-only-3.12.0.post0-9ee88ded.zip b/lib/cassandra-driver-internal-only-3.12.0.post0-9ee88ded.zip deleted file mode 100644 index 4aa91b7..0000000 Binary files a/lib/cassandra-driver-internal-only-3.12.0.post0-9ee88ded.zip and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java b/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java index c568972..96a8b0d 100644 --- a/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java +++ b/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java @@ -80,7 +80,9 @@ final class ScriptBasedUDFunction extends UDFunction "com.google.common.reflect", // following required by UDF "com.datastax.driver.core", - "com.datastax.driver.core.utils" + "com.datastax.driver.core.utils", + //Driver Metadata class requires hashmap from this + "com.datastax.shaded.netty.util.collection" }; // use a JVM standard ExecutorService as DebuggableThreadPoolExecutor references internal http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/src/java/org/apache/cassandra/transport/ProtocolVersion.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/ProtocolVersion.java b/src/java/org/apache/cassandra/transport/ProtocolVersion.java index 838176a..cd73c86 100644 --- a/src/java/org/apache/cassandra/transport/ProtocolVersion.java +++ b/src/java/org/apache/cassandra/transport/ProtocolVersion.java @@ -43,8 +43,7 @@ public enum ProtocolVersion implements Comparable<ProtocolVersion> V2(2, "v2", false), // no longer supported V3(3, "v3", false), V4(4, "v4", false), - V5(5, "v5", false), - V6(6, "v6-beta", true); + V5(5, "v5-beta", true); /** The version number */ private final int num; @@ -63,7 +62,7 @@ public enum ProtocolVersion implements Comparable<ProtocolVersion> } /** The supported versions stored as an array, these should be private and are required for fast decoding*/ - private final static ProtocolVersion[] SUPPORTED_VERSIONS = new ProtocolVersion[] { V3, V4, V5, V6 }; + private final static ProtocolVersion[] SUPPORTED_VERSIONS = new ProtocolVersion[] { V3, V4, V5 }; final static ProtocolVersion MIN_SUPPORTED_VERSION = SUPPORTED_VERSIONS[0]; final static ProtocolVersion MAX_SUPPORTED_VERSION = SUPPORTED_VERSIONS[SUPPORTED_VERSIONS.length - 1]; @@ -74,8 +73,8 @@ public enum ProtocolVersion implements Comparable<ProtocolVersion> public final static EnumSet<ProtocolVersion> UNSUPPORTED = EnumSet.complementOf(SUPPORTED); /** The preferred versions */ - public final static ProtocolVersion CURRENT = V5; - public final static Optional<ProtocolVersion> BETA = Optional.of(V6); + public final static ProtocolVersion CURRENT = V4; + public final static Optional<ProtocolVersion> BETA = Optional.of(V5); public static List<String> supportedVersions() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java b/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java index ce5de62..0a314da 100644 --- a/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java +++ b/test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java @@ -223,6 +223,7 @@ public class PreparedStatementsTest extends CQLTester .withClusterName("Test Cluster") .withPort(nativePort) .withoutJMXReporting() + .allowBetaProtocolVersion() .build()) { try (Session newSession = newCluster.connect()) http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/test/unit/org/apache/cassandra/service/ProtocolBetaVersionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/ProtocolBetaVersionTest.java b/test/unit/org/apache/cassandra/service/ProtocolBetaVersionTest.java index a7551f4..4ade4ad 100644 --- a/test/unit/org/apache/cassandra/service/ProtocolBetaVersionTest.java +++ b/test/unit/org/apache/cassandra/service/ProtocolBetaVersionTest.java @@ -110,7 +110,7 @@ public class ProtocolBetaVersionTest extends CQLTester } catch (Exception e) { - assertEquals("Beta version of server used (6/v6-beta), but USE_BETA flag is not set", + assertEquals("Beta version of server used (5/v5-beta), but USE_BETA flag is not set", e.getMessage()); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/da58565e/test/unit/org/apache/cassandra/transport/ProtocolVersionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/transport/ProtocolVersionTest.java b/test/unit/org/apache/cassandra/transport/ProtocolVersionTest.java index 6b95c67..0669699 100644 --- a/test/unit/org/apache/cassandra/transport/ProtocolVersionTest.java +++ b/test/unit/org/apache/cassandra/transport/ProtocolVersionTest.java @@ -62,8 +62,7 @@ public class ProtocolVersionTest Assert.assertNotNull(ProtocolVersion.CURRENT); Assert.assertFalse(ProtocolVersion.V4.isBeta()); - Assert.assertFalse(ProtocolVersion.V5.isBeta()); - Assert.assertTrue(ProtocolVersion.V6.isBeta()); + Assert.assertTrue(ProtocolVersion.V5.isBeta()); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org