Commit Graph

135 Commits

Author SHA1 Message Date
Stefan Miklosovic da47849b50 Remove Windows-specific classes and related code
patch by Stefan Miklosovic; reviewed by Joshua McKenzie, Bowen Song, Berenguer Blasi for CASSANDRA-16956
2022-02-05 15:41:33 +01:00
Brandon Williams aecac82027 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-01-11 08:25:51 -06:00
Brandon Williams b17d701c58 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-01-11 08:23:01 -06:00
Johannes Weißl 75e0e8cf41 Fix cqlsh COPY abort on window resize
Patch by Johannes Weißl; reviewed by brandonwilliams and bereng for
CASSANDRA-15230
2022-01-11 08:22:15 -06:00
Brandon Williams 1579d20ceb ninja remove noisly line during cqlsh export 2021-06-14 11:00:20 -05:00
Adam Holmberg 0301fc6cea cqlsh: fix DESC TYPE with non-ascii character in the identifier
Patch by Adam Holmberg; reviewed by brandonwilliams for CASSANDRA-16400
2021-05-17 14:54:58 -05:00
Brandon Williams a3db11831a Revert "Fix cqlsh DESC TYPE with non-ascii character in the identifier"
This reverts commit 327d7c1803.
2021-05-05 07:21:53 -05:00
Adam Holmberg 327d7c1803 Fix cqlsh DESC TYPE with non-ascii character in the identifier
Patch by Adam Holmberg; reviewed by brandonwilliams for CASSANDRA-16400
2021-05-04 11:52:23 -05:00
Jeff Widman 3d539d908f Update python2 doc references to point to py3
Patch by Jeff Widman; reviewed by brandonwilliams for CASSANDRA-16505
2021-03-09 17:15:07 -06:00
Brandon Williams ff49fd9253 Merge branch 'cassandra-3.11' into trunk 2021-01-12 13:29:39 -06:00
Brandon Williams 22a0927391 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-01-12 13:26:05 -06:00
Aleksandr Sorokoumov a542b86504 Allow empty string in collections with COPY FROM in cqlsh
Patch by Aleksandr Soromoukov, reviewed by brandonwilliams for
CASSANDRA-16372
2021-01-12 13:22:18 -06:00
Aleksandr Sorokoumov c1008cc1ea CASSANDRA-16372 COPY FROM does not report failed rows as imported 2021-01-12 13:21:03 -06:00
Adam Holmberg 0e53379ec9 stop passing unpicklable Cluster object to spawned child processes in
cqlsh

Patch by Adam Holmberg, reviewed by Ekaterina Dimitrova and
brandonwilliams for CASSANDRA-16053
2020-08-20 15:02:51 -05:00
Caleb Rackliffe 47ac595036 Backport CASSANDRA-12189, formatting fixes
Patch by Caleb Rackliffe, reviewed by brandonwilliams for
CASSANDRA-15948
2020-07-15 14:20:53 -05:00
Caleb Rackliffe 5774415368 Backport CASSANDRA-12189, formatting fixes
Patch by Caleb Rackliffe, reviewed by brandonwilliams for
CASSANDRA-15948
2020-07-15 14:15:53 -05:00
Eduard Tudenhoefner 58015fd681 Use Exception.message in copyutil.py only if it exists
Exception.message was removed in Python 3, so only refer to it when it
exists on an Exception instance.

Also fix code style compliance in formatting.py (missing blank lines)

patch by Eduard Tudenhoefner; reviewed by Stefania Alborghetti for CASSANDRA-15702
2020-04-09 11:44:30 -04:00
Stefania Alborghetti 2f781819b1 Merge branch 'cassandra-3.11' into trunk 2020-04-09 09:05:14 -04:00
Stefania Alborghetti 57b0bb93ab Merge branch 'cassandra-3.0' into cassandra-3.11 2020-04-09 09:01:42 -04:00
Stefania Alborghetti fe263ad9e9 Merge branch 'cassandra-2.2' into cassandra-3.0 2020-04-09 08:58:55 -04:00
Stefania Alborghetti c8081c2467 Merge branch 'cassandra-2.1' into cassandra-2.2 2020-04-09 08:56:38 -04:00
Aleksandr Sorokoumov f3568c0d50 Fix parse error in cqlsh COPY FROM and formatting for map of blobs
patch by Aleksandr Sorokoumov; reviewed by Stefania Alborghetti for CASSANDRA-15679
2020-04-07 12:32:15 -04:00
Patrick Bannister bf9a1d487b Make cqlsh and cqlshlib Python 2 & 3 compatible
Patch by Patrick Bannister; reviewed by Dinesh Joshi, Andy Tolbert and David Capwell for CASSANDRA-10190
2020-02-14 10:33:57 -08:00
Jason Brown 02bbdd6342 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-01-15 06:05:04 -08:00
Jason Brown 685dde10e3 Merge branch 'cassandra-2.2' into cassandra-3.0 2018-01-15 06:03:22 -08:00
Jason Brown 503aec74a5 Merge branch 'cassandra-2.1' into cassandra-2.2 2018-01-15 06:01:14 -08:00
Michael Kjellman f8d73a3acb More PEP8 compliance for cqlsh
patch by Michael Kjellman; reviewed by Jay Zhuang for CASSANDRA-14021
2018-01-15 05:56:44 -08:00
Stefania Alborghetti 92e304277c Merge branch 'cassandra-3.0' into cassandra-3.11 2017-06-06 08:53:34 +08:00
Stefania Alborghetti 17a7a806c8 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-06-06 08:52:19 +08:00
Kurt 5807eca8bb cqlsh COPY FROM: increment error count only for failures, not for attempts
patch by Kurt Greaves; reviewed by Stefania Alborghetti for CASSANDRA-13209
2017-06-06 08:49:17 +08:00
Stefania Alborghetti 980f32d563 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-04-07 09:05:53 +08:00
Stefania Alborghetti a8a3d4e282 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-04-07 09:03:54 +08:00
Stefania Alborghetti 377f6117ce Merge branch 'cassandra-2.1' into cassandra-2.2 2017-04-07 09:02:40 +08:00
Stefania Alborghetti 010b5f3a56 Fix ParseError unhashable type list in cqlsh copy from
patch by Stefania Alborghetti; reviewed by Alex Petrov for CASSANDRA-13364
2017-04-07 08:57:54 +08:00
Stefania Alborghetti 943fb02ffd Merge branch 'cassandra-3.0' into cassandra-3.11 2017-03-02 10:00:20 +08:00
Stefania Alborghetti 496cfa8f5b Cqlsh copy-from should error out when csv contains invalid data for collections
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-13071
2017-03-02 09:58:58 +08:00
Paulo Motta b3490c0624 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-22 17:20:37 -03:00
Paulo Motta 5fba118e95 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-02-22 17:19:08 -03:00
Márton Salomváry 88f36a0955 Fix failing COPY TO STDOUT
Patch by Márton Salomváry; Reviewed by Paulo Motta for CASSANDRA-12497
2017-02-22 17:12:34 -03:00
Stefania Alborghetti ad8c23691a Merge branch 'cassandra-3.0' into cassandra-3.11 2017-01-06 10:04:29 +01:00
Stefania Alborghetti 65bd455235 Replace empty strings with null values if they cannot be converted
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-12794
2017-01-06 10:03:11 +01:00
Stefania Alborghetti b98767868a Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-22 11:20:36 +08:00
Stefania Alborghetti b0f85b96dc Merge branch 'cassandra-2.2' into cassandra-3.0 2016-12-22 11:19:32 +08:00
Stefania Alborghetti f4fd0928e6 cqlsh copy-from: encode column names to avoid primary key parsing errors
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-12909
2016-12-22 11:17:39 +08:00
Stefania Alborghetti 958ba452e7 Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-22 10:29:15 +08:00
Stefania Alborghetti 11f7ba9481 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-12-22 10:27:23 +08:00
Stefania Alborghetti 6bce8b0270 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-12-22 10:25:27 +08:00
Stefania Alborghetti bdca25e96e cqlsh copy-from: sort user type fields in csv
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-12959
2016-12-22 10:23:57 +08:00
Stefania Alborghetti 574ca2e2dd Merge branch 'cassandra-3.0' into cassandra-3.X 2016-11-11 11:01:41 +08:00
Stefania Alborghetti 14b52bca30 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-11-11 11:00:13 +08:00