Skip to content

CASSANDRA-19560 added virtual types #1251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −2
Open

CASSANDRA-19560 added virtual types #1251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions cassandra/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2776,12 +2776,14 @@ class SchemaParserV4(SchemaParserV3):
_SELECT_VIRTUAL_KEYSPACES = 'SELECT * from system_virtual_schema.keyspaces'
_SELECT_VIRTUAL_TABLES = 'SELECT * from system_virtual_schema.tables'
_SELECT_VIRTUAL_COLUMNS = 'SELECT * from system_virtual_schema.columns'
_SELECT_VIRTUAL_TYPES = 'SELECT * from system_virtual_schema.types'

def __init__(self, connection, timeout):
super(SchemaParserV4, self).__init__(connection, timeout)
self.virtual_keyspaces_rows = defaultdict(list)
self.virtual_tables_rows = defaultdict(list)
self.virtual_columns_rows = defaultdict(lambda: defaultdict(list))
self.virtual_types_rows = defaultdict(list)

def _query_all(self):
cl = ConsistencyLevel.ONE
Expand All @@ -2801,7 +2803,8 @@ def _query_all(self):
# V4-only queries
QueryMessage(query=self._SELECT_VIRTUAL_KEYSPACES, consistency_level=cl),
QueryMessage(query=self._SELECT_VIRTUAL_TABLES, consistency_level=cl),
QueryMessage(query=self._SELECT_VIRTUAL_COLUMNS, consistency_level=cl)
QueryMessage(query=self._SELECT_VIRTUAL_COLUMNS, consistency_level=cl),
QueryMessage(query=self._SELECT_VIRTUAL_TYPES, consistency_level=cl)
]

responses = self.connection.wait_for_responses(
Expand All @@ -2820,7 +2823,8 @@ def _query_all(self):
# V4-only responses
(virtual_ks_success, virtual_ks_result),
(virtual_table_success, virtual_table_result),
(virtual_column_success, virtual_column_result)
(virtual_column_success, virtual_column_result),
(virtual_type_success, virtual_type_result)
) = responses

# copied from V3
Expand Down Expand Up @@ -2848,6 +2852,10 @@ def _query_all(self):
virtual_column_success, virtual_column_result,
expected_failures=(InvalidRequest,)
)
self.virtual_types_result = self._handle_results(
virtual_type_success, virtual_type_result,
expected_failures=(InvalidRequest,)
)

self._aggregate_results()

Expand All @@ -2864,6 +2872,10 @@ def _aggregate_results(self):
tab_name = row[self._table_name_col]
m[ks_name][tab_name].append(row)

m = self.virtual_types_rows
for row in self.virtual_types_result:
m[row['keyspace_name']].append(row)

def get_all_keyspaces(self):
for x in super(SchemaParserV4, self).get_all_keyspaces():
yield x
Expand All @@ -2882,6 +2894,11 @@ def get_all_keyspaces(self):
col_rows=col_rows,
virtual=True)
)

for usertype_row in self.virtual_types_rows.get(keyspace_meta.name, []):
usertype = self._build_user_type(usertype_row)
keyspace_meta.user_types[usertype.name] = usertype

yield keyspace_meta

@staticmethod
Expand Down