@@ -2075,15 +2075,13 @@ def __init__(self, connection, timeout, fetch_size, metadata_request_timeout):
20752075 self .types_result = []
20762076 self .functions_result = []
20772077 self .aggregates_result = []
2078- self .scylla_result = []
20792078
20802079 self .keyspace_table_rows = defaultdict (list )
20812080 self .keyspace_table_col_rows = defaultdict (lambda : defaultdict (list ))
20822081 self .keyspace_type_rows = defaultdict (list )
20832082 self .keyspace_func_rows = defaultdict (list )
20842083 self .keyspace_agg_rows = defaultdict (list )
20852084 self .keyspace_table_trigger_rows = defaultdict (lambda : defaultdict (list ))
2086- self .keyspace_scylla_rows = defaultdict (lambda : defaultdict (list ))
20872085
20882086 def get_all_keyspaces (self ):
20892087 self ._query_all ()
@@ -2529,23 +2527,9 @@ def _query_all(self):
25292527 self ._aggregate_results ()
25302528
25312529 def _aggregate_results (self ):
2532- m = self .keyspace_scylla_rows
2533- for row in self .scylla_result :
2534- ksname = row ["keyspace_name" ]
2535- cfname = row [self ._table_name_col ]
2536- m [ksname ][cfname ].append (row )
2537- 25382530 m = self .keyspace_table_rows
25392531 for row in self .tables_result :
25402532 ksname = row ["keyspace_name" ]
2541- cfname = row [self ._table_name_col ]
2542- # in_memory property is stored in scylla private table
2543- # add it to table properties if enabled
2544- try :
2545- if self .keyspace_scylla_rows [ksname ][cfname ][0 ]["in_memory" ] == True :
2546- row ["in_memory" ] = True
2547- except (IndexError , KeyError ):
2548- pass
25492533 m [ksname ].append (row )
25502534
25512535 m = self .keyspace_table_col_rows
@@ -2591,7 +2575,6 @@ class SchemaParserV3(SchemaParserV22):
25912575 _SELECT_FUNCTIONS = "SELECT * FROM system_schema.functions"
25922576 _SELECT_AGGREGATES = "SELECT * FROM system_schema.aggregates"
25932577 _SELECT_VIEWS = "SELECT * FROM system_schema.views"
2594- _SELECT_SCYLLA = "SELECT * FROM system_schema.scylla_tables"
25952578
25962579 _table_name_col = 'table_name'
25972580
@@ -2646,9 +2629,6 @@ def get_table(self, keyspaces, keyspace, table):
26462629 triggers_query = QueryMessage (
26472630 query = maybe_add_timeout_to_query (self ._SELECT_TRIGGERS + where_clause , self .metadata_request_timeout ),
26482631 consistency_level = cl , fetch_size = fetch_size )
2649- scylla_query = QueryMessage (
2650- query = maybe_add_timeout_to_query (self ._SELECT_SCYLLA + where_clause , self .metadata_request_timeout ),
2651- consistency_level = cl , fetch_size = fetch_size )
26522632
26532633 # in protocol v4 we don't know if this event is a view or a table, so we look for both
26542634 where_clause = bind_params (" WHERE keyspace_name = %s AND view_name = %s" , (keyspace , table ), _encoder )
@@ -2657,26 +2637,16 @@ def get_table(self, keyspaces, keyspace, table):
26572637 consistency_level = cl , fetch_size = fetch_size )
26582638 ((cf_success , cf_result ), (col_success , col_result ),
26592639 (indexes_sucess , indexes_result ), (triggers_success , triggers_result ),
2660- (view_success , view_result ),
2661- (scylla_success , scylla_result )) = (
2640+ (view_success , view_result )) = (
26622641 self .connection .wait_for_responses (
26632642 cf_query , col_query , indexes_query , triggers_query ,
2664- view_query , scylla_query , timeout = self .timeout , fail_on_error = False )
2643+ view_query , timeout = self .timeout , fail_on_error = False )
26652644 )
26662645 table_result = self ._handle_results (cf_success , cf_result , query_msg = cf_query )
26672646 col_result = self ._handle_results (col_success , col_result , query_msg = col_query )
26682647 if table_result :
26692648 indexes_result = self ._handle_results (indexes_sucess , indexes_result , query_msg = indexes_query )
26702649 triggers_result = self ._handle_results (triggers_success , triggers_result , query_msg = triggers_query )
2671- # in_memory property is stored in scylla private table
2672- # add it to table properties if enabled
2673- scylla_result = self ._handle_results (scylla_success , scylla_result , expected_failures = (InvalidRequest ,),
2674- query_msg = scylla_query )
2675- try :
2676- if scylla_result [0 ]["in_memory" ] == True :
2677- table_result [0 ]["in_memory" ] = True
2678- except (IndexError , KeyError ):
2679- pass
26802650 return self ._build_table_metadata (table_result [0 ], col_result , triggers_result , indexes_result )
26812651
26822652 view_result = self ._handle_results (view_success , view_result , query_msg = view_query )
@@ -2844,8 +2814,6 @@ def _query_all(self):
28442814 fetch_size = fetch_size , consistency_level = cl ),
28452815 QueryMessage (query = maybe_add_timeout_to_query (self ._SELECT_VIEWS , self .metadata_request_timeout ),
28462816 fetch_size = fetch_size , consistency_level = cl ),
2847- QueryMessage (query = maybe_add_timeout_to_query (self ._SELECT_SCYLLA , self .metadata_request_timeout ),
2848- fetch_size = fetch_size , consistency_level = cl ),
28492817 ]
28502818
28512819 ((ks_success , ks_result ),
@@ -2856,8 +2824,7 @@ def _query_all(self):
28562824 (aggregates_success , aggregates_result ),
28572825 (triggers_success , triggers_result ),
28582826 (indexes_success , indexes_result ),
2859- (views_success , views_result ),
2860- (scylla_success , scylla_result )) = self .connection .wait_for_responses (
2827+ (views_success , views_result )) = self .connection .wait_for_responses (
28612828 * queries , timeout = self .timeout , fail_on_error = False
28622829 )
28632830
@@ -2870,7 +2837,6 @@ def _query_all(self):
28702837 self .aggregates_result = self ._handle_results (aggregates_success , aggregates_result , query_msg = queries [5 ])
28712838 self .indexes_result = self ._handle_results (indexes_success , indexes_result , query_msg = queries [7 ])
28722839 self .views_result = self ._handle_results (views_success , views_result , query_msg = queries [8 ])
2873- self .scylla_result = self ._handle_results (scylla_success , scylla_result , expected_failures = (InvalidRequest ,), query_msg = queries [9 ])
28742840
28752841 self ._aggregate_results ()
28762842
0 commit comments