Commit Graph

1005 Commits

Author SHA1 Message Date
Stefan Miklosovic 71cef76faa Merge branch 'cassandra-4.0' into cassandra-4.1 2022-08-15 10:12:22 +02:00
Stefan Miklosovic 5023a816e3 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-08-15 10:10:28 +02:00
Stefan Miklosovic f821691239 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-08-15 10:08:14 +02:00
Stefan Miklosovic ebddf77924 Improve libjemalloc resolution in bin/cassandra
patch by Stefan Miklosovic; reviewed by Brandon Williams and David Capwell for CASSANDRA-15767
2022-08-15 10:05:20 +02:00
Attila Homoki 465547fded Increment CQLSH to version 6.2.0 for release 4.2
Patch by Attila Homoki; reviewed by Brandon Williams and Ekaterina Dimitrova for CASSANDRA-17646

Co-authored-by: Brad Schoening <5796692+bschoening@users.noreply.github.com>
2022-06-21 16:08:51 -04:00
Brad Schoening 72d5b4d1b1 add CQLSH command SHOW REPLICAS
patch by Brad Schoening; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-17577
2022-05-27 17:56:47 +02:00
Bhouse99 381c2a4fa8 add plugin support for CQLSH
patch by Brian Houser; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-16456
2022-04-27 12:35:04 +02:00
Brad Schoening 885836bc49 remove outdated code from cqlsh
Patch by Brad Schoening; reviewed by brandonwilliams and smiklosovic for
CASSANDRA-17490
2022-04-06 10:50:05 -05:00
Brad Schoening f28dd90feb resolve several pylint issues in cqlsh.py and pylib
patch by Brad Schoening; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-17480
2022-04-05 14:12:32 +02:00
Brad Schoening 768bdffe52 change six functions in cqlshlib to native Python 3 ones
patch by Brad Schoening; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-17417
2022-03-30 12:12:46 -05:00
Ekaterina Dimitrova 813e6ae4a0 Revert "change six functions in cqlshlib to native Python 3 ones"
This reverts commit 7275443eca.
2022-03-28 15:59:10 -04:00
Stefan Miklosovic cd5f215c72 ninja: expand user paths for cqlsh.py as part of CASSANDRA-17448
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-17448
2022-03-26 12:55:51 +01:00
Stefan Miklosovic e9ca465468 allow users to change cqlsh history location using env variable
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-17448
2022-03-24 23:24:21 +01:00
Brad Schoening 96cecdbaa6 Increase cqlsh version to 6.1.0
Patch by Brad Schoening; reviewed by bereng and brandonwilliams for
CASSANDRA-17432
2022-03-18 06:48:52 -05:00
Brad Schoening 7275443eca change six functions in cqlshlib to native Python 3 ones
patch by Brad Schoening; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-17417
2022-03-16 18:17:36 +01:00
Brad Schoening 27ab63f005 remove unused imports in cqlsh.py and cqlshlib
patch by Brad Schoening; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-17413
2022-03-08 09:34:23 +01:00
Yash Ladha f6169d399f add the shorter version of version flag (-v) in cqlsh
patch by Yash Ladha; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-17236
2022-02-09 19:11:56 +01:00
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
Brad Schoening 1eb7779464 remove python 2 code which is now EOL and unsupported
Patch by Brad Schoening; reviewed by brandonwilliams and bereng for
CASSANDRA-17242
2022-01-26 11:00:25 -06:00
Brandon Williams 9577fd36d6 Merge branch 'cassandra-4.0' into trunk 2022-01-20 10:09:36 -06:00
Brad Schoening bccb5adf95 Remove path for unused geomet package in cqlsh
Patch by Brad Schoening; reviewed by brandonwilliams and bereng for
CASSANDRA-17271

Remove path for unused `geomet` package, which does not appear to be
used in CQLSH.  It is an optional dependency of the cassandra-driver in
a test case.
2022-01-20 10:09:09 -06:00
Mick Semb Wever ed8571fe6f
Merge branch 'cassandra-4.0' into trunk 2021-11-21 20:54:08 +01:00
Jacek Lewandowski aaffb3b53e
Fixed broken classpath when multiple jars in build directory
Patch by Jacek Lewandowski reviewed by Michael Semb Wever and Brandon Williams for CASSANDRA-17129
2021-11-21 19:40:29 +01:00
Bowen Song 917d74bd35 add credentials file support for CQLSH
patch by Bowen Song; reviewed by Brian Houser, Stefan Miklosovic and Brandon Williams for CASSANDRA-16983
2021-10-11 18:33:16 +02:00
Bowen Song 5f97977dfa Ensure the cqlsh shell script does not behave unexpectedly on Python 3.10+
patch by Bowen Song; revieewed by Ekaterina Dimitrova, Brandon Williams for CASSANDRA-16987
2021-09-27 15:00:50 -04:00
Brandon Williams 82e0453901 Merge branch 'cassandra-3.11' into cassandra-4.0 2021-07-16 07:58:00 -05:00
Brandon Williams b60f4fed33 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-07-16 07:56:34 -05:00
Angelo Polo 75ddf76801 Ensure java executable is on the path.
Patch by Angelo Polo; reviewed by Aleksei Zotov, brandonwilliams and
edimitrova for CASSANDRA-14325
2021-07-16 07:54:35 -05:00
Ekaterina Dimitrova 77a370c424 Add a warning to cqlsh 6.0.0 that DESCRIBE does not work with a Cassandra 3.x servers
patch by Ekaterina Dimitrova; reviewed by Adam Holmberg and Benjamin Lerer for CASSANDRA-16652
2021-05-18 11:51:57 -04: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
Adam Holmberg 9783d47b9f Fix in-browser "help", Python 3
authored Adam Holmberg, reviewed by Ekaterina Dimitrova and Andres de la Pena for CASSANDRA-16658
2021-05-14 18:00:34 -04:00
Benjamin Lerer 42138f12b7 Merge branch cassandra-3.11 into cassandra-4.0 2021-05-06 12:15:11 +02:00
Brian Houser 4169c43ad7 Maps $CASSANDRA_LOG_DIR to cassandra.logdir java property when executing
nodetool

patch by Brian Houser; reviewed by Benjamin Lerer for CASSANDRA-16199
2021-05-06 12:10:51 +02: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
Brandon Williams 288bb9d902 Fix cqlsh encoding error with unicode in multi-line statement
Patch by Adam Holmberg; reviewed by brandonwilliams for CASSANDRA-16539
2021-05-04 08:45:26 -05:00
Adam Holmberg b60acd5f6f
Remove explicit protocol version in cqlsh
patch by Adam Holmberg; reviewed by Mick Semb Wever for CASSANDRA-16508
2021-03-16 20:42:12 +01:00
Jeff Widman 021232006c Increase the cqlsh version number
patch by Jeff Widman; reviewed by Benjamin Lerer for CASSANDRA-16509
2021-03-11 18:09:05 +01: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
Adam Holmberg 72ca73fbc6 deprecate python2.7 for cqlsh
Patch by Adam Holmberg; reviewed by brandonwilliams for CASSANDRA-16414
2021-02-26 14:52:38 -06:00
Sam Tunnicliffe c9d6c725dd Promote protocol v5 from beta
Patch by Sam Tunnicliffe; reviewed by Alex Petrov and Eduard Tudenhoefner
for CASSANDRA-14973
2021-02-23 16:46:39 +00:00
Adam Holmberg cb71f23958 cqlsh row_id resets on page boundaries
patch by Adam Holmberg; reviewed by Brandon Williams, David Capwell for CASSANDRA-16160
2020-12-17 09:17:43 -08:00
Yuki Morishita d9e2ed00af Remove windows scripts and their references
patch by Yuki Morishita; reviewed by Berenguer Blasi and Andrés de la Peña for CASSANDRA-16171
2020-12-02 16:43:45 +00:00
Sam Tunnicliffe a7c4ba9eee Improve checksumming and compression in protocol V5
This reverts the changes made to the native protocol V5 wire format in
CASSANDRA-13304 and subsequent follow up JIRAs (CASSANDRA-15556 &
CASSANDRA-14716). The framing format has been re-implemented based on the
internode messaging format developed in CASSANDRA-15066.

OPTIONS and STARTUP messages are unframed (i.e. identical to the V4 format).
After sending its response to a STARTUP message, the server modifies the
pipeline and all further messages are sent (and should be expected by the
client to be received) in the format determined by the protocol version of
the STARTUP message.

Patch by Sam Tunnicliffe; reviewed by Alex Petrov and Caleb Rackliffe
for CASSANDRA-15299
2020-12-01 18:49:06 +00:00
Rens Groothuijsen 1b1b87cfe3
Strip comment blocks from cqlsh input before processing statements
patch by Rens Groothuijsen; reviewed by Mick Semb Wever for CASSANDRA-15802
2020-08-20 13:57:01 +02:00
Ekaterina Dimitrova 8abbfc1fc5 Fix unicode characters in cqlsh input
Patch by Ekaterina Dimitrova, reviewed by dcapwell and brandonwilliams
for CASSANDRA-15990
2020-08-19 10:33:19 -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
Brandon Williams eebb9e02cd Merge branch 'cassandra-3.11' into trunk 2020-06-30 17:57:22 -05:00
yifan-c 9251b8116f Fix cqlsh output when fetching all rows in batch mode
Patch by Yifan Cai, reviewed by brandonwilliams for CASSANDRA-15905
2020-06-30 17:54:39 -05:00
Robert Stupp 4e47bfb3a1 Add support for server side DESCRIBE statements
patch by Robert Stupp; reviewed by Dinesh Joshi and Benjamin Lerer for CASSANDRA-14825
2020-06-29 18:01:02 +02:00
Dinesh A. Joshi ffa05ef240 Fix CQLSH UTF-8 encoding issue for Python 2/3 compatibility
This fix also addresses test failures due to cqlsh return code behavior change

Patch by Dinesh Joshi; Reviewed by Jordan West and Mick Semb Wever for CASSANDRA-15739
2020-04-22 12:44:47 -07:00
Dinesh A. Joshi 6ee67a64ea Merge branch 'cassandra-3.11' into trunk 2020-04-17 22:26:24 -07:00
Dinesh A. Joshi 9b940a511c Merge branch 'cassandra-3.0' into cassandra-3.11 2020-04-17 22:14:18 -07:00
Jacob Becker a738c58022 cqlsh return non-zero status when STDIN CQL fails
Patch By Jacob Becker a.k.a. plastikat; reviewed by Jordan West and Dinesh Joshi for CASSANDRA-15623
2020-04-17 21:47:40 -07:00
Zhao Yang 781e4862fa Fix CQLSH to avoid arguments being evaluated
Patch By Zhao Yang; reviewed by Dinesh Joshi and Brandon Williams for CASSANDRA-15660
2020-04-16 09:51:48 -07:00
Eduard Tudenhoefner c05443c098
Allow cqlsh to run with Python 2.7/Python 3.6+
* Adds a minimal manual test that starts cqlsh with python3.7 & 3.8 in a Docker container. It also fixes a minor issue when starting up cqlsh with python3.7+, where `webbrowser._tryorder` is `None` as can be seen in https://github.com/python/cpython/blob/3.7/Lib/webbrowser.py#L1. Note that we're checking `webbrowser._tryorder` for `None` instead of doing `webbrowser.get()` because it's likely that there's no default browser installed in a Dockerized environment and so things would fail with `could not locate runnable browser` (https://github.com/python/cpython/blob/3.7/Lib/webbrowser.py#L65)
 * Adds python3.8 testing to CircleCI
 * Fixes some Python warnings that occur with newer versions

 patch by Eduard Tudenhöfner, reviewed by Mick Semb Wever for CASSANDRA-15659
2020-04-14 20:58:40 +02:00
Yuki Morishita d069fd235f Fix cqlsh erroring out on Python 3.7 due to webbrowser module being absent
Patch by Yuki Morishita; Reviewed by Dinesh Joshi for CASSANDRA-15572
2020-04-07 16:24:22 -07:00
Brandon Williams 324267b3c0 Merge branch 'cassandra-3.11' into trunk 2020-02-26 11:51:01 -06:00
Brandon Williams 1b29401e2a Merge branch 'cassandra-3.0' into cassandra-3.11 2020-02-26 11:48:10 -06:00
Brandon Williams 461ae2b2ca Merge branch 'cassandra-2.2' into cassandra-3.0 2020-02-26 11:47:26 -06:00
Brandon Williams b2b1b46486 Allow EXTRA_CLASSPATH to work on tar/source installations
Patch by brandonwillams, reviewed by David Capwell for CASSANDRA-15567
2020-02-26 11:46:32 -06:00
Joaquin Casares d629a58045 Unset GREP_OPTIONS
Patch by Joaquin Casares; Reviewed by Jon Haddad for CASSANDRA-14487
2020-02-20 17:14:34 -08:00
Dinesh A. Joshi f7b3317379 Update to Python driver 3.21 for cqlsh
Patch by Dinesh Joshi; reviewed by Jon Haddad, Andy Tolbert and David Capwell for CASSANDRA-14872
2020-02-20 15:38:44 -08:00
Dinesh A. Joshi 4e0fccc3ed Fix missing Keyspaces in cqlsh describe output
Patch by Dinesh Joshi; reviewed by Jon Haddad and David Capwell for CASSANDRA-15576
2020-02-18 11:26:29 -08:00
Michael Shuler 39d170ccd1 Merge branch 'cassandra-3.11' into trunk 2020-02-17 14:09:41 -06:00
Michael Shuler c93c2983cd Switch from www.apache.org/dist to downloads.apache.org 2020-02-17 14:09:01 -06: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
Sam Tunnicliffe 164c8f6def Merge branch 'cassandra-3.11' into trunk 2019-10-08 18:46:33 +01:00
Sam Tunnicliffe 3040965668 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-10-08 18:44:48 +01:00
Sam Tunnicliffe 0388d89e29 Allow max protocol version to be capped
Patch by Sam Tunnicliffe; reviewed by Alex Petrov and Aleksey
Yeschenko for CASSANDRA-15193
2019-10-08 18:09:52 +01:00
Mick Semb Wever 18bcda2d4c
Merge branch 'cassandra-3.11' into trunk 2019-05-27 10:45:35 +10:00
Mick Semb Wever 6e5150697e
Merge branch 'cassandra-3.0' into cassandra-3.11 2019-05-27 10:44:38 +10:00
Mick Semb Wever ac10b81731
Add ability to customize cassandra log directory using $CASSANDRA_LOG_DIR
Patch by Zephyr Guo; Reviewed by Mick Semb Wever for CASSANDRA-15090
2019-05-27 10:19:20 +10:00
Jason Brown f54ac59ac7 Merge branch 'cassandra-3.11' into trunk 2018-12-03 05:15:18 -08:00
Georg Dietrich 85e402a7fd Make stop-server.bat wait for Cassandra to terminate
patch by Georg Dietrich; reviewed by Dinesh Joshi for CASSANDRA-14829
2018-12-03 05:12:49 -08:00
pksivar 6e00ab956e Allow using custom script for chronicle queue BinLog archival
Patch by Pramod K Sivaraju and marcuse; reviewed by Ariel Weisberg
and Sam Tunnicliffe for CASSANDRA-14373
2018-10-11 13:06:34 +02:00
Mick Semb Wever 0aca1b9df8
Merge branch 'cassandra-3.0' into cassandra-3.11 2018-09-05 11:20:12 +10:00
Mick Semb Wever 21ec39a9d6
Merge branch 'cassandra-2.2' into cassandra-3.0 2018-09-05 11:17:49 +10:00
Mick Semb Wever 62e48c5f3f
Fix incorrect cqlsh results when selecting same columns multiple times
Patch by Anthony Grasso; reviewed by Mick Semb Wever for CASSANDRA-13262
2018-09-05 11:13:49 +10:00
Sam Tunnicliffe 65fb17a88b Add checksumming to the native protocol
Patch my Michael Kjellman and Sam Tunnicliffe; reviewed by Dinesh Joshi
and Jordan West for CASSANDRA-13304
2018-09-01 22:41:37 +01:00
Marcus Eriksson f83bd5ac2b Add fqltool compare
Patch by marcuse; reviewed by Jason Brown and Dinesh Joshi for CASSANDRA-14619
2018-09-01 09:59:21 +02:00
Robert Stupp 6ba2fb9395 Make C* compile and run on Java 11 and Java 8
patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-9608
2018-07-26 18:20:00 +02:00
Jason Brown c5285d21c1 Merge branch 'cassandra-3.11' into trunk 2018-05-29 05:21:36 -07:00
Thomas Steinmaurer b8cbdde2b8 Reduce nodetool GC thread count
patch by Thomas Steinmaurer; reviewed by jasobrown for CASSANDRA-14475
2018-05-29 05:19:26 -07:00
Chris Lohfink 0d464cd25f Implement virtual keyspace interface
patch by Benjamin Lehrer, Chris Lohfink, and Aleksey Yeschenko for
CASSANDRA-7622
2018-05-18 16:45:45 +01:00
Stefan Podkowinski 845243db93 Fix cqlsh.py ssl flag regression
patch by Stefan Podkowinski; reviewed by Jay Zhuang for CASSANDRA-14299
2018-04-17 10:46:57 +02:00
Jason Brown 1188fcb082 Merge branch 'cassandra-3.11' into trunk 2018-02-12 05:16:46 -08:00
Jason Brown f6ec5c5d18 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-12 05:09:58 -08:00
Amichai Rothman 91e83c72de Add MinGW uname check to start scripts
patch by Amichai Rothman; reviewed by jasobrown for CASSANDRA-12940
2018-02-12 05:07:58 -08:00
Ariel Weisberg 59b5b6bef0 Allow storage port to be configurable per node
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-7544
2018-01-25 14:32:24 -05:00
Jason Brown 1cb91eaaaa Merge branch 'cassandra-3.11' into trunk 2018-01-19 05:15:28 -08:00
Jason Brown d0b7566ff8 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-01-19 05:14:45 -08:00
Jason Brown 0d728c1943 ninja-fix a minor documentation oversight in bin/cassandra (CASSANDRA-14175) 2018-01-19 05:12:45 -08:00
Jason Brown 6d324f9d76 Merge branch 'cassandra-3.11' into trunk 2018-01-15 06:06:51 -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
Benjamin Lerer 17e602b7d2 Merge branch cassandra-3.11 into trunk 2017-12-12 10:52:23 +01:00