Remove protocol versions >5 from MAX_SUPPORTED

Without removing associated code yet, this patch just ensure we begin
negotiating protocol version 5, then fallback to 4, reducing the amount of protocol errors
that the Scylla server sends when it sees the unsupported versions.

Refs: #244

Signed-off-by: Yaniv Kaul <[email protected]>

Author: mykaul

cassandra/__init__.py

@@ -180,7 +180,7 @@ class ProtocolVersion(object):
     DSE private protocol v2, supported in DSE 6.0+
     """
 
-    SUPPORTED_VERSIONS = (DSE_V2, DSE_V1, V6, V5, V4, V3, V2, V1)
+    SUPPORTED_VERSIONS = (V5, V4, V3, V2, V1)
     """
     A tuple of all supported protocol versions
     """

cassandra/cluster.py

@@ -672,7 +672,7 @@ class Cluster(object):
     server will be automatically used.
     """
 
-    protocol_version = ProtocolVersion.DSE_V2
+    protocol_version = ProtocolVersion.V5
     """
     The maximum version of the native protocol to use.
 
@@ -2749,7 +2749,6 @@ def __init__(self, cluster, hosts, keyspace=None):
             raise NoHostAvailable(msg, [h.address for h in hosts])
 
         self.session_id = uuid.uuid4()
-        self._graph_paging_available = self._check_graph_paging_available()
 
         if self.cluster.column_encryption_policy is not None:
             try:
@@ -2946,26 +2945,10 @@ def execute_graph_async(self, query, parameters=None, trace=False, execution_pro
     def _maybe_set_graph_paging(self, execution_profile):
         graph_paging = execution_profile.continuous_paging_options
         if execution_profile.continuous_paging_options is _NOT_SET:
-            graph_paging = ContinuousPagingOptions() if self._graph_paging_available else None
+            graph_paging = None
 
         execution_profile.continuous_paging_options = graph_paging
 
-    def _check_graph_paging_available(self):
-        """Verify if we can enable graph paging. This executed only once when the session is created."""
-
-        if not ProtocolVersion.has_continuous_paging_next_pages(self._protocol_version):
-            return False
-
-        for host in self.cluster.metadata.all_hosts():
-            if host.dse_version is None:
-                return False
-
-            version = Version(host.dse_version)
-            if version < _GRAPH_PAGING_MIN_DSE_VERSION:
-                return False
-
-        return True
-
     def _resolve_execution_profile_options(self, execution_profile):
         """
         Determine the GraphSON protocol and row factory for a graph query. This is useful
@@ -3112,13 +3095,7 @@ def _create_response_future(self, query, parameters, trace, custom_payload,
         else:
             timestamp = None
 
-        supports_continuous_paging_state = (
-            ProtocolVersion.has_continuous_paging_next_pages(self._protocol_version)
-        )
-        if continuous_paging_options and supports_continuous_paging_state:
-            continuous_paging_state = ContinuousPagingState(continuous_paging_options.max_queue_size)
-        else:
-            continuous_paging_state = None
+        continuous_paging_state = None
 
         if isinstance(query, SimpleStatement):
             query_string = query.query_string

tests/integration/__init__.py

@@ -357,7 +357,6 @@ def _id_and_mark(f):
 lessthenprotocolv4 = unittest.skipUnless(PROTOCOL_VERSION < 4, 'Protocol versions 4 or greater not supported')
 lessthanprotocolv3 = unittest.skipUnless(PROTOCOL_VERSION < 3, 'Protocol versions 3 or greater not supported')
 greaterthanprotocolv3 = unittest.skipUnless(PROTOCOL_VERSION >= 4, 'Protocol versions less than 4 are not supported')
-protocolv6 = unittest.skipUnless(6 in get_supported_protocol_versions(), 'Protocol versions less than 6 are not supported')
 
 greaterthancass20 = unittest.skipUnless(CASSANDRA_VERSION >= Version('2.1'), 'Cassandra version 2.1 or greater required')
 greaterthancass21 = unittest.skipUnless(CASSANDRA_VERSION >= Version('2.2'), 'Cassandra version 2.2 or greater required')
@@ -372,9 +371,6 @@ def _id_and_mark(f):
 lessthancass40 = unittest.skipUnless(CASSANDRA_VERSION < Version('4.0'), 'Cassandra version less than 4.0 required')
 lessthancass30 = unittest.skipUnless(CASSANDRA_VERSION < Version('3.0'), 'Cassandra version less then 3.0 required')
 
-greaterthanorequaldse68 = unittest.skipUnless(DSE_VERSION and DSE_VERSION >= Version('6.8'), "DSE 6.8 or greater required for this test")
-greaterthanorequaldse67 = unittest.skipUnless(DSE_VERSION and DSE_VERSION >= Version('6.7'), "DSE 6.7 or greater required for this test")
-greaterthanorequaldse60 = unittest.skipUnless(DSE_VERSION and DSE_VERSION >= Version('6.0'), "DSE 6.0 or greater required for this test")
 greaterthanorequaldse51 = unittest.skipUnless(DSE_VERSION and DSE_VERSION >= Version('5.1'), "DSE 5.1 or greater required for this test")
 greaterthanorequaldse50 = unittest.skipUnless(DSE_VERSION and DSE_VERSION >= Version('5.0'), "DSE 5.0 or greater required for this test")
 lessthandse51 = unittest.skipUnless(DSE_VERSION and DSE_VERSION < Version('5.1'), "DSE version less than 5.1 required")

tests/integration/advanced/graph/test_graph_cont_paging.py

@@ -14,65 +14,6 @@
 
 from cassandra.cluster import ContinuousPagingOptions
 
-from tests.integration import greaterthanorequaldse68
 from tests.integration.advanced.graph import GraphUnitTestCase, CoreGraphSchema, GraphTestConfiguration
 
 
-@greaterthanorequaldse68
-@GraphTestConfiguration.generate_tests(schema=CoreGraphSchema)
-class GraphPagingTest(GraphUnitTestCase):
-
-    def _setup_data(self, schema, graphson):
-        self.execute_graph("schema.vertexLabel('person').ifNotExists().partitionBy('name', Text).property('age', Int).create();", graphson)
-        for i in range(100):
-            self.execute_graph("g.addV('person').property('name', 'batman-{}')".format(i), graphson)
-
-    def _test_cont_paging_is_enabled_by_default(self, schema, graphson):
-        """
-        Test that graph paging is automatically enabled with a >=6.8 cluster.
-
-        @jira_ticket PYTHON-1045
-        @expected_result the response future has a continuous_paging_session since graph paging is enabled
-
-        @test_category dse graph
-        """
-        ep = self.get_execution_profile(graphson)
-        self._setup_data(schema, graphson)
-        rf = self.session.execute_graph_async("g.V()", execution_profile=ep)
-        results = list(rf.result())
-        self.assertIsNotNone(rf._continuous_paging_session)
-        self.assertEqual(len(results), 100)
-
-    def _test_cont_paging_can_be_disabled(self, schema, graphson):
-        """
-        Test that graph paging can be disabled.
-
-        @jira_ticket PYTHON-1045
-        @expected_result the response future doesn't have a continuous_paging_session since graph paging is disabled
-
-        @test_category dse graph
-        """
-        ep = self.get_execution_profile(graphson)
-        new_ep = self.session.execution_profile_clone_update(ep, continuous_paging_options=None)
-        self._setup_data(schema, graphson)
-        rf = self.session.execute_graph_async("g.V()", execution_profile=new_ep)
-        results = list(rf.result())
-        self.assertIsNone(rf._continuous_paging_session)
-        self.assertEqual(len(results), 100)
-
-    def _test_cont_paging_with_custom_options(self, schema, graphson):
-        """
-        Test that we can specify custom paging options.
-
-        @jira_ticket PYTHON-1045
-        @expected_result we get only the desired number of results
-
-        @test_category dse graph
-        """
-        ep = self.get_execution_profile(graphson)
-        new_ep = self.session.execution_profile_clone_update(
-            ep, continuous_paging_options=ContinuousPagingOptions(max_pages=1))
-        self._setup_data(schema, graphson)
-        self.session.default_fetch_size = 10
-        results = list(self.session.execute_graph("g.V()", execution_profile=new_ep))
-        self.assertEqual(len(results), 10)

tests/integration/standard/test_cluster.py

@@ -255,13 +255,7 @@ def test_protocol_negotiation(self):
         updated_protocol_version = session._protocol_version
         updated_cluster_version = cluster.protocol_version
         # Make sure the correct protocol was selected by default
-        if DSE_VERSION and DSE_VERSION >= Version("6.0"):
-            self.assertEqual(updated_protocol_version, cassandra.ProtocolVersion.DSE_V2)
-            self.assertEqual(updated_cluster_version, cassandra.ProtocolVersion.DSE_V2)
-        elif DSE_VERSION and DSE_VERSION >= Version("5.1"):
-            self.assertEqual(updated_protocol_version, cassandra.ProtocolVersion.DSE_V1)
-            self.assertEqual(updated_cluster_version, cassandra.ProtocolVersion.DSE_V1)
-        elif CASSANDRA_VERSION >= Version('4.0-beta5'):
+        if CASSANDRA_VERSION >= Version('4.0-beta5'):
             self.assertEqual(updated_protocol_version, cassandra.ProtocolVersion.V5)
             self.assertEqual(updated_cluster_version, cassandra.ProtocolVersion.V5)
         elif CASSANDRA_VERSION >= Version('4.0-a'):