scylla-cqlsh 6.0.12__cp38-cp38-musllinux_1_1_i686.whl → 6.0.14__cp38-cp38-musllinux_1_1_i686.whl

cqlsh/cqlsh.py

@@ -152,7 +152,7 @@ if os.path.isdir(cqlshlibdir):
 from cqlshlib import cql3handling, pylexotron, sslhandling, cqlshhandling, authproviderhandling
 from cqlshlib.copyutil import ExportTask, ImportTask
 from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
-                                 RED, WHITE, FormattedValue, colorme)
+                                 RED, YELLOW, WHITE, FormattedValue, colorme)
 from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
                                  DEFAULT_TIMESTAMP_FORMAT, CqlType, DateTimeFormat,
                                  format_by_type)
@@ -212,7 +212,7 @@ parser.add_option('--cqlversion', default=None,
                        'by default the highest version supported by the server will be used.'
                        ' Examples: "3.0.3", "3.1.0"')
 parser.add_option("--protocol-version", type="int", default=None,
-                  help='Specify a specific protcol version otherwise the client will default and downgrade as necessary')
+                  help='Specify a specific protocol version otherwise the client will default and downgrade as necessary')
 
 parser.add_option("-e", "--execute", help='Execute the statement and quit.')
 parser.add_option("--connect-timeout", default=DEFAULT_CONNECT_TIMEOUT_SECONDS, dest='connect_timeout',
@@ -1110,8 +1110,8 @@ class Shell(cmd.Cmd):
             try:
                 self.conn.refresh_schema_metadata(5)  # will throw exception if there is a schema mismatch
             except Exception:
-                self.printerr("Warning: schema version mismatch detected; check the schema versions of your "
-                              "nodes in system.local and system.peers.")
+                self.printwarn("Warning: schema version mismatch detected; check the schema versions of your "
+                               "nodes in system.local and system.peers.")
                 self.conn.refresh_schema_metadata(-1)
 
         if result is None:
@@ -2290,6 +2290,13 @@ class Shell(cmd.Cmd):
             text = '%s:%d:%s' % (self.stdin.name, self.lineno, text)
         self.writeresult(text, color, newline=newline, out=sys.stderr)
 
+    def printwarn(self, text, color=YELLOW, newline=True, shownum=None):
+        if shownum is None:
+            shownum = self.show_line_nums
+        if shownum:
+            text = '%s:%d:%s' % (self.stdin.name, self.lineno, text)
+        self.writeresult(text, color, newline=newline, out=sys.stderr)
+
     def stop_coverage(self):
         if self.coverage and self.cov is not None:
             self.cov.stop()

cqlshlib/_version.py

@@ -1,4 +1,16 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '6.0.12'
-__version_tuple__ = version_tuple = (6, 0, 12)
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple, Union
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '6.0.14'
+__version_tuple__ = version_tuple = (6, 0, 14)

cqlshlib/copyutil.py

@@ -160,6 +160,11 @@ class SendingChannels(object):
         self.pipes = [OneWayPipe() for _ in range(num_channels)]
         self.channels = [SendingChannel(p) for p in self.pipes]
         self.num_channels = num_channels
+        self._readers = [p.reader for p in self.pipes]
+
+    def release_readers(self):
+        for reader in self._readers:
+            reader.close()
 
     def close(self):
         for ch in self.channels:
@@ -177,12 +182,17 @@ class ReceivingChannels(object):
         self.pipes = [OneWayPipe() for _ in range(num_channels)]
         self.channels = [ReceivingChannel(p) for p in self.pipes]
         self._readers = [p.reader for p in self.pipes]
+        self._writers = [p.writer for p in self.pipes]
         self._rlocks = [p.rlock for p in self.pipes]
         self._rlocks_by_readers = dict([(p.reader, p.rlock) for p in self.pipes])
         self.num_channels = num_channels
 
         self.recv = self.recv_select if IS_LINUX else self.recv_polling
 
+    def release_writers(self):
+        for writer in self._writers:
+            writer.close()
+
     def recv_select(self, timeout):
         """
         Implementation of the recv method for Linux, where select is available. Receive an object from
@@ -465,7 +475,8 @@ class CopyTask(object):
         for i, process in enumerate(self.processes):
             process.start()
             self.trace_process(process.pid)
-
+        self.inmsg.release_writers()
+        self.outmsg.release_readers()
         self.trace_process(self.get_pid())
 
     def stop_processes(self):
@@ -2232,7 +2243,7 @@ class TokenMap(object):
 
         self._initialize_ring()
 
-        # Note that refresh metadata is disabled by default and we currenlty do not intercept it
+        # Note that refresh metadata is disabled by default and we currently do not intercept it
         # If hosts are added, removed or moved during a COPY operation our token map is no longer optimal
         # However we can cope with hosts going down and up since we filter for replicas that are up when
         # making each batch

cqlshlib/pylexotron.py

@@ -384,7 +384,7 @@ class ParsingRuleSet:
     def parse_rules(cls, rulestr):
         tokens, unmatched = cls.RuleSpecScanner.scan(rulestr)
         if unmatched:
-            raise LexingError.from_text(rulestr, unmatched, msg="Syntax rules are unparseable")
+            raise LexingError.from_text(rulestr, unmatched, msg="Syntax rules are unparsable")
         rules = {}
         terminals = []
         tokeniter = iter(tokens)

{scylla_cqlsh-6.0.12.dist-info → scylla_cqlsh-6.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scylla-cqlsh
-Version: 6.0.12
+Version: 6.0.14
 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.12.dist-info → scylla_cqlsh-6.0.14.dist-info}/RECORD

@@ -1,26 +1,26 @@
-copyutil.cpython-38-i386-linux-gnu.so,sha256=k0NjS7PPY0OXW3b2tb6iMFm8UOCoeWvPlaftPh72Aj4,12429992
-cqlsh/__main__.py,sha256=-IR7kYVwXf9uq9OBeVlAB5I386E1N9iEhrjn3sCw-74,220
-cqlsh/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-cqlsh/cqlsh.py,sha256=en-k68dnVgB3NvbBhIPAi8kRNZ0pZ0IFDL94YZY2hyc,110584
-cqlshlib/_version.py,sha256=nGxbANJunq4qkxDuAgKnQDv1nZBvC26uBcsqVabxenQ,162
+copyutil.cpython-38-i386-linux-gnu.so,sha256=PKda1VXTDmRWLfTiJ3IxhIGqHWTDD2WkymmWaJxMYB8,12528952
+cqlshlib/_version.py,sha256=jMKN3rmsPzK5C_7WbnPN5wzg53Z61mpPehhw92mkyv0,413
+cqlshlib/displaying.py,sha256=bsA7T4BwQHgtH4jzCJeU3JrpgMT5k0xZ7EA2AnhYG7g,3977
+cqlshlib/cqlhandling.py,sha256=J-zzfU8sj0GbX-5vh5uV1gmFAYD_WOBsnVgd9PMaHoc,13103
+cqlshlib/wcwidth.py,sha256=PsbF7OaDlLItaiV6niu8F_OOgVYLJo0Ypb5-cOJV3QY,15865
+cqlshlib/__init__.py,sha256=IhAMRujMv3XMvwQcYhUyXvJtWYuHpI-WfnIookmRago,3184
 cqlshlib/helptopics.py,sha256=bBPtNHn2ySgO9K4nFBpJw2gcibryIdRh7dm3b9TUubQ,4524
+cqlshlib/formatting.py,sha256=NBHxsrXS3X8qcGewn98iTP7ys3JQUvWGf9iIWk-ErL0,23032
 cqlshlib/cql3handling.py,sha256=S2rA8pbeSKjvmtWnBIthkDpC41pJU7L0OQO2Ob-YYg4,57506
-cqlshlib/wcwidth.py,sha256=PsbF7OaDlLItaiV6niu8F_OOgVYLJo0Ypb5-cOJV3QY,15865
+cqlshlib/sslhandling.py,sha256=0_srBAe1l6zO_Ct394CyFzW94O7lYOkRS4QEBNuEMiE,3918
+cqlshlib/tracing.py,sha256=ct7siXwNMINjGVXn9qr5h7XhDDM6Bi1uLljPUtcve-A,3403
+cqlshlib/pylexotron.py,sha256=QY3nZ-fP-yGFIixMV33IgMlKV8A51AxnNYya0PGZc6I,19273
 cqlshlib/authproviderhandling.py,sha256=p4r_sk64AC5eiv__n-gjwQk2Ni_CcK6lyAWSKEcgINs,7078
-cqlshlib/cqlhandling.py,sha256=J-zzfU8sj0GbX-5vh5uV1gmFAYD_WOBsnVgd9PMaHoc,13103
 cqlshlib/saferscanner.py,sha256=T4eSYVWuZf4piTS9PgHjFhuY6g1fOb4VVa1Bu4Y1v_I,3539
-cqlshlib/sslhandling.py,sha256=0_srBAe1l6zO_Ct394CyFzW94O7lYOkRS4QEBNuEMiE,3918
-cqlshlib/cqlshhandling.py,sha256=BUu9wi7H1Xgil9lci-48TCPQ1xwe2-OTNXsW7jiewlM,10510
-cqlshlib/copyutil.py,sha256=C_x-2Ox93d4pAtjDTXMsLlw_f1yAja7e85mZhcGGFy4,113002
-cqlshlib/pylexotron.py,sha256=XFXI-TFdMcZ6xrJYkKY3fEO7eriCRt2nt_xWSeZfNc8,19274
-cqlshlib/displaying.py,sha256=bsA7T4BwQHgtH4jzCJeU3JrpgMT5k0xZ7EA2AnhYG7g,3977
-cqlshlib/__init__.py,sha256=IhAMRujMv3XMvwQcYhUyXvJtWYuHpI-WfnIookmRago,3184
+cqlshlib/copyutil.py,sha256=gKG9sSvbYmC9uCCaXu1XOlNvH5lsXl52qgPjaOXUiIA,113378
 cqlshlib/util.py,sha256=qWQmq9v28vZwZ4apzK0-UQOYPIW3TMk-Jq9I69LbW0k,5057
-cqlshlib/tracing.py,sha256=ct7siXwNMINjGVXn9qr5h7XhDDM6Bi1uLljPUtcve-A,3403
-cqlshlib/formatting.py,sha256=NBHxsrXS3X8qcGewn98iTP7ys3JQUvWGf9iIWk-ErL0,23032
-scylla_cqlsh-6.0.12.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
-scylla_cqlsh-6.0.12.dist-info/RECORD,,
-scylla_cqlsh-6.0.12.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
-scylla_cqlsh-6.0.12.dist-info/METADATA,sha256=avDcI1vIZPR2JDcYnqBU5KA_blK7FjudMoTwplo93n0,2814
-scylla_cqlsh-6.0.12.dist-info/LICENSE.txt,sha256=JAuKOf39K9OzU5wC40RmM0iE_ISwVrV_BunaNTI-zZc,11360
-scylla_cqlsh-6.0.12.dist-info/WHEEL,sha256=1tl5Lkc4VfpMCkc6LryzXTS2SgqwxpqT8xGWgS4yh1M,109
+cqlshlib/cqlshhandling.py,sha256=BUu9wi7H1Xgil9lci-48TCPQ1xwe2-OTNXsW7jiewlM,10510
+scylla_cqlsh-6.0.14.dist-info/WHEEL,sha256=A6_DtUiDgMgD1W-StqbuJJbxCfEJTq71CSHdtaevATE,109
+scylla_cqlsh-6.0.14.dist-info/LICENSE.txt,sha256=JAuKOf39K9OzU5wC40RmM0iE_ISwVrV_BunaNTI-zZc,11360
+scylla_cqlsh-6.0.14.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
+scylla_cqlsh-6.0.14.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
+scylla_cqlsh-6.0.14.dist-info/RECORD,,
+scylla_cqlsh-6.0.14.dist-info/METADATA,sha256=MxJIX58wbUL6z3_HSouHvCxDcrciADd7jAm_UiJe0pI,2814
+cqlsh/__main__.py,sha256=-IR7kYVwXf9uq9OBeVlAB5I386E1N9iEhrjn3sCw-74,220
+cqlsh/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+cqlsh/cqlsh.py,sha256=wRvkXUQSD10T0m1boTZtKdFzMo_WI9ojjgDB4arD6q0,110899

{scylla_cqlsh-6.0.12.dist-info → scylla_cqlsh-6.0.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: false
 Tag: cp38-cp38-musllinux_1_1_i686