PYTHON-1020: skip virtual tables if not present

Author: mambocab

CHANGELOG.rst

@@ -5,6 +5,7 @@ Bug Fixes
 ---------
 * Improve and fix socket error-catching code in nonblocking-socket reactors (PYTHON-1024)
 * Non-ASCII characters in schema break CQL string generation (PYTHON-1008)
+* Fix OSS driver's virtual table support against DSE 6.0.X and future server releases (PYTHON-1020)
 
 Other
 -----

cassandra/metadata.py

@@ -2531,12 +2531,27 @@ def _query_all(self):
         self.indexes_result = self._handle_results(indexes_success, indexes_result)
         self.views_result = self._handle_results(views_success, views_result)
         # V4-only results
-        self.virtual_keyspaces_result = self._handle_results(virtual_ks_success,
-                                                             virtual_ks_result)
-        self.virtual_tables_result = self._handle_results(virtual_table_success,
-                                                          virtual_table_result)
-        self.virtual_columns_result = self._handle_results(virtual_column_success,
-                                                           virtual_column_result)
+        # These tables don't exist in some DSE versions reporting 4.X so we can
+        # ignore them if we got an error
+        if isinstance(virtual_ks_result, InvalidRequest):
+            self.virtual_keyspaces_result = []
+        else:
+            self.virtual_keyspaces_result = self._handle_results(
+                virtual_ks_success, virtual_ks_result
+            )
+        if isinstance(virtual_table_result, InvalidRequest):
+            self.virtual_tables_result = []
+        else:
+            self.virtual_tables_result = self._handle_results(
+                virtual_table_success, virtual_table_result
+            )
+        if isinstance(virtual_column_result, InvalidRequest):
+            self.virtual_columns_result = []
+        else:
+            self.virtual_columns_result = self._handle_results(
+                virtual_column_success, virtual_column_result
+            )
+
         self._aggregate_results()
 
     def _aggregate_results(self):
@@ -2722,9 +2737,7 @@ def export_as_string(self):
 
 def get_schema_parser(connection, server_version, timeout):
     server_major_version = int(server_version.split('.')[0])
-    # check for DSE version
-    has_build_version = len(server_version.split('.')) > 3
-    if server_major_version >= 4 and not has_build_version:
+    if server_major_version >= 4:
         return SchemaParserV4(connection, timeout)
     if server_major_version >= 3:
         return SchemaParserV3(connection, timeout)

tests/integration/standard/test_dse.py

@@ -42,6 +42,9 @@ def test_dse_5x(self):
     def test_dse_60(self):
         self._test_basic(Version('6.0.2'))
 
+    def test_dse_67(self):
+        self._test_basic(Version('6.7.0'))
+
     def _test_basic(self, dse_version):
         """
         Test basic connection and usage