scylla-cqlsh 6.0.18__tar.gz → 6.0.20__tar.gz

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/.github/workflows/build-push.yml

@@ -69,6 +69,28 @@ jobs:
           pip install -r ./pylib/requirements.txt
           pytest ./cqlshlib/test
 
+  integration_test_scylla_enterprise:
+    name: Integration Tests (Scylla Enterprise)
+    if: "!contains(github.event.pull_request.labels.*.name, 'disable-integration-test')"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Start Scylla
+        run: |
+          export DOCKER_ID=$(docker run -d scylladb/scylla-enterprise:latest --cluster-name test )
+          export CQL_TEST_HOST=$(docker inspect --format='{{ .NetworkSettings.IPAddress }}' ${DOCKER_ID})
+          while ! nc -z ${CQL_TEST_HOST} 9042; do   
+            sleep 0.1 # wait for 1/10 of the second before check again
+          done
+
+          echo "CQL_TEST_HOST=${CQL_TEST_HOST}" >> $GITHUB_ENV
+
+      - name: pytest
+        run: |
+          pip install -r ./pylib/requirements.txt
+          pytest ./cqlshlib/test
+
   integration_test_scylla_cloud_bundle:
     name: Integration Tests (Scylla Cloud Bundle)
     if: "!contains(github.event.pull_request.labels.*.name, 'disable-integration-test')"

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scylla-cqlsh
-Version: 6.0.18
+Version: 6.0.20
 Summary: cqlsh is a Python-based command-line client for running CQL commands on a scylla cluster.
 Home-page: https://github.com/scylladb/scylla-cqlsh
 Author: Israel Fruchter

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/bin/cqlsh.py

@@ -478,7 +478,7 @@ class Shell(cmd.Cmd):
             if protocol_version is not None:
                 kwargs['protocol_version'] = protocol_version
 
-            profiles = {
+            self.profiles = {
                 EXEC_PROFILE_DEFAULT: ExecutionProfile(consistency_level=cassandra.ConsistencyLevel.ONE,
                                                        request_timeout=request_timeout,
                                                        row_factory=ordered_dict_factory)
@@ -487,10 +487,10 @@ class Shell(cmd.Cmd):
             if cloudconf is None:
                 if os.path.exists(self.hostname) and stat.S_ISSOCK(os.stat(self.hostname).st_mode):
                     kwargs['contact_points'] = (UnixSocketEndPoint(self.hostname),)
-                    profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
+                    self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
                 else: 
                     kwargs['contact_points'] = (self.hostname,)
-                    profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([self.hostname])
+                    self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([self.hostname])
                 kwargs['port'] = self.port
                 kwargs['ssl_context'] = sslhandling.ssl_settings(hostname, CONFIG_FILE) if ssl else None
                 # workaround until driver would know not to lose the DNS names for `server_hostname`
@@ -503,7 +503,7 @@ class Shell(cmd.Cmd):
                                 auth_provider=self.auth_provider,
                                 control_connection_timeout=connect_timeout,
                                 connect_timeout=connect_timeout,
-                                execution_profiles=profiles,
+                                execution_profiles=self.profiles,
                                 **kwargs)
         self.owns_connection = not use_conn
 
@@ -1589,7 +1589,10 @@ class Shell(cmd.Cmd):
           where object can be either a keyspace or a table or an index or a materialized
           view (in this order).
         """
-        if self.connection_versions['build'][0] < '4':
+        self._do_describe(parsed, force_client_side_describe=False)
+
+    def _do_describe(self, parsed, force_client_side_describe):
+        if force_client_side_describe:
             what = parsed.matched[1][1].lower()
             if what == 'functions':
                 self.describe_functions_client(self.current_keyspace)
@@ -1665,6 +1668,10 @@ class Shell(cmd.Cmd):
                 elif what:
                     self.describe_element(result)
 
+            except cassandra.protocol.SyntaxException:
+                # Server doesn't support DESCRIBE query, retry with 
+                # client-side DESCRIBE implementation
+                self._do_describe(parsed, force_client_side_describe=True)
             except CQL_ERRORS as err:
                 err_msg = err.message if hasattr(err, 'message') else str(err)
                 self.printerr(err_msg.partition("message=")[2].strip('"'))
@@ -2133,10 +2140,6 @@ class Shell(cmd.Cmd):
             kwargs['port'] = self.port
             kwargs['ssl_context'] = self.conn.ssl_context
             kwargs['ssl_options'] = self.conn.ssl_options
-            if os.path.exists(self.hostname) and stat.S_ISSOCK(os.stat(self.hostname).st_mode):
-                kwargs['load_balancing_policy'] = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
-            else: 
-                kwargs['load_balancing_policy'] = WhiteListRoundRobinPolicy([self.hostname])
         else:
             kwargs['scylla_cloud'] = self.cloudconf
 
@@ -2145,6 +2148,7 @@ class Shell(cmd.Cmd):
                        auth_provider=auth_provider,
                        control_connection_timeout=self.conn.connect_timeout,
                        connect_timeout=self.conn.connect_timeout,
+                       execution_profiles=self.profiles,
                        **kwargs)
 
         if self.current_keyspace:
@@ -2153,9 +2157,6 @@ class Shell(cmd.Cmd):
             session = conn.connect()
 
         # Copy session properties
-        session.default_timeout = self.session.default_timeout
-        session.row_factory = self.session.row_factory
-        session.default_consistency_level = self.session.default_consistency_level
         session.max_trace_wait = self.session.max_trace_wait
 
         # Update after we've connected in case we fail to authenticate

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/cqlsh/cqlsh.py

@@ -478,7 +478,7 @@ class Shell(cmd.Cmd):
             if protocol_version is not None:
                 kwargs['protocol_version'] = protocol_version
 
-            profiles = {
+            self.profiles = {
                 EXEC_PROFILE_DEFAULT: ExecutionProfile(consistency_level=cassandra.ConsistencyLevel.ONE,
                                                        request_timeout=request_timeout,
                                                        row_factory=ordered_dict_factory)
@@ -487,10 +487,10 @@ class Shell(cmd.Cmd):
             if cloudconf is None:
                 if os.path.exists(self.hostname) and stat.S_ISSOCK(os.stat(self.hostname).st_mode):
                     kwargs['contact_points'] = (UnixSocketEndPoint(self.hostname),)
-                    profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
+                    self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
                 else: 
                     kwargs['contact_points'] = (self.hostname,)
-                    profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([self.hostname])
+                    self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([self.hostname])
                 kwargs['port'] = self.port
                 kwargs['ssl_context'] = sslhandling.ssl_settings(hostname, CONFIG_FILE) if ssl else None
                 # workaround until driver would know not to lose the DNS names for `server_hostname`
@@ -503,7 +503,7 @@ class Shell(cmd.Cmd):
                                 auth_provider=self.auth_provider,
                                 control_connection_timeout=connect_timeout,
                                 connect_timeout=connect_timeout,
-                                execution_profiles=profiles,
+                                execution_profiles=self.profiles,
                                 **kwargs)
         self.owns_connection = not use_conn
 
@@ -1589,7 +1589,10 @@ class Shell(cmd.Cmd):
           where object can be either a keyspace or a table or an index or a materialized
           view (in this order).
         """
-        if self.connection_versions['build'][0] < '4':
+        self._do_describe(parsed, force_client_side_describe=False)
+
+    def _do_describe(self, parsed, force_client_side_describe):
+        if force_client_side_describe:
             what = parsed.matched[1][1].lower()
             if what == 'functions':
                 self.describe_functions_client(self.current_keyspace)
@@ -1665,6 +1668,10 @@ class Shell(cmd.Cmd):
                 elif what:
                     self.describe_element(result)
 
+            except cassandra.protocol.SyntaxException:
+                # Server doesn't support DESCRIBE query, retry with 
+                # client-side DESCRIBE implementation
+                self._do_describe(parsed, force_client_side_describe=True)
             except CQL_ERRORS as err:
                 err_msg = err.message if hasattr(err, 'message') else str(err)
                 self.printerr(err_msg.partition("message=")[2].strip('"'))
@@ -2133,10 +2140,6 @@ class Shell(cmd.Cmd):
             kwargs['port'] = self.port
             kwargs['ssl_context'] = self.conn.ssl_context
             kwargs['ssl_options'] = self.conn.ssl_options
-            if os.path.exists(self.hostname) and stat.S_ISSOCK(os.stat(self.hostname).st_mode):
-                kwargs['load_balancing_policy'] = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
-            else: 
-                kwargs['load_balancing_policy'] = WhiteListRoundRobinPolicy([self.hostname])
         else:
             kwargs['scylla_cloud'] = self.cloudconf
 
@@ -2145,6 +2148,7 @@ class Shell(cmd.Cmd):
                        auth_provider=auth_provider,
                        control_connection_timeout=self.conn.connect_timeout,
                        connect_timeout=self.conn.connect_timeout,
+                       execution_profiles=self.profiles,
                        **kwargs)
 
         if self.current_keyspace:
@@ -2153,9 +2157,6 @@ class Shell(cmd.Cmd):
             session = conn.connect()
 
         # Copy session properties
-        session.default_timeout = self.session.default_timeout
-        session.row_factory = self.session.row_factory
-        session.default_consistency_level = self.session.default_consistency_level
         session.max_trace_wait = self.session.max_trace_wait
 
         # Update after we've connected in case we fail to authenticate

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/cqlshlib/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '6.0.18'
-__version_tuple__ = version_tuple = (6, 0, 18)
+__version__ = version = '6.0.20'
+__version_tuple__ = version_tuple = (6, 0, 20)

{scylla_cqlsh-6.0.18/pylib → scylla_cqlsh-6.0.20}/cqlshlib/cql3handling.py

@@ -36,8 +36,8 @@ class UnexpectedTableStructure(UserWarning):
 
 
 SYSTEM_KEYSPACES = ('system', 'system_schema', 'system_traces', 'system_auth', 'system_distributed', 'system_views',
-                    'system_virtual_schema', 'system_distributed_everywhere')
-NONALTERBALE_KEYSPACES = ('system', 'system_schema', 'system_views', 'system_virtual_schema', 'system_distributed_everywhere')
+                    'system_virtual_schema', 'system_distributed_everywhere', 'system_replicated_keys')
+NONALTERBALE_KEYSPACES = ('system', 'system_schema', 'system_views', 'system_virtual_schema', 'system_distributed_everywhere', 'system_replicated_keys')
 
 
 class Cql3ParsingRuleSet(CqlParsingRuleSet):
@@ -296,6 +296,12 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
                             | <alterRoleStatement>
                             | <dropRoleStatement>
                             | <listRolesStatement>
+                            | <createSlaStatement>
+                            | <alterSlaStatement>
+                            | <dropSlaStatement>
+                            | <listSlaStatement>
+                            | <attachSlaStatement>
+                            | <detachRSlaStatement>
                             ;
 
 <authorizationStatement> ::= <grantStatement>
@@ -1501,6 +1507,41 @@ syntax_rules += r'''
                        ;
 '''
 
+syntax_rules += r'''
+<slaName> ::= <identifier>
+             | <quotedName>
+             | <unreservedKeyword>
+             ;
+
+<createSlaStatement> ::= "CREATE" "SERVICE_LEVEL" ( "IF" "NOT" "EXISTS" )? <slaName>
+                              ( "WITH" <slaProperty> ("AND" <slaProperty>)*)?
+                        ;
+
+<alterSlaStatement> ::= "ALTER" "SERVICE_LEVEL" ("IF" "EXISTS")? <slaName>
+                              ( "WITH" <slaProperty> ("AND" <slaProperty>)*)?
+                       ;
+
+<slaProperty> ::= "WORKLOAD_TYPE" "=" <stringLiteral>
+                 | "TIMEOUT" "=" <wholenumber>
+                 | "SHARES" "=" <wholenumber>
+                 ;
+
+<dropSlaStatement> ::= "DROP" "SERVICE_LEVEL" ("IF" "EXISTS")? <slaName>
+                      ;
+
+<listSlaStatement> ::= ("LIST" "SERVICE_LEVEL" <slaName> )
+                       | ("LIST" "ATTACHED" "SERVICE_LEVEL" "OF" <rolename> )
+                       | ("LIST" "ALL" "SERVICE_LEVELS" )
+                       | ("LIST" "ALL" "ATTACHED" "SERVICE_LEVELS" )
+                       ;
+
+<attachSlaStatement> ::= "ATTACH" "SERVICE_LEVEL" <slaName> "TO" <rolename>
+                       ;
+
+<detachRSlaStatement> ::= "DETACH" "SERVICE_LEVEL" <slaName> "FROM" <rolename>
+                        ;
+'''
+
 syntax_rules += r'''
 <grantStatement> ::= "GRANT" <permissionExpr> "ON" <resource> "TO" <rolename>
                    ;

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20/pylib}/cqlshlib/cql3handling.py

@@ -36,8 +36,8 @@ class UnexpectedTableStructure(UserWarning):
 
 
 SYSTEM_KEYSPACES = ('system', 'system_schema', 'system_traces', 'system_auth', 'system_distributed', 'system_views',
-                    'system_virtual_schema', 'system_distributed_everywhere')
-NONALTERBALE_KEYSPACES = ('system', 'system_schema', 'system_views', 'system_virtual_schema', 'system_distributed_everywhere')
+                    'system_virtual_schema', 'system_distributed_everywhere', 'system_replicated_keys')
+NONALTERBALE_KEYSPACES = ('system', 'system_schema', 'system_views', 'system_virtual_schema', 'system_distributed_everywhere', 'system_replicated_keys')
 
 
 class Cql3ParsingRuleSet(CqlParsingRuleSet):
@@ -296,6 +296,12 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
                             | <alterRoleStatement>
                             | <dropRoleStatement>
                             | <listRolesStatement>
+                            | <createSlaStatement>
+                            | <alterSlaStatement>
+                            | <dropSlaStatement>
+                            | <listSlaStatement>
+                            | <attachSlaStatement>
+                            | <detachRSlaStatement>
                             ;
 
 <authorizationStatement> ::= <grantStatement>
@@ -1501,6 +1507,41 @@ syntax_rules += r'''
                        ;
 '''
 
+syntax_rules += r'''
+<slaName> ::= <identifier>
+             | <quotedName>
+             | <unreservedKeyword>
+             ;
+
+<createSlaStatement> ::= "CREATE" "SERVICE_LEVEL" ( "IF" "NOT" "EXISTS" )? <slaName>
+                              ( "WITH" <slaProperty> ("AND" <slaProperty>)*)?
+                        ;
+
+<alterSlaStatement> ::= "ALTER" "SERVICE_LEVEL" ("IF" "EXISTS")? <slaName>
+                              ( "WITH" <slaProperty> ("AND" <slaProperty>)*)?
+                       ;
+
+<slaProperty> ::= "WORKLOAD_TYPE" "=" <stringLiteral>
+                 | "TIMEOUT" "=" <wholenumber>
+                 | "SHARES" "=" <wholenumber>
+                 ;
+
+<dropSlaStatement> ::= "DROP" "SERVICE_LEVEL" ("IF" "EXISTS")? <slaName>
+                      ;
+
+<listSlaStatement> ::= ("LIST" "SERVICE_LEVEL" <slaName> )
+                       | ("LIST" "ATTACHED" "SERVICE_LEVEL" "OF" <rolename> )
+                       | ("LIST" "ALL" "SERVICE_LEVELS" )
+                       | ("LIST" "ALL" "ATTACHED" "SERVICE_LEVELS" )
+                       ;
+
+<attachSlaStatement> ::= "ATTACH" "SERVICE_LEVEL" <slaName> "TO" <rolename>
+                       ;
+
+<detachRSlaStatement> ::= "DETACH" "SERVICE_LEVEL" <slaName> "FROM" <rolename>
+                        ;
+'''
+
 syntax_rules += r'''
 <grantStatement> ::= "GRANT" <permissionExpr> "ON" <resource> "TO" <rolename>
                    ;

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/pylib/cqlshlib/test/test_cqlsh_completion.py

@@ -21,8 +21,12 @@
 import locale
 import os
 import re
+
+from cassandra import InvalidRequest
+from packaging.version import Version
+
 from .basecase import BaseTestCase
-from .cassconnect import create_db, remove_db, testrun_cqlsh
+from .cassconnect import create_db, remove_db, testrun_cqlsh, get_cassandra_connection
 from .run_cqlsh import TimeoutError
 from cqlshlib.cql3handling import CqlRuleSet
 
@@ -48,6 +52,14 @@ class CqlshCompletionCase(BaseTestCase):
             output = c.cmd_and_response("SELECT * FROM system_schema.scylla_tables LIMIT 1;")
             cls.is_scylla = '1 rows' in output
 
+        with get_cassandra_connection().connect() as session:
+            try:
+                result = session.execute("SELECT version FROM system.versions WHERE key = 'local' LIMIT 1")
+                cls.scylla_version = Version(result.one().version.rsplit('.', 2)[0])
+                cls.is_scylla_enterprise = cls.scylla_version > Version('2018.1')
+            except InvalidRequest:
+                cls.is_scylla_enterprise = False
+
     @classmethod
     def tearDownClass(cls):
         remove_db()
@@ -63,6 +75,18 @@ class CqlshCompletionCase(BaseTestCase):
     def tearDown(self):
         self.cqlsh_runner.__exit__(None, None, None)
 
+    def _system_keyspaces(self):
+        tables = []
+
+        if self.is_scylla:
+            tables += ['system_distributed_everywhere.']
+            if  self.is_scylla_enterprise:
+                tables += ['system_replicated_keys.']
+        else:
+            tables += ['system_views.', 'system_virtual_schema.']
+
+        return tables
+
     def _get_completions(self, inputstring, split_completed_lines=True):
         """
         Get results of tab completion in cqlsh. Returns a bare string if a
@@ -167,7 +191,7 @@ class TestCqlshCompletion(CqlshCompletionCase):
                                          'COPY', 'CREATE', 'DEBUG', 'DELETE', 'DESC', 'DESCRIBE',
                                          'DROP', 'GRANT', 'HELP', 'INSERT', 'LIST', 'LOGIN', 'PAGING', 'REVOKE',
                                          'SELECT', 'SHOW', 'SOURCE', 'TRACING', 'EXPAND', 'SERIAL', 'TRUNCATE',
-                                         'UPDATE', 'USE', 'exit', 'quit', 'CLEAR', 'CLS'))
+                                         'UPDATE', 'USE', 'exit', 'quit', 'CLEAR', 'CLS', 'ATTACH', 'DETACH'))
 
     def test_complete_command_words(self):
         self.trycompletions('alt', '\b\b\bALTER ')
@@ -254,7 +278,7 @@ class TestCqlshCompletion(CqlshCompletionCase):
                      'EXPAND', 'GRANT', 'HELP', 'INSERT', 'LIST', 'LOGIN', 'PAGING',
                      'REVOKE', 'SELECT', 'SHOW', 'SOURCE', 'SERIAL', 'TRACING',
                      'TRUNCATE', 'UPDATE', 'USE', 'exit', 'quit',
-                     'CLEAR', 'CLS'])
+                     'CLEAR', 'CLS', 'ATTACH', 'DETACH'])
 
         self.trycompletions(
             ("INSERT INTO twenty_rows_composite_table (a, b, c) "
@@ -555,7 +579,7 @@ class TestCqlshCompletion(CqlshCompletionCase):
         self.trycompletions('DROP ',
                             choices=['AGGREGATE', 'COLUMNFAMILY', 'FUNCTION',
                                      'INDEX', 'KEYSPACE', 'ROLE', 'TABLE',
-                                     'TRIGGER', 'TYPE', 'USER', 'MATERIALIZED'])
+                                     'TRIGGER', 'TYPE', 'USER', 'MATERIALIZED', 'SERVICE_LEVEL'])
 
     def test_complete_in_drop_keyspace(self):
         self.trycompletions('DROP K', immediate='EYSPACE ')
@@ -927,9 +951,8 @@ class TestCqlshCompletion(CqlshCompletionCase):
                                                      'utf8_with_special_chars',
                                                      'system_traces.', 'songs',
                                                      'system_schema.', 'system_distributed.',
-                                                     self.cqlsh.keyspace + '.'] +
-                                                     (['system_distributed_everywhere.'] if self.is_scylla else
-                                                      ['system_views.', 'system_virtual_schema.']))
+                                                     self.cqlsh.keyspace + '.'] + self._system_keyspaces()
+                                                     )
         self.trycompletions('ALTER TABLE IF EXISTS new_table ADD ', choices=['<new_column_name>', 'IF'])
         self.trycompletions('ALTER TABLE IF EXISTS new_table ADD IF NOT EXISTS ', choices=['<new_column_name>'])
         self.trycompletions('ALTER TABLE new_table ADD IF NOT EXISTS ', choices=['<new_column_name>'])
@@ -943,8 +966,7 @@ class TestCqlshCompletion(CqlshCompletionCase):
                                                     'tags', 'system_traces.', 'system_distributed.',
                                                     'phone_number', 'band_info_type', 'address', 'system.', 'system_schema.',
                                                     'system_auth.', self.cqlsh.keyspace + '.'
-                                                    ] + (['system_distributed_everywhere.'] if self.is_scylla else
-                                                        ['system_views.', 'system_virtual_schema.']))
+                                                    ] + self._system_keyspaces())
         self.trycompletions('ALTER TYPE IF EXISTS new_type ADD ', choices=['<new_field_name>', 'IF'])
         self.trycompletions('ALTER TYPE IF EXISTS new_type ADD IF NOT EXISTS ', choices=['<new_field_name>'])
         self.trycompletions('ALTER TYPE IF EXISTS new_type RENAME ', choices=['IF', '<quotedName>', '<identifier>'])
@@ -954,3 +976,35 @@ class TestCqlshCompletion(CqlshCompletionCase):
 
     def test_complete_in_alter_role(self):
         self.trycompletions('ALTER ROLE ', choices=['<identifier>', 'IF', '<quotedName>'])
+
+    def test_complete_in_alter_service_level(self):
+        self.trycompletions('ALTER SERVICE_LEVEL ', choices=['<identifier>', 'IF', '<quotedName>'])
+
+    def test_complete_in_create_service_level(self):
+        self.trycompletions('CREATE SERVICE_LEVEL "sla" WITH ',
+                            choices=['WORKLOAD_TYPE', 'TIMEOUT', 'SHARES'])
+
+    def test_complete_in_attach_service_level(self):
+        self.trycompletions('ATTACH ',
+                            immediate="SERVICE_LEVEL ")
+        self.trycompletions('ATTACH SERVICE_LEVEL "sla" ',
+                            immediate="TO ")
+        self.trycompletions('ATTACH SERVICE_LEVEL "sla" TO ',
+                            choices=['<identifier>', '<quotedName>'])
+
+    def test_complete_in_list_service_levels(self):
+
+        self.trycompletions("LIST ALL ",
+                            choices={'ON', 'NORECURSIVE', 'OF', 'ATTACHED', ';', 'SERVICE_LEVELS', 'PERMISSIONS'})
+
+        self.trycompletions("LIST ALL SERVICE_LEVELS ",
+                            choices={';'})
+
+        self.trycompletions("LIST ALL ATTACHED ",
+                            immediate='SERVICE_LEVELS ;')
+
+        self.trycompletions("LIST ATTACHED  ",
+                            immediate='SERVICE_LEVEL OF ')
+
+        self.trycompletions("LIST SERVICE_LEVEL  ",
+                            choices={'<quotedName>', '<identifier>'})

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/pylib/cqlshlib/test/test_cqlsh_output.py

@@ -36,6 +36,44 @@ from .ansi_colors import (ColoredText, ansi_seq, lookup_colorcode,
 CONTROL_C = '\x03'
 CONTROL_D = '\x04'
 
+def _normalize_response(response):
+    def should_keep(line):
+        if not line.strip():
+            return False
+        deprecated_options = ["dclocal_read_repair_chance", "read_repair_chance"]
+        for col in deprecated_options:
+            if col in line:
+                return False
+        ignore_options = ["paxos_grace_seconds", "tombstone_gc", "cdc"]
+        for col in ignore_options:
+            if col in line:
+                return False
+        return True
+
+    def normalize(line):
+        # normalize 0.0, 1.0 etc to 0, 1 etc.
+        line = re.sub(r"\b(\d+)\.0\b", r"\1", line)
+        # replace multiple whitespaces with a single whitespace
+        line = re.sub(r"\s+", " ", line)
+
+        line = line.rstrip(";,:")
+
+        # enforce formatting without whitespace in {ks}.{table} ({col}) and then listing items
+        line = re.sub(r"(\w+\.\w+)\s\(", r"\1(", line)
+        line = re.sub(r",\s+'", ",'", line)
+        if " PRIMARY KEY" in line:
+            return {line.replace(" PRIMARY KEY", ""), f"PRIMARY KEY ({line.split()[0]})"}
+        if ":" in line:
+            return set(line.split(":"))
+        return {line}
+
+    resp = set()
+    for s in response.split("\n"):
+        if should_keep(s):
+            resp.update(normalize(s.strip()))
+
+    return resp
+
 
 class TestCqlshOutput(BaseTestCase):
     @classmethod
@@ -57,6 +95,16 @@ class TestCqlshOutput(BaseTestCase):
                 cls.is_scylla = len(output.all()) == 1
             except InvalidRequest:
                 cls.is_scylla = False
+            try:
+                result = curs.execute("SELECT version FROM system.versions WHERE key = 'local' LIMIT 1")
+                cls.scylla_version = Version(result.one().version.rsplit('.', 2)[0])
+                cls.is_scylla_enterprise = cls.scylla_version > Version('2018.1')
+            except InvalidRequest:
+                cls.is_scylla_enterprise = False
+
+    @property
+    def default_compaction_strategy(self):
+        return 'IncrementalCompactionStrategy' if self.is_scylla_enterprise else 'SizeTieredCompactionStrategy'
 
     def setUp(self):
         env = os.environ.copy()
@@ -684,7 +732,7 @@ class TestCqlshOutput(BaseTestCase):
                 AND read_repair = 'BLOCKING'
                 AND speculative_retry = '99p';""" % quote_name(get_keyspace()))
 
-        scylla_table_desc = dedent("""
+        scylla_table_desc = dedent(f"""
             CREATE TABLE %s.has_all_types (
                 num int PRIMARY KEY,
                 asciicol ascii,
@@ -703,10 +751,10 @@ class TestCqlshOutput(BaseTestCase):
                 varcharcol text,
                 varintcol varint
             ) WITH bloom_filter_fp_chance = 0.01
-                AND caching = {'keys': 'ALL', 'rows_per_partition': 'ALL'}
+                AND caching = {{'keys': 'ALL', 'rows_per_partition': 'ALL'}}
                 AND comment = ''
-                AND compaction = {'class': 'SizeTieredCompactionStrategy'}
-                AND compression = {'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
+                AND compaction = {{'class': '{self.default_compaction_strategy}'}}
+                AND compression = {{'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}}
                 AND crc_check_chance = 1.0
                 AND dclocal_read_repair_chance = 0.0
                 AND default_time_to_live = 0
@@ -726,7 +774,7 @@ class TestCqlshOutput(BaseTestCase):
                 for semicolon in (';', ''):
                     output = c.cmd_and_response('%s has_all_types%s' % (cmdword, semicolon))
                     self.assertNoHasColors(output)
-                    self.assertSequenceEqual(dedent(output).split('\n'), table_desc3.split('\n'))
+                    self.assertSetEqual(_normalize_response(dedent(output)), _normalize_response(table_desc3))
 
     def test_describe_columnfamilies_output(self):
         output_re = r'''
@@ -792,8 +840,9 @@ class TestCqlshOutput(BaseTestCase):
         output_re_client = r'''(?x)
             ^
             \n
-            Cluster: [ ] (?P<clustername> .* ) \n
-            Partitioner: [ ] (?P<partitionername> .* ) \n
+            Cluster: [ ] (?P<clustername> .* )\s?\n
+            Partitioner: [ ] (?P<partitionername> .* )\s?\n
+            Snitch: [ ] (?P<snitchname>.*)\n|^\s*$
             \n
         '''
 
@@ -1001,7 +1050,7 @@ class TestCqlshOutput(BaseTestCase):
         ) WITH bloom_filter_fp_chance = 0.01
             AND caching = {{'keys': 'ALL', 'rows_per_partition': 'ALL'}}
             AND comment = ''
-            AND compaction = {{'class': 'SizeTieredCompactionStrategy'}}
+            AND compaction = {{'class': '{self.default_compaction_strategy}'}}
             AND compression = {{'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}}
             AND crc_check_chance = 1.0
             AND dclocal_read_repair_chance = 0.0
@@ -1021,4 +1070,6 @@ class TestCqlshOutput(BaseTestCase):
             output = c.cmd_and_response(f"CREATE TABLE  {qks}.ccc (pkey int,  PRIMARY KEY(pkey))  WITH cdc = {{'enabled': true}};")
             self.assertEquals(output.strip(),  "")
             output = c.cmd_and_response('describe table {}.ccc'.format(qks))
-            self.assertSequenceEqual(dedent(output).split('\n'), expected.split('\n'))
+            lines = _normalize_response(dedent(output))
+            expected_lines = _normalize_response(expected)
+            self.assertTrue(expected_lines.issubset(lines), f"Output lines \n {{{lines}}} \n doesn't contain expected lines\n {{{expected_lines}}}")

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/pyproject.toml

@@ -9,4 +9,4 @@ build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
 write_to = "pylib/cqlshlib/_version.py"
-tag_regex = '^(?P<prefix>v)?(?P<version>[^\+-]+)(?P<suffix>-scylla)?$'
+tag_regex = '^(?P<prefix>v)?(?P<version>[^\+-]+)(?P<suffix>-scylla)?$'

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/reloc/build_reloc.sh

@@ -81,7 +81,7 @@ fi
 
 python3 -m pip install ${PIP_EXTRA_OPTS} build==0.10.0 wheel==0.37.1 -t ./build/cqlsh_build
 PYTHONPATH=$(pwd)/build/cqlsh_build python3 -m build -s
-PYTHONPATH=$(pwd)/build/cqlsh_build python3 -m pip download ${PIP_EXTRA_OPTS} --constraint ./requirements.txt --no-binary :all: . --no-build-isolation -d ./build/pypi_packages
+PYTHONPATH=$(pwd)/build/cqlsh_build python3 -m pip download ${PIP_EXTRA_OPTS} --constraint ./requirements.txt --no-binary :all: --only-binary cython . -d ./build/pypi_packages
 
 for package in $(ls ./build/pypi_packages/*.tar.gz)
 do

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/requirements.txt

@@ -1,5 +1,5 @@
 scylla-driver==3.26.5
 geomet==0.2.1.post1
-PyYAML==6.0
+PyYAML==6.0.1
 click==8.1.3
 

{scylla_cqlsh-6.0.18 → scylla_cqlsh-6.0.20}/scylla_cqlsh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scylla-cqlsh
-Version: 6.0.18
+Version: 6.0.20
 Summary: cqlsh is a Python-based command-line client for running CQL commands on a scylla cluster.
 Home-page: https://github.com/scylladb/scylla-cqlsh
 Author: Israel Fruchter