From e3550f954ab6a2b6190784e6b917dc2053b82649 Mon Sep 17 00:00:00 2001 From: dormi330 Date: Fri, 10 Mar 2023 18:11:21 +0800 Subject: [PATCH] style, (T1, T2) ==> Tuple[T1, T2] --- dbt/adapters/flink/connections.py | 4 ++-- dbt/adapters/flink/impl.py | 2 +- flink/sqlgateway/schema_operations.py | 21 ++++++++------------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dbt/adapters/flink/connections.py b/dbt/adapters/flink/connections.py index f5d5fb2..ea92048 100644 --- a/dbt/adapters/flink/connections.py +++ b/dbt/adapters/flink/connections.py @@ -117,7 +117,7 @@ def _read_session_handle(cls, credentials: FlinkCredentials) -> Optional[SqlGate ) if ( - datetime.now() - session_timestamp + datetime.now() - session_timestamp ).seconds > credentials.session_idle_timeout_s: logger.info("Stored session has timeout.") return None @@ -182,7 +182,7 @@ def show_catalogs(self) -> List[str]: def show_databases(self, catalog: str) -> List[str]: return SchemaOperation.show_databases(self.current_session(), catalog) - def show_relations(self, catalog: str, database: str) -> (List[str], List[str]): + def show_relations(self, catalog: str, database: str) -> Tuple[List[str], List[str]]: tables, views = SchemaOperation.show_relations(self.current_session(), catalog, database) return tables, views diff --git a/dbt/adapters/flink/impl.py b/dbt/adapters/flink/impl.py index 2cdec53..413f980 100644 --- a/dbt/adapters/flink/impl.py +++ b/dbt/adapters/flink/impl.py @@ -76,7 +76,7 @@ def get_columns_in_relation(self, relation: BaseRelation) -> List[BaseColumn]: def is_cancelable(cls) -> bool: return False # TODO - def list_relations_without_caching(self, schema_relation: BaseRelation) -> List[BaseRelation]: + def list_relations_without_caching(self, schema_relation: BaseRelation) -> List[FlinkRelation]: database = schema_relation.path.database if not database: raise RuntimeError("database(flink catalog) should not be empty") diff --git a/flink/sqlgateway/schema_operations.py b/flink/sqlgateway/schema_operations.py index cea6f9b..45fcab1 100644 --- a/flink/sqlgateway/schema_operations.py +++ b/flink/sqlgateway/schema_operations.py @@ -1,5 +1,5 @@ import time -from typing import List +from typing import List, Tuple from flink.sqlgateway.operation import SqlGatewayOperation from flink.sqlgateway.result_parser import SqlGatewayResult @@ -15,6 +15,7 @@ sql_show_databases = "show databases" sql_show_current_database = "show current database" sql_show_tables = "show tables" +sql_show_views = "show views" pull_interval_s = 0.1 @@ -107,12 +108,10 @@ def show_databases(session: SqlGatewaySession, catalog: str) -> List[str]: return dbs @staticmethod - def show_relations(session, catalog: str, database: str) -> (List[str], List[str]): - """ - note: for hive catalog, show tables also returns views - views = show views in catalog.database - tables = show tables in catalog.database - views - """ + def show_relations(session, catalog: str, database: str) -> Tuple[List[str], List[str]]: + # note: for hive catalog, show tables also returns views + # views = show views in catalog.database + # tables = show tables in catalog.database - views views = SchemaOperation.show_views(session, catalog, database) if catalog is None: @@ -136,12 +135,8 @@ def show_tables(session: SqlGatewaySession, catalog: str = None, database: str = @staticmethod def show_views(session: SqlGatewaySession, catalog: str = None, database: str = None) -> List[str]: - """ - NO such sql - show views in|from catalog.database - """ - sql = "show views" - return SchemaOperation.show_xxx(session, sql) + # NO such sql: show views in|from catalog.database + return SchemaOperation.show_xxx(session, sql_show_views) @staticmethod def show_xxx(session: SqlGatewaySession, sql: str) -> List[str]: