kaqing 2.0.98__tar.gz → 2.0.99__tar.gz

{kaqing-2.0.98 → kaqing-2.0.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.98
+Version: 2.0.99
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.98 → kaqing-2.0.99}/adam/commands/alter_tables.py

@@ -1,7 +1,6 @@
 from adam.commands.command import Command
 from adam.commands.cql.cql_utils import tables as get_tables, run_cql
 from adam.config import Config
-from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 
@@ -80,12 +79,6 @@ class AlterTables(Command):
         return state
 
     def completion(self, state: ReplState) -> dict[str, any]:
-        if state.sts:
-            ps = Config().get('cql.alter-tables.gc-grace-periods', '3600,86400,864000,7776000').split(',')
-            return super().completion(state, {
-                'GC_GRACE_SECONDS': {'=': {p.strip(' \r\n'): {'--include-reaper': None} for p in ps}},
-            })
-
         return {}
 
     def help(self, _: ReplState) -> str:

{kaqing-2.0.98 → kaqing-2.0.99}/adam/commands/audit/audit.py

@@ -50,12 +50,19 @@ class Audit(Command):
             if not self.schema_read:
                 Config().wait_log(f'Inspecting audit database schema...')
                 self.schema_read = True
+                # warm up the caches first time when l: drive is accessed
                 audit_column_names()
+                audit_column_names(partition_cols_only=True)
 
-            def columns(_):
-                return audit_column_names()
+            # def columns(_):
+            #     return audit_column_names()
 
-            return super().completion(state) | SqlCompleter.completions(lambda: audit_table_names(), columns=columns) | {
+            return super().completion(state) | SqlCompleter.completions(
+                lambda: audit_table_names(),
+                columns=lambda table: audit_column_names(),
+                partition_columns=lambda table: audit_column_names(partition_cols_only=True),
+                variant='athena'
+            ) | {
                 'desc': {table: None for table in audit_table_names()}}
 
         return {}

{kaqing-2.0.98 → kaqing-2.0.99}/adam/commands/cql/cql_completions.py

@@ -1,11 +1,15 @@
 from adam.commands.cql.cql_utils import table_names
+from adam.config import Config
 from adam.repl_state import ReplState
 from adam.sql.sql_completer import SqlCompleter
 
 def cql_completions(state: ReplState) -> dict[str, any]:
+    ps = Config().get('cql.alter-tables.gc-grace-periods', '3600,86400,864000,7776000').split(',')
     return {
         'describe': {
             'keyspaces': None,
             'table': {t: None for t in table_names(state)},
             'tables': None},
-    } | SqlCompleter.completions(lambda: table_names(state))
+    } | SqlCompleter.completions(lambda: table_names(state), table_props=lambda: {
+        'GC_GRACE_SECONDS': ps
+    }, variant='cql')

{kaqing-2.0.98 → kaqing-2.0.99}/adam/sql/sql_completer.py

@@ -11,19 +11,28 @@ __all__ = [
     "SqlCompleter",
 ]
 
-DML_COMPLETER = TermCompleter(['select', 'insert', 'delete', 'update'])
+DML_COMPLETER = TermCompleter(['select', 'insert', 'delete', 'update', 'alter'])
 
 def default_columns(tables: list[str]):
     return 'id,x.,y.,z.'.split(',')
 
 class SqlCompleter(Completer):
-    def __init__(self, tables: Callable[[], list[str]], dml: str = None, columns: Callable[[list[str]], list[str]] = default_columns, debug = False):
+    def __init__(self,
+                 tables: Callable[[], list[str]],
+                 dml: str = None,
+                 columns: Callable[[list[str]], list[str]] = default_columns,
+                 partition_columns: Callable[[list[str]], list[str]] = lambda x: [],
+                 table_props: Callable[[], dict[str,list[str]]] = lambda: [],
+                 variant = 'sql',
+                 debug = False):
         super().__init__()
         self.dml = dml
         self.tables = tables
         self.columns = columns
+        self.partition_columns = partition_columns
+        self.table_props = table_props
         self.debug = debug
-        self.machine = StateMachine(debug=self.debug)
+        self.machine = StateMachine(variant=variant, debug=self.debug)
 
     def get_completions(
         self, document: Document, complete_event: CompleteEvent
@@ -53,8 +62,17 @@ class SqlCompleter(Completer):
                 for word in self.machine.suggestions[state.to_s].strip(' ').split(','):
                     if word == 'tables':
                         terms.extend(self.tables())
+                    elif word == '`tables`':
+                        terms.append('tables')
                     elif word == 'columns':
                         terms.extend(self.columns([]))
+                    elif word == 'partition-columns':
+                        terms.extend(self.partition_columns([]))
+                    elif word == 'table-props':
+                        terms.extend(self.table_props().keys())
+                    elif word == 'table-prop-values':
+                        if 'last_name' in state.context and state.context['last_name']:
+                            terms.extend(self.table_props()[state.context['last_name']])
                     elif word == 'single':
                         terms.append("'")
                     elif word == 'comma':
@@ -69,10 +87,15 @@ class SqlCompleter(Completer):
             for c in completer.get_completions(document, complete_event):
                 yield c
 
-    def completions(table_names: Callable[[], list[str]], columns: Callable[[list[str]], list[str]] = default_columns):
+    def completions(table_names: Callable[[], list[str]],
+                    columns: Callable[[list[str]], list[str]] = default_columns,
+                    partition_columns: Callable[[list[str]], list[str]] = lambda x: [],
+                    table_props: Callable[[], dict[str, list[str]]] = lambda: [],
+                    variant = 'sql'):
         return {
-            'delete': SqlCompleter(table_names, 'delete', columns=columns),
-            'insert': SqlCompleter(table_names, 'insert', columns=columns),
-            'select': SqlCompleter(table_names, 'select', columns=columns),
-            'update': SqlCompleter(table_names, 'update', columns=columns),
+            'delete': SqlCompleter(table_names, 'delete', columns=columns, partition_columns=partition_columns, table_props=table_props, variant=variant),
+            'insert': SqlCompleter(table_names, 'insert', columns=columns, partition_columns=partition_columns, table_props=table_props, variant=variant),
+            'select': SqlCompleter(table_names, 'select', columns=columns, partition_columns=partition_columns, table_props=table_props, variant=variant),
+            'update': SqlCompleter(table_names, 'update', columns=columns, partition_columns=partition_columns, table_props=table_props, variant=variant),
+            'alter': SqlCompleter(table_names, 'alter', columns=columns, partition_columns=partition_columns, table_props=table_props, variant=variant),
         }