scylla-cqlsh 6.0.12__cp38-cp38-win32.whl → 6.0.14__cp38-cp38-win32.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.cp38-win32.pyd,sha256=0hJX7xe27BrghCRK4Z2lqmmTNKIckFRK3n-8tsGfnqc,1081856
+copyutil.cp38-win32.pyd,sha256=Xzvce1F-dpXZ4GzSQn1Wy0vEBgtZZkkgYss2Fc4gQhA,1096192
 cqlsh/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 cqlsh/__main__.py,sha256=x2NuvlSuAKwNCxiX07YoYfxog9JNAO759ZxnjBEcfus,231
-cqlsh/cqlsh.py,sha256=R5jsHxVkxucdpqd4rgijNKt4DTOCOwn9LniIUNIZsXQ,113292
+cqlsh/cqlsh.py,sha256=dtlp2xwaXu7LLEWOp7xdtV7poRj1aGChOxinTOzeINw,113614
 cqlshlib/__init__.py,sha256=3M0IQCsjdCGYEOBT20swSvqxV6V8vg_mu1uJig78Vmk,3274
-cqlshlib/_version.py,sha256=w8Eg1oQDQX1pirunZwWUeuWjt_uSU_bO9z4cX6J9c34,166
+cqlshlib/_version.py,sha256=P4uuvLDAh0hkAc3F2dlAYC69Lvb3JASlaa7eaxVsY0c,429
 cqlshlib/authproviderhandling.py,sha256=goFjJCO1FKuVCXU7KXlmlorx_cD_oIRlgpOeH13W--g,7254
-cqlshlib/copyutil.py,sha256=Hr8Ie7jgJZSatrk474FfDSiY2Am-TrcKONINVgQMY4U,115743
+cqlshlib/copyutil.py,sha256=6d8F5kVr3UPFVRvmX4t5yr3PId1a4L6PBYwFyZUjOaM,116130
 cqlshlib/cql3handling.py,sha256=7lwOXRGeDH-IDy2ENNJ3dbeP5o3LRmlonvIoO9rs6kw,59132
 cqlshlib/cqlhandling.py,sha256=hiqjCKY5fQnqSEeugYJgAD3hRiloqUtOUTSg_GccL4A,13436
 cqlshlib/cqlshhandling.py,sha256=cMlDbq5MuXagJmq-qpJxRqwstOAawWUu2rry6tfHV_w,10824
 cqlshlib/displaying.py,sha256=WxKcYuX098sa6NoyPeYwJod0zutkrTm2Zm3riIhrYpA,4105
 cqlshlib/formatting.py,sha256=-oKYKPHUH9o2GFUC8QPWs3cbDplJ6awn_Xw4uIMuIUg,23633
 cqlshlib/helptopics.py,sha256=Dh2qBHFWJHwkZyQKfC6Ma5o-grLix2uqnFba6UTYxVA,4714
-cqlshlib/pylexotron.py,sha256=G6Ih2dQBciQVVdZaDTGIEZNoT2aQ-s-qOzE3J5uYpds,19836
+cqlshlib/pylexotron.py,sha256=YHThu6pk9kDNoTOuJTDdXBXbso7eQjmAWqh9qy4w5l0,19835
 cqlshlib/saferscanner.py,sha256=N5ugQIf-ZyJ8w8CtkY-6f8F8OpqgUSJgyMuusA4yWSM,3630
 cqlshlib/sslhandling.py,sha256=GaZ5Mc6skkwgz83CUWnkka6_Nk71Pag-pL-mA2Je9uU,4014
 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.12.dist-info/LICENSE.txt,sha256=65AZdlqRQxiyMBv8nY6itMITk5jx9EkE_jHujbcDzbk,11564
-scylla_cqlsh-6.0.12.dist-info/METADATA,sha256=KLzmMhlsSBubBwp9-wp6W3adzbotdbKjvD--pC8OoU4,2910
-scylla_cqlsh-6.0.12.dist-info/WHEEL,sha256=y8qDGGdi2jzVmdhM7TFDumLpecKSDSzZ5cZMyFFuIFQ,96
-scylla_cqlsh-6.0.12.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
-scylla_cqlsh-6.0.12.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
-scylla_cqlsh-6.0.12.dist-info/RECORD,,
+scylla_cqlsh-6.0.14.dist-info/LICENSE.txt,sha256=65AZdlqRQxiyMBv8nY6itMITk5jx9EkE_jHujbcDzbk,11564
+scylla_cqlsh-6.0.14.dist-info/METADATA,sha256=ee0ZfXoFb7JD1dVOSdOGOwf6SGfg3TuXAohMXlRRJO0,2910
+scylla_cqlsh-6.0.14.dist-info/WHEEL,sha256=EiQJdJz9MF-Ytxz_yg7pufUbIRgyTkoi17ceXLlE8lo,96
+scylla_cqlsh-6.0.14.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
+scylla_cqlsh-6.0.14.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
+scylla_cqlsh-6.0.14.dist-info/RECORD,,

{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-win32