scylla-cqlsh 6.0.21__tar.gz → 6.0.23__tar.gz

{scylla_cqlsh-6.0.21 → scylla_cqlsh-6.0.23}/.github/workflows/build-push.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-11]
+        os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v3
@@ -28,8 +28,9 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.16.5
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: wheels-${{ matrix.os }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -43,8 +44,9 @@ jobs:
         run: |
           pipx run build --sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: source-dist
           path: dist/*.tar.gz
 
   integration_test_scylla:
@@ -198,12 +200,13 @@ jobs:
     # alternatively, to publish when a GitHub Release is created, use the following rule:
     # if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
-          name: artifact
           path: dist
+          merge-multiple: true
 
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
+          skip-existing: true
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

{scylla_cqlsh-6.0.21 → scylla_cqlsh-6.0.23}/.gitignore

@@ -6,6 +6,9 @@ build.properties
 build/**                                                                                                                                                                         
 dist/*.tar.gz
 
+# generated code
+bin/cqlsh
+
 pylib/cqlshlib/_version.py
 pylib/cqlshlib/copyutil.c
 pylib/cqlshlib/__pycache__/**

{scylla_cqlsh-6.0.21 → scylla_cqlsh-6.0.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scylla-cqlsh
-Version: 6.0.21
+Version: 6.0.23
 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
@@ -81,6 +81,16 @@ ccm start
 pytest
 ```
 
+## Build from source
+
+```bash
+pip install build
+# optionally can disable the usage of cython
+# export CQLSH_NO_CYTHON=true
+python -m build -w
+...
+Successfully built scylla_cqlsh-6.0.24.dev0+gb09bc79361.d20240910-py3-none-any.whl
+```
 
 ## Creation of the repo
 

{scylla_cqlsh-6.0.21 → scylla_cqlsh-6.0.23}/README.md

@@ -60,6 +60,16 @@ ccm start
 pytest
 ```
 
+## Build from source
+
+```bash
+pip install build
+# optionally can disable the usage of cython
+# export CQLSH_NO_CYTHON=true
+python -m build -w
+...
+Successfully built scylla_cqlsh-6.0.24.dev0+gb09bc79361.d20240910-py3-none-any.whl
+```
 
 ## Creation of the repo
 

{scylla_cqlsh-6.0.21 → scylla_cqlsh-6.0.23}/SCYLLA-VERSION-GEN

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PRODUCT=scylla
 VERSION=666.development

{scylla_cqlsh-6.0.21 → scylla_cqlsh-6.0.23}/bin/cqlsh.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -488,7 +488,7 @@ class Shell(cmd.Cmd):
                 if os.path.exists(self.hostname) and stat.S_ISSOCK(os.stat(self.hostname).st_mode):
                     kwargs['contact_points'] = (UnixSocketEndPoint(self.hostname),)
                     self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
-                else: 
+                else:
                     kwargs['contact_points'] = (self.hostname,)
                     self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([self.hostname])
                 kwargs['port'] = self.port
@@ -1008,6 +1008,21 @@ class Shell(cmd.Cmd):
         cmdword = tokens[0][1]
         if cmdword == '?':
             cmdword = 'help'
+
+        cmdword_lower = cmdword.lower()
+
+        # Describe statements get special treatment: we first want to
+        # send the request to the server and only when it fails will
+        # we attempt to perform it locally. That's why we don't want
+        # to follow the logic below that starts with parsing.
+        #
+        # The reason for that is changes in Scylla may need to be reflected
+        # in the grammar used in cqlsh. We want Scylla to be "independent"
+        # in that regard, so unless necessary, we don't want to do the parsing
+        # here.
+        if cmdword_lower == 'describe' or cmdword_lower == 'desc':
+            return self.perform_describe(cmdword, tokens, srcstr)
+
         custom_handler = getattr(self, 'do_' + cmdword.lower(), None)
         if custom_handler:
             parsed = cqlruleset.cql_whole_parse_tokens(tokens, srcstr=srcstr,
@@ -1497,8 +1512,8 @@ class Shell(cmd.Cmd):
                 self.print_recreate_keyspace(k, sys.stdout)
                 print('')
 
-    def do_describe(self, parsed):
-
+    # Precondition: the first token in `srcstr.lower()` is either `describe` or `desc`.
+    def perform_describe(self, cmdword, tokens, srcstr):
         """
         DESCRIBE [cqlsh only]
 
@@ -1589,10 +1604,8 @@ class Shell(cmd.Cmd):
           where object can be either a keyspace or a table or an index or a materialized
           view (in this order).
         """
-        self._do_describe(parsed, force_client_side_describe=False)
 
-    def _do_describe(self, parsed, force_client_side_describe):
-        if force_client_side_describe:
+        def perform_describe_locally(parsed):
             what = parsed.matched[1][1].lower()
             if what == 'functions':
                 self.describe_functions_client(self.current_keyspace)
@@ -1650,40 +1663,45 @@ class Shell(cmd.Cmd):
                 if not name:
                     name = self.cql_unprotect_name(parsed.get_binding('mvname', None))
                 self.describe_object_client(ks, name)
-        else:
-            stmt = SimpleStatement(parsed.extract_orig(), consistency_level=cassandra.ConsistencyLevel.LOCAL_ONE,
-                                   fetch_size=self.page_size if self.use_paging else None)
-            future = self.session.execute_async(stmt)
-            try:
-                result = future.result()
-
-                what = parsed.matched[1][1].lower()
-
-                if what in ('columnfamilies', 'tables', 'types', 'functions', 'aggregates'):
-                    self.describe_list(result)
-                elif what == 'keyspaces':
-                    self.describe_keyspaces(result)
-                elif what == 'cluster':
-                    self.describe_cluster(result)
-                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('"'))
-            except Exception:
-                import traceback
-                self.printerr(traceback.format_exc())
 
-            if future:
-                if future.warnings:
-                    self.print_warnings(future.warnings)
+        stmt = SimpleStatement(srcstr, consistency_level=cassandra.ConsistencyLevel.LOCAL_ONE,
+                               fetch_size=self.page_size if self.use_paging else None)
+        future = self.session.execute_async(stmt)
+        try:
+            result = future.result()
+
+            # The second token in the statement indicates which
+            # kind of DESCRIBE we're performing.
+            what = srcstr.split()[1].lower().rstrip(';')
+
+            if what in ('columnfamilies', 'tables', 'types', 'functions', 'aggregates'):
+                self.describe_list(result)
+            elif what == 'keyspaces':
+                self.describe_keyspaces(result)
+            elif what == 'cluster':
+                self.describe_cluster(result)
+            elif what:
+                self.describe_element(result)
+
+        except cassandra.protocol.SyntaxException:
+            # Server doesn't support DESCRIBE query, retry with
+            # client-side DESCRIBE implementation
+            parsed = cqlruleset.cql_whole_parse_tokens(tokens, srcstr=srcstr,
+                                                       startsymbol='cqlshCommand')
+            if parsed and not parsed.remainder:
+                return perform_describe_locally(parsed)
+            else:
+                return self.handle_parse_error(cmdword, tokens, parsed, srcstr)
+        except CQL_ERRORS as err:
+            err_msg = err.message if hasattr(err, 'message') else str(err)
+            self.printerr(err_msg.partition("message=")[2].strip('"'))
+        except Exception:
+            import traceback
+            self.printerr(traceback.format_exc())
 
-    do_desc = do_describe
+        if future:
+            if future.warnings:
+                self.print_warnings(future.warnings)
 
     def describe_keyspaces(self, rows):
         """
@@ -2520,7 +2538,7 @@ def read_options(cmdlineargs, environment):
             parser.error("Cannot use --cloudconf with hostname or port")
         if options.ssl:
             parser.error("Cannot use --cloudconf with --ssl. Cloud connection encryption parameters are provided by cloud config bundle.")
-            
+
 
     hostname = option_with_default(configs.get, 'connection', 'hostname', DEFAULT_HOST)
     port = option_with_default(configs.get, 'connection', 'port', DEFAULT_PORT)

{scylla_cqlsh-6.0.21 → scylla_cqlsh-6.0.23}/cqlsh/cqlsh.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -488,7 +488,7 @@ class Shell(cmd.Cmd):
                 if os.path.exists(self.hostname) and stat.S_ISSOCK(os.stat(self.hostname).st_mode):
                     kwargs['contact_points'] = (UnixSocketEndPoint(self.hostname),)
                     self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
-                else: 
+                else:
                     kwargs['contact_points'] = (self.hostname,)
                     self.profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([self.hostname])
                 kwargs['port'] = self.port
@@ -1008,6 +1008,21 @@ class Shell(cmd.Cmd):
         cmdword = tokens[0][1]
         if cmdword == '?':
             cmdword = 'help'
+
+        cmdword_lower = cmdword.lower()
+
+        # Describe statements get special treatment: we first want to
+        # send the request to the server and only when it fails will
+        # we attempt to perform it locally. That's why we don't want
+        # to follow the logic below that starts with parsing.
+        #
+        # The reason for that is changes in Scylla may need to be reflected
+        # in the grammar used in cqlsh. We want Scylla to be "independent"
+        # in that regard, so unless necessary, we don't want to do the parsing
+        # here.
+        if cmdword_lower == 'describe' or cmdword_lower == 'desc':
+            return self.perform_describe(cmdword, tokens, srcstr)
+
         custom_handler = getattr(self, 'do_' + cmdword.lower(), None)
         if custom_handler:
             parsed = cqlruleset.cql_whole_parse_tokens(tokens, srcstr=srcstr,
@@ -1497,8 +1512,8 @@ class Shell(cmd.Cmd):
                 self.print_recreate_keyspace(k, sys.stdout)
                 print('')
 
-    def do_describe(self, parsed):
-
+    # Precondition: the first token in `srcstr.lower()` is either `describe` or `desc`.
+    def perform_describe(self, cmdword, tokens, srcstr):
         """
         DESCRIBE [cqlsh only]
 
@@ -1589,10 +1604,8 @@ class Shell(cmd.Cmd):
           where object can be either a keyspace or a table or an index or a materialized
           view (in this order).
         """
-        self._do_describe(parsed, force_client_side_describe=False)
 
-    def _do_describe(self, parsed, force_client_side_describe):
-        if force_client_side_describe:
+        def perform_describe_locally(parsed):
             what = parsed.matched[1][1].lower()
             if what == 'functions':
                 self.describe_functions_client(self.current_keyspace)
@@ -1650,40 +1663,45 @@ class Shell(cmd.Cmd):
                 if not name:
                     name = self.cql_unprotect_name(parsed.get_binding('mvname', None))
                 self.describe_object_client(ks, name)
-        else:
-            stmt = SimpleStatement(parsed.extract_orig(), consistency_level=cassandra.ConsistencyLevel.LOCAL_ONE,
-                                   fetch_size=self.page_size if self.use_paging else None)
-            future = self.session.execute_async(stmt)
-            try:
-                result = future.result()
-
-                what = parsed.matched[1][1].lower()
-
-                if what in ('columnfamilies', 'tables', 'types', 'functions', 'aggregates'):
-                    self.describe_list(result)
-                elif what == 'keyspaces':
-                    self.describe_keyspaces(result)
-                elif what == 'cluster':
-                    self.describe_cluster(result)
-                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('"'))
-            except Exception:
-                import traceback
-                self.printerr(traceback.format_exc())
 
-            if future:
-                if future.warnings:
-                    self.print_warnings(future.warnings)
+        stmt = SimpleStatement(srcstr, consistency_level=cassandra.ConsistencyLevel.LOCAL_ONE,
+                               fetch_size=self.page_size if self.use_paging else None)
+        future = self.session.execute_async(stmt)
+        try:
+            result = future.result()
+
+            # The second token in the statement indicates which
+            # kind of DESCRIBE we're performing.
+            what = srcstr.split()[1].lower().rstrip(';')
+
+            if what in ('columnfamilies', 'tables', 'types', 'functions', 'aggregates'):
+                self.describe_list(result)
+            elif what == 'keyspaces':
+                self.describe_keyspaces(result)
+            elif what == 'cluster':
+                self.describe_cluster(result)
+            elif what:
+                self.describe_element(result)
+
+        except cassandra.protocol.SyntaxException:
+            # Server doesn't support DESCRIBE query, retry with
+            # client-side DESCRIBE implementation
+            parsed = cqlruleset.cql_whole_parse_tokens(tokens, srcstr=srcstr,
+                                                       startsymbol='cqlshCommand')
+            if parsed and not parsed.remainder:
+                return perform_describe_locally(parsed)
+            else:
+                return self.handle_parse_error(cmdword, tokens, parsed, srcstr)
+        except CQL_ERRORS as err:
+            err_msg = err.message if hasattr(err, 'message') else str(err)
+            self.printerr(err_msg.partition("message=")[2].strip('"'))
+        except Exception:
+            import traceback
+            self.printerr(traceback.format_exc())
 
-    do_desc = do_describe
+        if future:
+            if future.warnings:
+                self.print_warnings(future.warnings)
 
     def describe_keyspaces(self, rows):
         """
@@ -2520,7 +2538,7 @@ def read_options(cmdlineargs, environment):
             parser.error("Cannot use --cloudconf with hostname or port")
         if options.ssl:
             parser.error("Cannot use --cloudconf with --ssl. Cloud connection encryption parameters are provided by cloud config bundle.")
-            
+
 
     hostname = option_with_default(configs.get, 'connection', 'hostname', DEFAULT_HOST)
     port = option_with_default(configs.get, 'connection', 'port', DEFAULT_PORT)

{scylla_cqlsh-6.0.21 → scylla_cqlsh-6.0.23}/cqlshlib/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '6.0.21'
-__version_tuple__ = version_tuple = (6, 0, 21)
+__version__ = version = '6.0.23'
+__version_tuple__ = version_tuple = (6, 0, 23)