kaqing 2.0.40__tar.gz → 2.0.42__tar.gz

{kaqing-2.0.40 → kaqing-2.0.42}/PKG-INFO

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

{kaqing-2.0.40 → kaqing-2.0.42}/adam/commands/cd.py

@@ -1,4 +1,5 @@
 from adam.commands.command import Command
+from adam.commands.postgres.pg_utils import pg_database_names
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.k8s_utils.cassandra_clusters import CassandraClusters
 from adam.k8s_utils.kube_context import KubeContext
@@ -91,7 +92,7 @@ class Cd(Command):
             if pg and pg.db:
                 return {Cd.COMMAND: {'..': None}}
             elif pg and pg.host:
-                return {Cd.COMMAND: {'..': None} | {p['name']: None for p in pg.databases()}}
+                return {Cd.COMMAND: {'..': None} | {p: None for p in pg_database_names(state.namespace, pg.directory())}}
             else:
                 return {Cd.COMMAND: {p: None for p in PostgresSession.hosts(state.namespace)}}
         elif state.device == ReplState.A:

{kaqing-2.0.40 → kaqing-2.0.42}/adam/commands/ls.py

@@ -4,6 +4,7 @@ import re
 from adam.commands.command import Command
 from adam.commands.commands_utils import show_pods, show_rollout
 from adam.commands.cqlsh import Cqlsh
+from adam.commands.postgres.pg_utils import pg_database_names, pg_table_names
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.config import Config
 from adam.k8s_utils.custom_resources import CustomResources
@@ -123,14 +124,10 @@ class Ls(Command):
             log(lines_to_tabular(lines, 'NAME,NAMESPACE,ENDPOINT,USERNAME,PASSWORD', separator=','))
 
     def show_pg_databases(self, pg: PostgresSession):
-        lines = [db["name"] for db in pg.databases() if db["owner"] == PostgresSession.default_owner()]
-
-        log(lines_to_tabular(lines, 'DATABASE', separator=','))
+        log(lines_to_tabular(pg_database_names(pg.namespace, pg.directory()), 'DATABASE', separator=','))
 
     def show_pg_tables(self, pg: PostgresSession):
-        lines = [db["name"] for db in pg.tables() if db["schema"] == PostgresSession.default_schema()]
-
-        log(lines_to_tabular(lines, 'NAME', separator=','))
+        log(lines_to_tabular(pg_table_names(pg.namespace, pg.directory()), 'NAME', separator=','))
 
     def completion(self, state: ReplState):
         if state.pod:

kaqing-2.0.42/adam/commands/postgres/pg_utils.py

@@ -0,0 +1,18 @@
+import functools
+
+from adam.commands.postgres.postgres_session import PostgresSession
+
+def pg_database_names(ns: str, pg_path: str):
+    pg = PostgresSession(ns, pg_path)
+    return [db['name'] for db in pg.databases() if db['owner'] == PostgresSession.default_owner()]
+
+@functools.lru_cache()
+def pg_table_names(ns: str, pg_path: str):
+    return [table['name'] for table in pg_tables(ns, pg_path) if table['schema'] == PostgresSession.default_schema()]
+
+def pg_tables(ns: str, pg_path: str):
+    pg = PostgresSession(ns, pg_path)
+    if pg.db:
+        return pg.tables()
+
+    return []

{kaqing-2.0.40 → kaqing-2.0.42}/adam/commands/postgres/postgres.py

@@ -2,6 +2,7 @@ import functools
 import click
 
 from adam.commands.command import Command
+from adam.commands.postgres.pg_utils import pg_table_names
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview
 from .postgres_session import PostgresSession
@@ -67,19 +68,19 @@ class Postgres(Command):
         leaf = {}
         session = PostgresSession(state.namespace, state.pg_path)
         if session.db:
-            ts = self.tables(state.namespace, state.pg_path)
+          if tables := pg_table_names(state.namespace, state.pg_path):
             leaf = {
                 '\h': None,
                 '\d': None,
                 '\dt': None,
                 '\du': None,
-                'delete': {'from': {t: {'where': {'id': {'=': None}}} for t in ts}},
-                'insert': {'into': {t: {'values': None} for t in ts}},
+                'delete': {'from': {t: {'where': {'id': {'=': None}}} for t in tables}},
+                'insert': {'into': {t: {'values': None} for t in tables}},
                 'select': {'*': {'from': {t: {
                     'limit': {'1': None},
                     'where': {'id': {'=': None}}
-                } for t in ts}}},
-                'update': {t: {'set': None} for t in ts},
+                } for t in tables}}},
+                'update': {t: {'set': None} for t in tables},
             }
         elif state.pg_path:
             leaf = {
@@ -92,15 +93,6 @@ class Postgres(Command):
         else:
             return {}
 
-    # TODO fix cache
-    # @functools.lru_cache()
-    def tables(self, ns: str, pg_path: str):
-        session = PostgresSession(ns, pg_path)
-        if session.db:
-            return [f'{t["schema"]}.{t["name"]}' for t in session.tables()]
-
-        return []
-
     def help(self, _: ReplState):
         return f'[{Postgres.COMMAND}] <sql-statements>\t run psql with queries'
 

{kaqing-2.0.40 → kaqing-2.0.42}/adam/commands/preview_table.py

@@ -2,9 +2,9 @@ import functools
 
 from adam.commands.command import Command
 from adam.commands.cql_utils import run_cql, tables
+from adam.commands.postgres.pg_utils import pg_table_names
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.config import Config
-from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import lines_to_tabular, log, log2
 
@@ -72,8 +72,8 @@ class PreviewTable(Command):
 
     def completion(self, state: ReplState):
         if state.device == ReplState.P:
-            if tables := PreviewTable.pg_tables(state.namespace, state.pg_path):
-                return {PreviewTable.COMMAND: {db["name"]: None for db in tables if db["schema"] == PostgresSession.default_schema()}}
+            if tables := pg_table_names(state.namespace, state.pg_path):
+                return {PreviewTable.COMMAND: {table: None for table in tables}}
         elif state.sts:
             tables = PreviewTable.cql_tables(state)
             return {PreviewTable.COMMAND: {f'{k}.{t}': None for k, ts in tables.items() for t in ts}}
@@ -88,18 +88,4 @@ class PreviewTable(Command):
         if state.pod:
             return tables(state)
 
-        return tables(state, on_any=True)
-
-        # r: list[PodExecResult] = run_cql(state, 'describe tables', show_out=False, on_any=True)
-        # if not r:
-        #     return []
-
-        # return parse_cql_desc_tables(r[0].stdout)
-
-    @functools.lru_cache()
-    def pg_tables(ns: str, pg_path: str):
-        pg = PostgresSession(ns, pg_path)
-        if pg.db:
-            return pg.tables()
-
-        return None
+        return tables(state, on_any=True)

kaqing-2.0.42/adam/version.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__version__ = "2.0.42"  #: the working version
+__release__ = "1.0.0"  #: the release version

{kaqing-2.0.40 → kaqing-2.0.42}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.40 → kaqing-2.0.42}/kaqing.egg-info/SOURCES.txt

@@ -106,6 +106,7 @@ adam/commands/medusa/medusa_restore.py
 adam/commands/medusa/medusa_show_backupjobs.py
 adam/commands/medusa/medusa_show_restorejobs.py
 adam/commands/postgres/__init__.py
+adam/commands/postgres/pg_utils.py
 adam/commands/postgres/postgres.py
 adam/commands/postgres/postgres_ls.py
 adam/commands/postgres/postgres_preview.py

{kaqing-2.0.40 → kaqing-2.0.42}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='kaqing',
-    version='2.0.40',
+    version='2.0.42',
     packages=find_packages(),
     entry_points={
         'console_scripts': [

kaqing-2.0.40/adam/version.py

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-__version__ = "2.0.40"  #: the working version
-__release__ = "1.0.0"  #: the release version