kaqing 2.0.88__py3-none-any.whl → 2.0.90__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of kaqing might be problematic. Click here for more details.
- adam/commands/bash.py +6 -6
- adam/commands/cql/cql_utils.py +4 -1
- adam/commands/nodetool.py +4 -1
- adam/embedded_params.py +1 -1
- adam/k8s_utils/cassandra_clusters.py +3 -4
- adam/k8s_utils/cassandra_nodes.py +2 -2
- adam/k8s_utils/pods.py +14 -6
- adam/k8s_utils/secrets.py +2 -0
- adam/repl.py +4 -1
- adam/sql/state_machine.py +17 -7
- adam/version.py +1 -1
- {kaqing-2.0.88.dist-info → kaqing-2.0.90.dist-info}/METADATA +1 -1
- {kaqing-2.0.88.dist-info → kaqing-2.0.90.dist-info}/RECORD +16 -16
- {kaqing-2.0.88.dist-info → kaqing-2.0.90.dist-info}/WHEEL +0 -0
- {kaqing-2.0.88.dist-info → kaqing-2.0.90.dist-info}/entry_points.txt +0 -0
- {kaqing-2.0.88.dist-info → kaqing-2.0.90.dist-info}/top_level.txt +0 -0
adam/commands/bash.py
CHANGED
|
@@ -38,8 +38,7 @@ class Bash(Command):
|
|
|
38
38
|
|
|
39
39
|
return r
|
|
40
40
|
else:
|
|
41
|
-
|
|
42
|
-
command = f'bash -c "{a}"'
|
|
41
|
+
command = ' '.join(args)
|
|
43
42
|
|
|
44
43
|
if state.pod:
|
|
45
44
|
CassandraNodes.exec(state.pod, state.namespace, command, show_out=True)
|
|
@@ -65,15 +64,16 @@ class Bash(Command):
|
|
|
65
64
|
if pwd := state.bash_session.pwd(state):
|
|
66
65
|
args = ['cd', pwd, '&&'] + args
|
|
67
66
|
|
|
68
|
-
|
|
69
|
-
command = f'bash -c "{a}"'
|
|
67
|
+
command = ' '.join(args)
|
|
70
68
|
|
|
71
69
|
rs = []
|
|
72
70
|
|
|
73
71
|
if state.pod:
|
|
74
|
-
rs = [CassandraNodes.exec(state.pod, state.namespace, command,
|
|
72
|
+
rs = [CassandraNodes.exec(state.pod, state.namespace, command,
|
|
73
|
+
show_out=not session_just_created, shell='bash')]
|
|
75
74
|
elif state.sts:
|
|
76
|
-
rs = CassandraClusters.exec(state.sts, state.namespace, command, action='bash',
|
|
75
|
+
rs = CassandraClusters.exec(state.sts, state.namespace, command, action='bash',
|
|
76
|
+
show_out=not session_just_created, shell='bash')
|
|
77
77
|
|
|
78
78
|
return rs
|
|
79
79
|
|
adam/commands/cql/cql_utils.py
CHANGED
|
@@ -11,7 +11,10 @@ from adam.utils import log2
|
|
|
11
11
|
|
|
12
12
|
@functools.lru_cache()
|
|
13
13
|
def keyspaces(state: ReplState, on_any=False):
|
|
14
|
-
|
|
14
|
+
if state.pod:
|
|
15
|
+
Config().wait_log(f'Inspecting Cassandra Keyspaces on {state.pod}...')
|
|
16
|
+
else:
|
|
17
|
+
Config().wait_log(f'Inspecting Cassandra Keyspaces...')
|
|
15
18
|
|
|
16
19
|
r: list[PodExecResult] = run_cql(state, 'describe keyspaces', show_out=False, on_any=on_any)
|
|
17
20
|
if not r:
|
adam/commands/nodetool.py
CHANGED
|
@@ -7,7 +7,7 @@ from adam.config import Config
|
|
|
7
7
|
from adam.k8s_utils.cassandra_clusters import CassandraClusters
|
|
8
8
|
from adam.k8s_utils.cassandra_nodes import CassandraNodes
|
|
9
9
|
from adam.repl_state import ReplState, RequiredState
|
|
10
|
-
from adam.utils import log
|
|
10
|
+
from adam.utils import log, random_alphanumeric
|
|
11
11
|
|
|
12
12
|
class NodeTool(Command):
|
|
13
13
|
COMMAND = 'nodetool'
|
|
@@ -36,6 +36,9 @@ class NodeTool(Command):
|
|
|
36
36
|
return state
|
|
37
37
|
|
|
38
38
|
user, pw = state.user_pass()
|
|
39
|
+
# if args and args[len(args) - 1] == '&':
|
|
40
|
+
# command = f'bash -c "nohup nodetool -u {user} -pw {pw} {" ".join(args[:-1])} &> /tmp/qing-{random_alphanumeric(6)}.log &"'
|
|
41
|
+
# else:
|
|
39
42
|
command = f"nodetool -u {user} -pw {pw} {' '.join(args)}"
|
|
40
43
|
|
|
41
44
|
if state.pod:
|
adam/embedded_params.py
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
def config():
|
|
2
|
-
return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results'}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster':
|
|
2
|
+
return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results'}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': 'cluster'}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
from collections.abc import Callable
|
|
2
1
|
from concurrent.futures import ThreadPoolExecutor
|
|
3
2
|
import sys
|
|
4
3
|
from typing import TypeVar
|
|
5
4
|
|
|
6
|
-
from adam.config import Config
|
|
7
5
|
from adam.k8s_utils.cassandra_nodes import CassandraNodes
|
|
8
6
|
from adam.pod_exec_result import PodExecResult
|
|
9
7
|
from adam.utils import log2
|
|
@@ -15,10 +13,11 @@ T = TypeVar('T')
|
|
|
15
13
|
|
|
16
14
|
# utility collection on cassandra clusters; methods are all static
|
|
17
15
|
class CassandraClusters:
|
|
18
|
-
def exec(statefulset: str, namespace: str, command: str, action: str = 'action',
|
|
16
|
+
def exec(statefulset: str, namespace: str, command: str, action: str = 'action',
|
|
17
|
+
max_workers=0, show_out=True, on_any = False, shell = '/bin/sh') -> list[PodExecResult]:
|
|
19
18
|
def body(executor: ThreadPoolExecutor, pod: str, namespace: str, show_out: bool):
|
|
20
19
|
if executor:
|
|
21
|
-
return executor.submit(CassandraNodes.exec, pod, namespace, command, False, False,)
|
|
20
|
+
return executor.submit(CassandraNodes.exec, pod, namespace, command, False, False, shell)
|
|
22
21
|
|
|
23
22
|
return CassandraNodes.exec(pod, namespace, command, show_out=show_out)
|
|
24
23
|
|
|
@@ -5,8 +5,8 @@ from adam.pod_exec_result import PodExecResult
|
|
|
5
5
|
|
|
6
6
|
# utility collection on cassandra nodes; methods are all static
|
|
7
7
|
class CassandraNodes:
|
|
8
|
-
def exec(pod_name: str, namespace: str, command: str, show_out = True, throw_err = False) -> PodExecResult:
|
|
9
|
-
return Pods.exec(pod_name, "cassandra", namespace, command, show_out, throw_err)
|
|
8
|
+
def exec(pod_name: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh') -> PodExecResult:
|
|
9
|
+
return Pods.exec(pod_name, "cassandra", namespace, command, show_out = show_out, throw_err = throw_err, shell = shell)
|
|
10
10
|
|
|
11
11
|
def get_host_id(pod_name: str, ns: str):
|
|
12
12
|
try:
|
adam/k8s_utils/pods.py
CHANGED
|
@@ -10,7 +10,7 @@ from kubernetes.stream.ws_client import ERROR_CHANNEL
|
|
|
10
10
|
from adam.config import Config
|
|
11
11
|
from adam.k8s_utils.volumes import ConfigMapMount
|
|
12
12
|
from adam.pod_exec_result import PodExecResult
|
|
13
|
-
from adam.utils import elapsed_time, log2
|
|
13
|
+
from adam.utils import elapsed_time, log2, random_alphanumeric
|
|
14
14
|
from .kube_context import KubeContext
|
|
15
15
|
|
|
16
16
|
T = TypeVar('T')
|
|
@@ -93,7 +93,8 @@ class Pods:
|
|
|
93
93
|
|
|
94
94
|
return results
|
|
95
95
|
|
|
96
|
-
def exec(pod_name: str, container: str, namespace: str, command: str, show_out = True, throw_err = False,
|
|
96
|
+
def exec(pod_name: str, container: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh',
|
|
97
|
+
interaction: Callable[[any, list[str]], any] = None):
|
|
97
98
|
if _TEST_POD_EXEC_OUTS:
|
|
98
99
|
return _TEST_POD_EXEC_OUTS
|
|
99
100
|
|
|
@@ -101,8 +102,15 @@ class Pods:
|
|
|
101
102
|
|
|
102
103
|
api = client.CoreV1Api()
|
|
103
104
|
|
|
104
|
-
|
|
105
|
-
|
|
105
|
+
tty = True
|
|
106
|
+
exec_command = [shell, '-c', command]
|
|
107
|
+
if command.endswith(' &'):
|
|
108
|
+
command = f"nohup {command.strip(' &')} > /tmp/qing-{random_alphanumeric(6)}.log 2>&1 &"
|
|
109
|
+
exec_command = [shell, '-c', command]
|
|
110
|
+
# should be false for starting a backgroud process
|
|
111
|
+
tty = False
|
|
112
|
+
|
|
113
|
+
k_command = f'kubectl exec {pod_name} -c {container} -n {namespace} -- {shell} -c "{command}"'
|
|
106
114
|
if show_out:
|
|
107
115
|
print(k_command)
|
|
108
116
|
|
|
@@ -115,7 +123,7 @@ class Pods:
|
|
|
115
123
|
stderr=True,
|
|
116
124
|
stdin=True,
|
|
117
125
|
stdout=True,
|
|
118
|
-
tty=
|
|
126
|
+
tty=tty,
|
|
119
127
|
_preload_content=False,
|
|
120
128
|
)
|
|
121
129
|
|
|
@@ -140,7 +148,7 @@ class Pods:
|
|
|
140
148
|
try:
|
|
141
149
|
# get the exit code from server
|
|
142
150
|
error_output = resp.read_channel(ERROR_CHANNEL)
|
|
143
|
-
except Exception:
|
|
151
|
+
except Exception as e:
|
|
144
152
|
pass
|
|
145
153
|
except Exception as e:
|
|
146
154
|
if throw_err:
|
adam/k8s_utils/secrets.py
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import base64
|
|
2
|
+
import functools
|
|
2
3
|
import re
|
|
3
4
|
from typing import cast
|
|
4
5
|
from kubernetes import client
|
|
@@ -9,6 +10,7 @@ from adam.utils import log2
|
|
|
9
10
|
|
|
10
11
|
# utility collection on secrets; methods are all static
|
|
11
12
|
class Secrets:
|
|
13
|
+
@functools.lru_cache()
|
|
12
14
|
def list_secrets(namespace: str = None, name_pattern: str = None):
|
|
13
15
|
Config().wait_log('Inspecting Cassandra Instances...')
|
|
14
16
|
|
adam/repl.py
CHANGED
|
@@ -69,13 +69,16 @@ def enter_repl(state: ReplState):
|
|
|
69
69
|
Log.log2(f'kaqing {__version__}')
|
|
70
70
|
|
|
71
71
|
if state.device == ReplState.C:
|
|
72
|
+
auto_enter = Config().get('repl.auto-enter-only-cluster', 'cluster')
|
|
72
73
|
ss = StatefulSets.list_sts_name_and_ns()
|
|
73
74
|
if not ss:
|
|
74
75
|
raise Exception("no Cassandra clusters found")
|
|
75
|
-
elif not state.sts and len(ss) == 1 and
|
|
76
|
+
elif not state.sts and len(ss) == 1 and auto_enter in ['cluster', 'first-pod']:
|
|
76
77
|
cluster = ss[0]
|
|
77
78
|
state.sts = cluster[0]
|
|
78
79
|
state.namespace = cluster[1]
|
|
80
|
+
if auto_enter == 'first-pod':
|
|
81
|
+
state.pod = f'{state.sts}-0'
|
|
79
82
|
if KubeContext().in_cluster_namespace:
|
|
80
83
|
Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}...')
|
|
81
84
|
else:
|
adam/sql/state_machine.py
CHANGED
|
@@ -138,7 +138,7 @@ SPEC = [
|
|
|
138
138
|
'- > ( > select_from_lp_',
|
|
139
139
|
'- < ) > select_from_sq',
|
|
140
140
|
'select_from_lp_ > select > select',
|
|
141
|
-
'select_from_x > , > select_from_x_comma_',
|
|
141
|
+
'select_from_x > , > select_from_x_comma_ ^ (select,tables',
|
|
142
142
|
'select_from_sq_ > as > select_from_x_as ^ as',
|
|
143
143
|
'select_from_x_comma_ > name > select_from_x ^ tables',
|
|
144
144
|
'select_from_x_ ^ as,where,inner join,left outer join,right outer join,full outer join,group by,order by,limit',
|
|
@@ -164,7 +164,8 @@ SPEC = [
|
|
|
164
164
|
'select_from_x_as_x > , > select_from_x_as_x_comma_',
|
|
165
165
|
'select_from_x_as_x_comma_ > name > select_from_x ^ tables',
|
|
166
166
|
'select_where_ > name > select_where_a ^ columns',
|
|
167
|
-
'select_where_a >
|
|
167
|
+
'select_where_a > name > select_where_a ^ columns,=,<,<=,>,>=,<>',
|
|
168
|
+
'- > comparison > select_where_a_op',
|
|
168
169
|
'select_where_a_ > comparison > select_where_a_op ^ =,<,<=,>,>=,<>,like,not,in',
|
|
169
170
|
'- > not > select_where_a_not',
|
|
170
171
|
'- > in > select_where_a_in',
|
|
@@ -187,14 +188,16 @@ SPEC = [
|
|
|
187
188
|
'- > limit > select_where_sc_limit',
|
|
188
189
|
'select_group_ > by > select_group_by ^ by',
|
|
189
190
|
'select_group_by_ > name > select_group_by_a ^ columns',
|
|
190
|
-
'select_group_by_a >
|
|
191
|
+
'select_group_by_a > name > select_group_by_a ^ columns',
|
|
192
|
+
'- > , > select_group_by_a_comma_ ^ columns',
|
|
191
193
|
'select_group_by_a_comma_ > name > select_group_by_a ^ columns',
|
|
192
194
|
'select_group_by_a_ > limit > select_where_sc_limit ^ limit,order by',
|
|
193
195
|
'- > order > select_order',
|
|
194
196
|
'- > order by > select_order_by',
|
|
195
197
|
'select_order_ > by > select_order_by ^ by',
|
|
196
198
|
'select_order_by_ > name > select_order_by_a ^ columns',
|
|
197
|
-
'select_order_by_a >
|
|
199
|
+
'select_order_by_a > name > select_order_by_a ^ columns',
|
|
200
|
+
'- > , > select_order_by_a_comma_',
|
|
198
201
|
'select_order_by_a_comma_ > name > select_order_by_a ^ columns',
|
|
199
202
|
'select_order_by_a_ > desc|asc > select_order_by_a_desc ^ desc,asc,limit',
|
|
200
203
|
'- > limit > select_where_sc_limit',
|
|
@@ -213,20 +216,25 @@ SPEC = [
|
|
|
213
216
|
'select_from_x_full_ > join > select_join ^ outer join',
|
|
214
217
|
'- > outer > select_from_x_full_outer',
|
|
215
218
|
'select_from_x_full_outer_ > join > select_join ^ join',
|
|
219
|
+
'select_x_join_y > name > select_x_join_y ^ tables',
|
|
216
220
|
'select_x_join_y_ > as > select_x_join_y_as ^ as,on',
|
|
217
221
|
'- > on > select_x_join_y_on ^ as,on',
|
|
218
222
|
'select_x_join_y_as_ > name > select_x_join_y_as_y ^ x,y,z',
|
|
219
223
|
'select_x_join_y_as_y_ > on > select_x_join_y_on ^ on',
|
|
220
224
|
'select_x_join_y_on_ > name > select_x_join_y_on_a ^ columns',
|
|
221
|
-
'select_x_join_y_on_a >
|
|
225
|
+
'select_x_join_y_on_a > name > select_x_join_y_on_a ^ columns,=',
|
|
226
|
+
'- > comparison > select_x_join_y_on_a_op',
|
|
227
|
+
'select_x_join_y_on_a_ > comparison > select_x_join_y_on_a_op ^ =',
|
|
222
228
|
'select_x_join_y_on_a_op > name > select_x_join_y_on_a_op_b ^ columns',
|
|
223
|
-
'select_x_join_y_on_a_op_b >
|
|
229
|
+
'select_x_join_y_on_a_op_b > name > select_x_join_y_on_a_op_b ^ columns',
|
|
230
|
+
'- > _ > select_from_x_as_x_',
|
|
224
231
|
|
|
225
232
|
|
|
226
233
|
' > insert > insert',
|
|
227
234
|
'insert_ > into > insert_into ^ into',
|
|
228
235
|
'insert_into_ > name > insert_into_x ^ tables',
|
|
229
|
-
'insert_into_x >
|
|
236
|
+
'insert_into_x > name > insert_into_x ^ tables',
|
|
237
|
+
'- > ( > insert_into_x_lp_',
|
|
230
238
|
'insert_into_x_ > ( > insert_into_x_lp_ ^ (,values(',
|
|
231
239
|
'- > values > insert_values',
|
|
232
240
|
'insert_into_x_lp_ > name > insert_into_x_lp_a ^ id',
|
|
@@ -243,6 +251,7 @@ SPEC = [
|
|
|
243
251
|
|
|
244
252
|
' > update > update',
|
|
245
253
|
'update_ > name > update_x ^ tables',
|
|
254
|
+
'update_x > name > update_x ^ tables',
|
|
246
255
|
'update_x_ > set > update_set ^ set',
|
|
247
256
|
'update_set_ > name > update_set_a ^ id',
|
|
248
257
|
'update_set_a > comparison > update_set_a_op',
|
|
@@ -273,6 +282,7 @@ SPEC = [
|
|
|
273
282
|
' > delete > delete',
|
|
274
283
|
'delete_ > from > delete_from ^ from',
|
|
275
284
|
'delete_from_ > name > delete_from_x ^ tables',
|
|
285
|
+
'delete_from_x > name > delete_from_x ^ tables',
|
|
276
286
|
'delete_from_x_ > where > update_where ^ where',
|
|
277
287
|
]
|
|
278
288
|
|
adam/version.py
CHANGED
|
@@ -6,17 +6,17 @@ adam/cli.py,sha256=03pIZdomAu7IL-GSP6Eun_PKwwISShRAmfx6eVRPGC0,458
|
|
|
6
6
|
adam/cli_group.py,sha256=W3zy1BghCtVcEXizq8fBH-93ZRVVwgAyGPzy0sHno1Y,593
|
|
7
7
|
adam/config.py,sha256=hDxd86MbKVVKoHhTT077L3YRKYcr0i6xVADLlnoE684,2818
|
|
8
8
|
adam/embedded_apps.py,sha256=lKPx63mKzJbNmwz0rgL4gF76M9fDGxraYTtNAIGnZ_s,419
|
|
9
|
-
adam/embedded_params.py,sha256=
|
|
9
|
+
adam/embedded_params.py,sha256=8cU8DqpQHIiSjO-pAfgLaW1ANAdNTgTv8QSvb77Mm-w,4883
|
|
10
10
|
adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
|
|
11
11
|
adam/pod_exec_result.py,sha256=nq0xnCNOpUGBSijGF0H-YNrwBc9vUQs4DkvLMIFS5LQ,951
|
|
12
|
-
adam/repl.py,sha256=
|
|
12
|
+
adam/repl.py,sha256=G2d9cMZfYQ7BMABCNXgc4RSdRhAPBhS5h3hFENTGRVM,9559
|
|
13
13
|
adam/repl_commands.py,sha256=1AFE8AJoyQdJd0tlcwtMnwMjV5G7jL9MDkxJZxdo150,4963
|
|
14
14
|
adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
|
|
15
15
|
adam/repl_state.py,sha256=dXyGlWXcSsfCjrYwMhU44PVn_oThSZ8dhJ5HCVE8-qU,8743
|
|
16
16
|
adam/utils.py,sha256=sbsNZP3qGJtb6fXCa4dDXHry5ay9ev583cCZIQzy07s,7382
|
|
17
17
|
adam/utils_athena.py,sha256=tU6Arg4g7eKV6ei9SLgakOJJqxKgSCsII-7a68OI7_g,3199
|
|
18
18
|
adam/utils_net.py,sha256=65fhBnWMCkhGtyHqz95qcHaCo35q-WX1RBkkXG8dKpI,416
|
|
19
|
-
adam/version.py,sha256=
|
|
19
|
+
adam/version.py,sha256=dStZ59098mf_UWHFkmUqK-rky6vPPSJXowMTw3phCU8,139
|
|
20
20
|
adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
21
21
|
adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
|
|
22
22
|
adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
|
|
@@ -52,7 +52,7 @@ adam/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
|
52
52
|
adam/commands/alter_tables.py,sha256=Q5vXHE4_1_6v6wtYwqST7_QwpXINb1xq0Sm448Z2Y7Q,3582
|
|
53
53
|
adam/commands/app.py,sha256=7alV8wK801t67_rUe6EmhtHJTl-6K7fGCm6Uz1dDgpM,1963
|
|
54
54
|
adam/commands/app_ping.py,sha256=Xk7cfefphXM2w-UvpnhNUTZ3BU38f0deehUb2FEyLCI,1337
|
|
55
|
-
adam/commands/bash.py,sha256=
|
|
55
|
+
adam/commands/bash.py,sha256=rWYY_dZ0ZaEsAHLVorCD5gPckjkKWH-o6dT4VmKDzmA,2758
|
|
56
56
|
adam/commands/cd.py,sha256=GyNyJnbxX7afrk7xwvXDhEtSdWnAgnz0dpDJXO2dO7w,4728
|
|
57
57
|
adam/commands/check.py,sha256=853FPfgTMGxQXI_5UaPAtzaSWB_BvEVm48EkJhsHe4w,2181
|
|
58
58
|
adam/commands/cli_commands.py,sha256=PEEyrG9yz7RAEZwHbbuFpyE3fVi8vrIWbr0d1H0Gp9o,3620
|
|
@@ -67,7 +67,7 @@ adam/commands/issues.py,sha256=VS-PC7e-2lywsa-lbmoUX8IY77OPGzFudwbw1g8XmQc,2599
|
|
|
67
67
|
adam/commands/login.py,sha256=bj95WWIF7mJDJhnyS9T8xvaZUGL37dj7GlH8TgmODbk,1877
|
|
68
68
|
adam/commands/logs.py,sha256=T-O9DYXmWEm4G1I5SM6MwyeRwq2aT-WMqNW0XA2MWmo,1165
|
|
69
69
|
adam/commands/ls.py,sha256=aNBIoUUCFxWMJ9O6IV6qbw5XRHmaQqOD6dgjMf9EWkU,5766
|
|
70
|
-
adam/commands/nodetool.py,sha256=
|
|
70
|
+
adam/commands/nodetool.py,sha256=Dg18JTaqWpWzY_nbsEbTRQeLIje9EpLLmNbfsb-VQBg,2558
|
|
71
71
|
adam/commands/nodetool_commands.py,sha256=5IgWC3rmeDD1cgwqQjiiWzi-wJpJ3n_8pAzz_9phXuk,2635
|
|
72
72
|
adam/commands/param_get.py,sha256=kPAAppK2T0tEFRnSIVFLDPIIGHhgLA7drJhn8TRyvvE,1305
|
|
73
73
|
adam/commands/param_set.py,sha256=QDIuqfU80aWCB16OK49yf7XRaRTWwiLkwMsJuVikq9I,1271
|
|
@@ -84,7 +84,7 @@ adam/commands/audit/audit_repair_tables.py,sha256=5Glsy29md3KH_4_smuVBeu6c4zygIC
|
|
|
84
84
|
adam/commands/cql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
85
85
|
adam/commands/cql/cql_completions.py,sha256=dXe51NTWEJis76587IWSn9Av-cjC0J6KMaxlBKfF4wM,411
|
|
86
86
|
adam/commands/cql/cql_table_completer.py,sha256=Tth6lmZ1eCEbJeAVZojTx594ttQeeVf-OjhhkSLyRnI,312
|
|
87
|
-
adam/commands/cql/cql_utils.py,sha256=
|
|
87
|
+
adam/commands/cql/cql_utils.py,sha256=yEH5QTB-PvPxO7Y5Ky800mAvLVjAcIHM7mOsAY7Hkqo,4005
|
|
88
88
|
adam/commands/cql/cqlsh.py,sha256=qEQufaDVi9FXkvruum6OHQDfLX01DVWVDnWsAjyCZYQ,2661
|
|
89
89
|
adam/commands/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
90
90
|
adam/commands/deploy/code_start.py,sha256=-iH8HThTNM83IfBxT_LqTByuHVatV9d-Il4OYOfrwLI,1370
|
|
@@ -155,23 +155,23 @@ adam/commands/show/show_processes.py,sha256=jAesWDD_l0T6ql6LawnGpev-Glz21tFkegtC
|
|
|
155
155
|
adam/commands/show/show_repairs.py,sha256=qpbyeRyLPyBWmn_4yxFu8KIjfd58HGry5pvqNyMwn5I,1477
|
|
156
156
|
adam/commands/show/show_storage.py,sha256=LUTkH_qnc1d9s4jKsps8jhB4rkUuN7ifMlHSwFqd8_c,1837
|
|
157
157
|
adam/k8s_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
158
|
-
adam/k8s_utils/cassandra_clusters.py,sha256=
|
|
159
|
-
adam/k8s_utils/cassandra_nodes.py,sha256=
|
|
158
|
+
adam/k8s_utils/cassandra_clusters.py,sha256=JAUTix4fxDn3AJ64Nayxs7QVTu4lZhJ5-7G8h-ufJvs,1400
|
|
159
|
+
adam/k8s_utils/cassandra_nodes.py,sha256=R1sBxetbA2zQlVBWgfRnvF8onQ1Ug3h3yrHl_K_pJR4,1176
|
|
160
160
|
adam/k8s_utils/config_maps.py,sha256=vc9A-2D1-1mindCMFL1wuysDOXb0RCl4BdjC6B6usXI,1194
|
|
161
161
|
adam/k8s_utils/custom_resources.py,sha256=cIeaZRQET2DelTGU2f5QsMckh7TddPpWZDFeNK3txeQ,7647
|
|
162
162
|
adam/k8s_utils/deployment.py,sha256=3oZPfPgQfqtAQaxEFL4daUfRSieRAhysmuaWMzUYgXk,2921
|
|
163
163
|
adam/k8s_utils/ingresses.py,sha256=ul3Z6fDGc_Cxcn-ExP0vXhZatoShCUZFtpwtCY4Qx7o,3460
|
|
164
164
|
adam/k8s_utils/jobs.py,sha256=gJpBpjcZ_FlkWJJIlavbHC_bqdmvv-GMVo8UZVh0sOQ,2610
|
|
165
165
|
adam/k8s_utils/kube_context.py,sha256=xJF_72vUJu-X9MpIYzOIfnj7KEWU7a_sLBR-H3994Y0,3311
|
|
166
|
-
adam/k8s_utils/pods.py,sha256=
|
|
167
|
-
adam/k8s_utils/secrets.py,sha256=
|
|
166
|
+
adam/k8s_utils/pods.py,sha256=yJSQ22Ah5HICGz_3nX82PnMd_NQmEKL2uiil7UUCnvg,10899
|
|
167
|
+
adam/k8s_utils/secrets.py,sha256=tBSKLknHlwdwyTzqvtJ2YS-y9x4gvW57Ug9sOkK_U50,2413
|
|
168
168
|
adam/k8s_utils/service_accounts.py,sha256=v2oQSqCrNvt2uRnKlNwR3fjtpUG7oF5nqgzEB7NnT-U,6349
|
|
169
169
|
adam/k8s_utils/services.py,sha256=EOJJGACVbbRvu5T3rMKqIJqgYic1_MSJ17EA0TJ6UOk,3156
|
|
170
170
|
adam/k8s_utils/statefulsets.py,sha256=5g7KxGRHgEewT8rnZneDTaJDylUf-dHH2edWJEoorr8,4667
|
|
171
171
|
adam/k8s_utils/volumes.py,sha256=RIBmlOSWM3V3QVXLCFT0owVOyh4rGG1ETp521a-6ndo,1137
|
|
172
172
|
adam/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
173
173
|
adam/sql/sql_completer.py,sha256=zH2I-WLc7aZmdIg0PlHPVLdxemI8oN8YTCnG7qxcYqA,2907
|
|
174
|
-
adam/sql/state_machine.py,sha256=
|
|
174
|
+
adam/sql/state_machine.py,sha256=3QMs13F6dDr6FHYkZP7l8TP0P6wkS__Q6CoD0seBDug,25598
|
|
175
175
|
adam/sql/term_completer.py,sha256=bNnHAVf9NZl52xS_BQpikbOK39gDBJADnT9gSvG0iqI,2539
|
|
176
176
|
adam/sso/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
177
177
|
adam/sso/authenticator.py,sha256=BCm16L9zf5aLU47-sTCnudn2zLPwd8M2wwRminJfsqw,615
|
|
@@ -183,8 +183,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
|
|
|
183
183
|
adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
|
|
184
184
|
adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
|
|
185
185
|
adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
|
|
186
|
-
kaqing-2.0.
|
|
187
|
-
kaqing-2.0.
|
|
188
|
-
kaqing-2.0.
|
|
189
|
-
kaqing-2.0.
|
|
190
|
-
kaqing-2.0.
|
|
186
|
+
kaqing-2.0.90.dist-info/METADATA,sha256=w8dvYIlxOzFg4n3BdjV-4TnraXPWSByTyEfF5RnP6Fg,132
|
|
187
|
+
kaqing-2.0.90.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
|
|
188
|
+
kaqing-2.0.90.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
|
|
189
|
+
kaqing-2.0.90.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
|
|
190
|
+
kaqing-2.0.90.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|