scylla-cqlsh 6.0.18__cp310-cp310-win32.whl → 6.0.20__cp310-cp310-win32.whl

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

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)

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.dist-info → scylla_cqlsh-6.0.20.dist-info}/METADATA

@@ -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.dist-info → scylla_cqlsh-6.0.20.dist-info}/RECORD

@@ -1,12 +1,12 @@
-copyutil.cp310-win32.pyd,sha256=nDafGADSnomuHpcvthamfDNhVIyCQ0_llNgwAJ4h-Ns,1065472
+copyutil.cp310-win32.pyd,sha256=QtgRCLtGNvlcoawGkmpcyk6pHmhNWbX2dIexXBH-QRA,1065472
 cqlsh/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 cqlsh/__main__.py,sha256=x2NuvlSuAKwNCxiX07YoYfxog9JNAO759ZxnjBEcfus,231
-cqlsh/cqlsh.py,sha256=LZ78gWssBEuJJ6o-RdKN67TRS8kPfE-43FF0mZGmshc,114676
+cqlsh/cqlsh.py,sha256=LdOs8vhjG_oimhOXGoyHd7Ijv6I5Qt0ysWORZrU--Rk,114602
 cqlshlib/__init__.py,sha256=3M0IQCsjdCGYEOBT20swSvqxV6V8vg_mu1uJig78Vmk,3274
-cqlshlib/_version.py,sha256=HbqxcGIvjP7DeCK1ui2_Pi_9H2-nIg5bnhpk6NgzAGs,429
+cqlshlib/_version.py,sha256=oluWKZHU0y3TXlgs59i2YVKAPIbJ99s3-x1vHc1xV00,429
 cqlshlib/authproviderhandling.py,sha256=goFjJCO1FKuVCXU7KXlmlorx_cD_oIRlgpOeH13W--g,7254
 cqlshlib/copyutil.py,sha256=Pc4WaKg_W8IP4ZpuWEvoLOrJJGQTwRHTyOdqExfDro0,116171
-cqlshlib/cql3handling.py,sha256=7lwOXRGeDH-IDy2ENNJ3dbeP5o3LRmlonvIoO9rs6kw,59132
+cqlshlib/cql3handling.py,sha256=NaPViE6v9K4S4ffBmmWzI3_U0Kd-HvBjKq3N6G4GLzI,60790
 cqlshlib/cqlhandling.py,sha256=hiqjCKY5fQnqSEeugYJgAD3hRiloqUtOUTSg_GccL4A,13436
 cqlshlib/cqlshhandling.py,sha256=cMlDbq5MuXagJmq-qpJxRqwstOAawWUu2rry6tfHV_w,10824
 cqlshlib/displaying.py,sha256=WxKcYuX098sa6NoyPeYwJod0zutkrTm2Zm3riIhrYpA,4105
@@ -18,9 +18,9 @@ cqlshlib/sslhandling.py,sha256=XYdvON1WkWFQ5dg5ttpwpSQDgbqI58YJi8Lx1qTDtQA,4758
 cqlshlib/tracing.py,sha256=Krb-TkfWrUdxr17-2yZrW5DXKvBEQt-FYZAix_62Tes,3493
 cqlshlib/util.py,sha256=gHvzlTw1T9N1YzXdVPFptAt58EzyXpDRibAo8QB03I8,5240
 cqlshlib/wcwidth.py,sha256=zsoo9u3ZA3q8RL5Afb6ynRujqDdUZ9zlFIHGE8RkqyA,16244
-scylla_cqlsh-6.0.18.dist-info/LICENSE.txt,sha256=65AZdlqRQxiyMBv8nY6itMITk5jx9EkE_jHujbcDzbk,11564
-scylla_cqlsh-6.0.18.dist-info/METADATA,sha256=6YpMyPFceo5HrZCNy_22nBkMKqMzjaPuoeqyu747Xf4,2910
-scylla_cqlsh-6.0.18.dist-info/WHEEL,sha256=RyLtD17TRXemRgS90DEnpEXWZB9e6GGH4dvD03N_Jp0,98
-scylla_cqlsh-6.0.18.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
-scylla_cqlsh-6.0.18.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
-scylla_cqlsh-6.0.18.dist-info/RECORD,,
+scylla_cqlsh-6.0.20.dist-info/LICENSE.txt,sha256=65AZdlqRQxiyMBv8nY6itMITk5jx9EkE_jHujbcDzbk,11564
+scylla_cqlsh-6.0.20.dist-info/METADATA,sha256=jaPgyuGxL4rxuh_GwXC7oxU9fQoS0D-03B4ZWmQIQUw,2910
+scylla_cqlsh-6.0.20.dist-info/WHEEL,sha256=RyLtD17TRXemRgS90DEnpEXWZB9e6GGH4dvD03N_Jp0,98
+scylla_cqlsh-6.0.20.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
+scylla_cqlsh-6.0.20.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
+scylla_cqlsh-6.0.20.dist-info/RECORD,,