kaqing 2.0.96__tar.gz → 2.0.97__tar.gz

{kaqing-2.0.96 → kaqing-2.0.97}/PKG-INFO

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

{kaqing-2.0.96 → kaqing-2.0.97}/adam/batch.py

@@ -107,7 +107,7 @@ def deploy(kubeconfig: str, config: str, param: list[str], namespace: str, extra
 @click.option('--all-nodes', '-a', is_flag=True, help='execute on all Cassandra nodes')
 @click.argument('extra_args', nargs=-1, metavar='<cluster|pod>', type=click.UNPROCESSED)
 def describe(kubeconfig: str, config: str, param: list[str], cluster: str, namespace: str, pod: str, all_nodes: bool, extra_args):
-    run_command(Describe(), kubeconfig, config, param, cluster, namespace, pod, ('--all-nodes',) + extra_args if all_nodes else extra_args)
+    run_command(Describe(), kubeconfig, config, param, cluster, namespace, pod, extra_args + ('&',) if all_nodes else extra_args)
 
 
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterOrPodCommandHelper, help="Print Qing's issues.")

{kaqing-2.0.96 → kaqing-2.0.97}/adam/commands/cql/cql_utils.py

@@ -42,6 +42,9 @@ def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, use_s
     else:
         command = f'cqlsh -u {user} -p {pw} {" ".join(opts)} -e "{cql}"'
 
+    if not on_any:
+        command = f'{command} &'
+
     if state.pod:
         return CassandraNodes.exec(state.pod, state.namespace, command, show_out=show_out)
     else:

{kaqing-2.0.96 → kaqing-2.0.97}/adam/commands/describe/describe.py

@@ -3,6 +3,7 @@ import click
 from adam.commands.command import Command
 from adam.commands.describe.describe_keyspace import DescribeKeyspace
 from adam.commands.describe.describe_keyspaces import DescribeKeyspaces
+from adam.commands.describe.describe_schema import DescribeSchema
 from adam.commands.describe.describe_table import DescribeTable
 from adam.commands.describe.describe_tables import DescribeTables
 from adam.repl_state import ReplState, RequiredState
@@ -33,7 +34,7 @@ class Describe(Command):
         return super().intermediate_run(cmd, state, args, Describe.cmd_list())
 
     def cmd_list():
-        return [DescribeKeyspace(), DescribeKeyspaces(), DescribeTable(), DescribeTables()]
+        return [DescribeKeyspace(), DescribeKeyspaces(), DescribeSchema(), DescribeTable(), DescribeTables()]
 
     def completion(self, state: ReplState):
         if state.sts:

{kaqing-2.0.96 → kaqing-2.0.97}/adam/commands/describe/describe_keyspace.py

@@ -30,7 +30,7 @@ class DescribeKeyspace(Command):
         if not self.validate_state(state):
             return state
 
-        args, all_nodes = Command.extract_options(args, '--all-nodes')
+        args, all_nodes = Command.extract_options(args, '&')
 
         if not args:
             if state.in_repl:
@@ -52,9 +52,9 @@ class DescribeKeyspace(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts:
-            return super().completion(state, {ks: {'--all-nodes': None} for ks in keyspaces(state, on_any=True)})
+            return super().completion(state, {ks: {'&': None} for ks in keyspaces(state, on_any=True)})
 
         return {}
 
     def help(self, _: ReplState) -> str:
-        return f'{DescribeKeyspace.COMMAND} <keyspace-name> [--all-nodes]\t describe Cassandra keyspace'
+        return f'{DescribeKeyspace.COMMAND} <keyspace-name> [&]\t describe Cassandra keyspace'

{kaqing-2.0.96 → kaqing-2.0.97}/adam/commands/describe/describe_keyspaces.py

@@ -30,9 +30,8 @@ class DescribeKeyspaces(Command):
         if not self.validate_state(state):
             return state
 
-        _, all_nodes = Command.extract_options(args, '--all-nodes')
-
-        r: list[PodExecResult] = run_cql(state, f'describe keyspaces', show_out=True, on_any=not all_nodes)
+        args, all_nodes = Command.extract_options(args, '&')
+        r: list[PodExecResult] = run_cql(state, f'{DescribeKeyspaces.COMMAND} {" ".join(args)}', show_out=True, on_any=not all_nodes)
         if not r:
             log2('No pod is available')
             return 'no-pod'
@@ -42,9 +41,9 @@ class DescribeKeyspaces(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts:
-            return super().completion(state, {'--all-nodes': None})
+            return super().completion(state, {'&': None})
 
         return {}
 
     def help(self, _: ReplState) -> str:
-        return f'{DescribeKeyspaces.COMMAND} [--all-nodes]\t describe Cassandra keyspaces'
+        return f'{DescribeKeyspaces.COMMAND} [&]\t describe Cassandra keyspaces'

kaqing-2.0.97/adam/commands/describe/describe_schema.py

@@ -0,0 +1,49 @@
+from adam.commands.command import Command
+from adam.commands.cql.cql_utils import run_cql
+from adam.pod_exec_result import PodExecResult
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class DescribeSchema(Command):
+    COMMAND = 'describe schema'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DescribeSchema, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def required(self):
+        return RequiredState.CLUSTER
+
+    def command(self):
+        return DescribeSchema.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        state, args = self.apply_state(args, state)
+        if not self.validate_state(state):
+            return state
+
+        args, all_nodes = Command.extract_options(args, '&')
+        r: list[PodExecResult] = run_cql(state, f'{DescribeSchema.COMMAND} {" ".join(args)}', show_out=True, on_any=not all_nodes)
+        if not r:
+            log2('No pod is available')
+            return 'no-pod'
+
+        # do not continue to cql route
+        return state
+
+    def completion(self, state: ReplState) -> dict[str, any]:
+        if state.sts:
+            return super().completion(state, {'&': None})
+
+        return {}
+
+    def help(self, _: ReplState) -> str:
+        return f'{DescribeSchema.COMMAND} [&]\t describe Cassandra tables'

{kaqing-2.0.96 → kaqing-2.0.97}/adam/commands/describe/describe_table.py

@@ -52,9 +52,9 @@ class DescribeTable(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts:
-            return super().completion(state, {t: {'--all-nodes': None} for t in table_names(state)})
+            return super().completion(state, {t: {'&': None} for t in table_names(state)})
 
         return {}
 
     def help(self, _: ReplState) -> str:
-        return f'{DescribeTable.COMMAND} <table-name> [--all-nodes]\t describe Cassandra table'
+        return f'{DescribeTable.COMMAND} <table-name> [&]\t describe Cassandra table'

{kaqing-2.0.96 → kaqing-2.0.97}/adam/commands/describe/describe_tables.py

@@ -30,9 +30,8 @@ class DescribeTables(Command):
         if not self.validate_state(state):
             return state
 
-        _, all_nodes = Command.extract_options(args, '--all-nodes')
-
-        r: list[PodExecResult] = run_cql(state, f'describe tables', show_out=True, on_any=not all_nodes)
+        args, all_nodes = Command.extract_options(args, '&')
+        r: list[PodExecResult] = run_cql(state, f'{DescribeTables.COMMAND} {" ".join(args)}', show_out=True, on_any=not all_nodes)
         if not r:
             log2('No pod is available')
             return 'no-pod'
@@ -42,9 +41,9 @@ class DescribeTables(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts:
-            return super().completion(state, {'--all-nodes': None})
+            return super().completion(state, {'&': None})
 
         return {}
 
     def help(self, _: ReplState) -> str:
-        return f'{DescribeTables.COMMAND} [--all-nodes]\t describe Cassandra tables'
+        return f'{DescribeTables.COMMAND} [&]\t describe Cassandra tables'

kaqing-2.0.97/adam/version.py

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

{kaqing-2.0.96 → kaqing-2.0.97}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.96 → kaqing-2.0.97}/kaqing.egg-info/SOURCES.txt

@@ -105,6 +105,7 @@ adam/commands/describe/__init__.py
 adam/commands/describe/describe.py
 adam/commands/describe/describe_keyspace.py
 adam/commands/describe/describe_keyspaces.py
+adam/commands/describe/describe_schema.py
 adam/commands/describe/describe_table.py
 adam/commands/describe/describe_tables.py
 adam/commands/medusa/__init__.py

{kaqing-2.0.96 → kaqing-2.0.97}/setup.py

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

kaqing-2.0.96/adam/version.py

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