Skip to content

Commit 1ab13c1

Browse files
mykaulmykaul
committed
(improvement) remove query to TRIGGERS (which do not exist in ScyllaDB)
With CoPilot, I removed the query, since this functionality doesn't exist in ScyllaDB at all. Refs: #453 Refs: https://scylladb.atlassian.net/browse/CUSTOMER-62 Signed-off-by: Yaniv Kaul <[email protected]>
1 parent dd1adc7 commit 1ab13c1

File tree

1 file changed

+10
-34
lines changed

1 file changed

+10
-34
lines changed

‎cassandra/metadata.py‎

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2570,7 +2570,6 @@ class SchemaParserV3(SchemaParserV22):
25702570
_SELECT_TABLES = "SELECT * FROM system_schema.tables"
25712571
_SELECT_COLUMNS = "SELECT * FROM system_schema.columns"
25722572
_SELECT_INDEXES = "SELECT * FROM system_schema.indexes"
2573-
_SELECT_TRIGGERS = "SELECT * FROM system_schema.triggers"
25742573
_SELECT_TYPES = "SELECT * FROM system_schema.types"
25752574
_SELECT_FUNCTIONS = "SELECT * FROM system_schema.functions"
25762575
_SELECT_AGGREGATES = "SELECT * FROM system_schema.aggregates"
@@ -2626,28 +2625,24 @@ def get_table(self, keyspaces, keyspace, table):
26262625
indexes_query = QueryMessage(
26272626
query=maybe_add_timeout_to_query(self._SELECT_INDEXES + where_clause, self.metadata_request_timeout),
26282627
consistency_level=cl, fetch_size=fetch_size)
2629-
triggers_query = QueryMessage(
2630-
query=maybe_add_timeout_to_query(self._SELECT_TRIGGERS + where_clause, self.metadata_request_timeout),
2631-
consistency_level=cl, fetch_size=fetch_size)
26322628

26332629
# in protocol v4 we don't know if this event is a view or a table, so we look for both
26342630
where_clause = bind_params(" WHERE keyspace_name = %s AND view_name = %s", (keyspace, table), _encoder)
26352631
view_query = QueryMessage(
26362632
query=maybe_add_timeout_to_query(self._SELECT_VIEWS + where_clause, self.metadata_request_timeout),
26372633
consistency_level=cl, fetch_size=fetch_size)
26382634
((cf_success, cf_result), (col_success, col_result),
2639-
(indexes_sucess, indexes_result), (triggers_success, triggers_result),
2635+
(indexes_sucess, indexes_result),
26402636
(view_success, view_result)) = (
26412637
self.connection.wait_for_responses(
2642-
cf_query, col_query, indexes_query, triggers_query,
2638+
cf_query, col_query, indexes_query,
26432639
view_query, timeout=self.timeout, fail_on_error=False)
26442640
)
26452641
table_result = self._handle_results(cf_success, cf_result, query_msg=cf_query)
26462642
col_result = self._handle_results(col_success, col_result, query_msg=col_query)
26472643
if table_result:
26482644
indexes_result = self._handle_results(indexes_sucess, indexes_result, query_msg=indexes_query)
2649-
triggers_result = self._handle_results(triggers_success, triggers_result, query_msg=triggers_query)
2650-
return self._build_table_metadata(table_result[0], col_result, triggers_result, indexes_result)
2645+
return self._build_table_metadata(table_result[0], col_result, None, indexes_result)
26512646

26522647
view_result = self._handle_results(view_success, view_result, query_msg=view_query)
26532648
if view_result:
@@ -2673,7 +2668,6 @@ def _build_table_metadata(self, row, col_rows=None, trigger_rows=None, index_row
26732668
table_name = row[self._table_name_col]
26742669

26752670
col_rows = col_rows or self.keyspace_table_col_rows[keyspace_name][table_name]
2676-
trigger_rows = trigger_rows or self.keyspace_table_trigger_rows[keyspace_name][table_name]
26772671
index_rows = index_rows or self.keyspace_table_index_rows[keyspace_name][table_name]
26782672

26792673
table_meta = self._table_metadata_class(keyspace_name, table_name, virtual=virtual)
@@ -2695,10 +2689,6 @@ def _build_table_metadata(self, row, col_rows=None, trigger_rows=None, index_row
26952689

26962690
self._build_table_columns(table_meta, col_rows, compact_static, is_dense, virtual)
26972691

2698-
for trigger_row in trigger_rows:
2699-
trigger_meta = self._build_trigger_metadata(table_meta, trigger_row)
2700-
table_meta.triggers[trigger_meta.name] = trigger_meta
2701-
27022692
for index_row in index_rows:
27032693
index_meta = self._build_index_metadata(table_meta, index_row)
27042694
if index_meta:
@@ -2785,12 +2775,6 @@ def _build_index_metadata(table_metadata, row):
27852775
else:
27862776
return None
27872777

2788-
@staticmethod
2789-
def _build_trigger_metadata(table_metadata, row):
2790-
name = row["trigger_name"]
2791-
options = row["options"]
2792-
trigger_meta = TriggerMetadata(table_metadata, name, options)
2793-
return trigger_meta
27942778

27952779
def _query_all(self):
27962780
cl = ConsistencyLevel.ONE
@@ -2808,8 +2792,6 @@ def _query_all(self):
28082792
fetch_size=fetch_size, consistency_level=cl),
28092793
QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_AGGREGATES, self.metadata_request_timeout),
28102794
fetch_size=fetch_size, consistency_level=cl),
2811-
QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_TRIGGERS, self.metadata_request_timeout),
2812-
fetch_size=fetch_size, consistency_level=cl),
28132795
QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_INDEXES, self.metadata_request_timeout),
28142796
fetch_size=fetch_size, consistency_level=cl),
28152797
QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_VIEWS, self.metadata_request_timeout),
@@ -2822,7 +2804,6 @@ def _query_all(self):
28222804
(types_success, types_result),
28232805
(functions_success, functions_result),
28242806
(aggregates_success, aggregates_result),
2825-
(triggers_success, triggers_result),
28262807
(indexes_success, indexes_result),
28272808
(views_success, views_result)) = self.connection.wait_for_responses(
28282809
*queries, timeout=self.timeout, fail_on_error=False
@@ -2831,12 +2812,11 @@ def _query_all(self):
28312812
self.keyspaces_result = self._handle_results(ks_success, ks_result, query_msg=queries[0])
28322813
self.tables_result = self._handle_results(table_success, table_result, query_msg=queries[1])
28332814
self.columns_result = self._handle_results(col_success, col_result, query_msg=queries[2])
2834-
self.triggers_result = self._handle_results(triggers_success, triggers_result, query_msg=queries[6])
28352815
self.types_result = self._handle_results(types_success, types_result, query_msg=queries[3])
28362816
self.functions_result = self._handle_results(functions_success, functions_result, query_msg=queries[4])
28372817
self.aggregates_result = self._handle_results(aggregates_success, aggregates_result, query_msg=queries[5])
2838-
self.indexes_result = self._handle_results(indexes_success, indexes_result, query_msg=queries[7])
2839-
self.views_result = self._handle_results(views_success, views_result, query_msg=queries[8])
2818+
self.indexes_result = self._handle_results(indexes_success, indexes_result, query_msg=queries[6])
2819+
self.views_result = self._handle_results(views_success, views_result, query_msg=queries[7])
28402820

28412821
self._aggregate_results()
28422822

@@ -2914,8 +2894,6 @@ def _query_all(self):
29142894
fetch_size=fetch_size, consistency_level=cl),
29152895
QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_AGGREGATES, self.metadata_request_timeout),
29162896
fetch_size=fetch_size, consistency_level=cl),
2917-
QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_TRIGGERS, self.metadata_request_timeout),
2918-
fetch_size=fetch_size, consistency_level=cl),
29192897
QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_INDEXES, self.metadata_request_timeout),
29202898
fetch_size=fetch_size, consistency_level=cl),
29212899
QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_VIEWS, self.metadata_request_timeout),
@@ -2939,7 +2917,6 @@ def _query_all(self):
29392917
(types_success, types_result),
29402918
(functions_success, functions_result),
29412919
(aggregates_success, aggregates_result),
2942-
(triggers_success, triggers_result),
29432920
(indexes_success, indexes_result),
29442921
(views_success, views_result),
29452922
# V4-only responses
@@ -2952,26 +2929,25 @@ def _query_all(self):
29522929
self.keyspaces_result = self._handle_results(ks_success, ks_result, query_msg=queries[0])
29532930
self.tables_result = self._handle_results(table_success, table_result, query_msg=queries[1])
29542931
self.columns_result = self._handle_results(col_success, col_result, query_msg=queries[2])
2955-
self.triggers_result = self._handle_results(triggers_success, triggers_result, query_msg=queries[6])
29562932
self.types_result = self._handle_results(types_success, types_result, query_msg=queries[3])
29572933
self.functions_result = self._handle_results(functions_success, functions_result, query_msg=queries[4])
29582934
self.aggregates_result = self._handle_results(aggregates_success, aggregates_result, query_msg=queries[5])
2959-
self.indexes_result = self._handle_results(indexes_success, indexes_result, query_msg=queries[7])
2960-
self.views_result = self._handle_results(views_success, views_result, query_msg=queries[8])
2935+
self.indexes_result = self._handle_results(indexes_success, indexes_result, query_msg=queries[6])
2936+
self.views_result = self._handle_results(views_success, views_result, query_msg=queries[7])
29612937
# V4-only results
29622938
# These tables don't exist in some DSE versions reporting 4.X so we can
29632939
# ignore them if we got an error
29642940
self.virtual_keyspaces_result = self._handle_results(
29652941
virtual_ks_success, virtual_ks_result,
2966-
expected_failures=(InvalidRequest,), query_msg=queries[9]
2942+
expected_failures=(InvalidRequest,), query_msg=queries[8]
29672943
)
29682944
self.virtual_tables_result = self._handle_results(
29692945
virtual_table_success, virtual_table_result,
2970-
expected_failures=(InvalidRequest,), query_msg=queries[10]
2946+
expected_failures=(InvalidRequest,), query_msg=queries[9]
29712947
)
29722948
self.virtual_columns_result = self._handle_results(
29732949
virtual_column_success, virtual_column_result,
2974-
expected_failures=(InvalidRequest,), query_msg=queries[11]
2950+
expected_failures=(InvalidRequest,), query_msg=queries[10]
29752951
)
29762952

29772953
self._aggregate_results()

0 commit comments

Comments
 (0)