Revert ProtocolVersion changes from CASSANDRA-7544

Patch by Ariel Weisberg; Reviewd by Jason Brown for CASSANDRA-14211

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)

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"/>

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

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

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()
     {

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())

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());
         }
     }

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