Commit Graph

810 Commits

Author SHA1 Message Date
mck be0b73ecba
Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  Add option to disable cqlsh history
2026-03-17 23:08:14 +01:00
Stefan Miklosovic b5b1c529f7
Merge branch 'cassandra-4.1' into cassandra-5.0 2026-03-11 14:20:29 +01:00
Stefan Miklosovic 0f8fd6a3fb
Merge branch 'cassandra-4.0' into cassandra-4.1 2026-03-11 14:19:27 +01:00
arvindksi274-ksolves ee635f5c45
Fix instructions in README.asc of pylib
patch by Arvind Kandpal; reviewed by Stefan Miklosovic, Michael Semb Wever for CASSANDRA-20181
2026-03-11 14:10:57 +01:00
Mick Semb Wever fc0ee48ea2
Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  3.x cqlshlib tests broken on python2.7
2025-12-19 23:44:01 +01:00
Mick Semb Wever 99db2874ba
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  3.x cqlshlib tests broken on python2.7
2025-12-19 23:43:16 +01:00
Mick Semb Wever 3c66c74a0f
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  3.x cqlshlib tests broken on python2.7
2025-12-19 23:34:52 +01:00
Mick Semb Wever 0293e8b750
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  3.x cqlshlib tests broken on python2.7
2025-12-19 23:34:02 +01:00
Mick Semb Wever 9e04193c3f
3.x cqlshlib tests broken on python2.7
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-21079
2025-12-19 23:22:13 +01:00
Brad Schoening 49c8122d8f
Avoid CQLSH throwing an exception loading .cqlshrc on non-supported platforms
While we do not support Windows as such (at least on server), reviewers evaluated that this might be fixed
as the gains (Windows users using CQLSH to connect to Cassandra running on supported platforms) are justified.

patch by Brad Schoening; reviewed by Brandon Williams, Josh McKenzie for CASSANDRA-20478
2025-05-23 17:49:28 +02:00
mck 07e656fe2b
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Fix cassandra-cqlsh-tests.sh on python <= 3.8
2025-05-21 23:28:08 +02:00
mck fd3f8249d5
Fix cassandra-cqlsh-tests.sh on python <= 3.8
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-20669
2025-05-21 23:26:33 +02:00
Stefan Miklosovic 36e46df4b1
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-02-04 10:55:16 +01:00
Stefan Miklosovic b044009f0b
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-02-04 10:51:21 +01:00
Francisco Guerrero 4f9e474bb1
Fix autocompletion for role names/user names
patch by Francisco Guerrero; reviewed by Stefan Miklosovic, Bernardo Botella for CASSANDRA-20175
2025-02-04 10:44:12 +01:00
Stefan Miklosovic e9ea2772dd
Merge branch 'cassandra-4.1' into cassandra-5.0 2024-09-24 14:22:12 +02:00
Stefan Miklosovic 662ce36a7b
Merge branch 'cassandra-4.0' into cassandra-4.1 2024-09-24 13:57:32 +02:00
vgali7 a79f7f4b00
Fix text containing "/*" being interpreted as multiline comment in cqlsh
patch by Vineet Gali; reviewed by Brandon Williams, Brad Schoening for CASSANDRA-17667

Co-authored-by: Attila Homoki <biotep@yahoo.com>
Co-authored-by: Brad Schoening <bschoeni@gmail.com>
2024-09-24 13:21:24 +02:00
Stefan Miklosovic 63b4e1c41c
Merge branch 'cassandra-4.1' into cassandra-5.0 2024-07-09 17:09:30 +02:00
Stefan Miklosovic a878adfc89
Do not create a role if ALTER ROLE IF EXISTS operates on non-existing role
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-19749
2024-07-09 17:03:25 +02:00
Stefan Miklosovic 59a5c6477d
Merge branch 'cassandra-4.1' into cassandra-5.0 2024-05-14 11:31:40 +02:00
Mick Semb Wever f7c11bdcd4
Standalone Jenkinsfile
– ensure test file paths, and their suite names are unique (the latter was broken for cqlshlib and python dtests)
 – removal of properties and system-out in test xml happens in CassandraXMLJUnitResultFormatter
 – new jenkins agent labels and introduce agents sizes
 - ci_summary.html generation script, ref work submitted in apache/cassandra-builds#99
 – fix for stress-test and fqltool-test running on small
 - ant generate-test-report is limited to only running on individual test types (ci_parser.py provides ci_summary.html for the overview now)
 - each cell has a single retry, and the retry will happen on a different agent
 - on ci-cassandra the summary stage happens on the builtin, bc copyArtifacts on 15k+ files takes many hours otherwise
 - test-burn only needs two splits
 - dependency-check is disabled from the lint target until CASSANDRA-19213
 - add $DEBUG env var to in-tree scripts, turns on bash debug
 - fix FBUtilities' handling of gcp cos_containerd (kernel version comes with a trailing '+' character)

 patch by Aleks Volochnev, Mick Semb Wever; reviewed by Aleksandr Volochnev, Josh McKenzie, Maxim Muzafarov, Stefan Miklosovic for CASSANDRA-18594

Co-authored-by: Aleksandr Volochnev <a.volochnev@gmail.com>
Co-authored-by: Mick Semb Wever <mck@apache.org>
Co-authored-by: Josh McKenzie <jmckenzie@apache.org>
Co-authored-by: Artem Chekunov <artem.v.chekunov@gmail.com>
2024-04-04 11:56:36 +02:00
Caleb Rackliffe 8a33f32350 Deprecate Python 3.7 and earlier, but allow cqlsh to run with Python 3.6-3.11
patch by Caleb Rackliffe; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-19467
2024-03-19 23:41:47 -05:00
Lorina Poland 2aa2b59d37
Minor adds and fixes in the documentation
patch by Lorina Poland; reviewed by Michael Semb Wever for CASSANDRA-19249, CASSANDRA-18990, CASSANDRA-15719

Co-authored-by: Annette Dennis <annette.dennis@datastax.com>
Co-authored-by: Mohsin Medmood <mohsin85mehmood@gmail.com>
Co-authored-by: Josh Wong <joshuarwong@outlook.com>
2024-02-16 12:29:37 +01:00
Szymon Miężał c76b32492f Add support of vector type to cqlsh COPY command
This patch adds a converter that allows parsing vector literals
passed via csv files to the COPY command.

patch by Szymon Miezal; reviewed by Andrés de la Peña, Stefan Miklosovic and Maxwell Guo for CASSANDRA-19118
2024-01-22 14:35:32 +00:00
Andrés de la Peña 8fd44ca8fc Upgrade Python driver to 3.29.0
patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-19245
2024-01-19 17:14:57 +00:00
Brandon Williams f9ebec98a2 Fix cqlshlib cython test by definining DIST_DIR
Patch by brandonwilliams, reviewed by bereng for CASSANDRA-19183
2023-12-14 08:49:23 -06:00
Mick Semb Wever fe7997884d
Write ccm clusters under test's TMPDIR
This prevents docker overlay file leakage from containers by keeping write-heavy directories in bind mounts (or volumes). It also offers better performance by avoiding the container filesystem.

 patch by Mick Semb Wever; reviewed Brandon Williams for INFRA-25202
2023-12-04 13:26:57 +01:00
Ethan Brown fb806d51e3
Add UCS sstable_growth and min_sstable_size options
patch by Ethan Brown; reviewed by Branimir Lambov, Stefan Miklosovic for CASSANDRA-18945
2023-11-14 21:41:07 +01:00
Andrés de la Peña b91c0fcb6e Change cqlsh's min required Python version from 3.6+ to 3.7+
patch by Andrés de la Peña; reviewed by Brandon Williams for CASSANDRA-18960
2023-11-14 11:43:00 +00:00
Brandon Williams 127f718797 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-11-13 14:18:04 -06:00
Andrés de la Peña f41ecf586c Upgrade Python driver to 3.28.0
patch by Andrés de la Peña and Jeremiah Jordan; reviewed by Brandon Williams for CASSANDRA-18960

Co-authored-by: Jeremiah Jordan <jeremiah@datastax.com>
Co-authored-by: Andrés de la Peña <a.penya.garcia@gmail.com>
2023-11-02 17:08:38 +00:00
Andrés de la Peña 5eba52feb8 Add cqlsh autocompletion for the vector data type
patch by Andrés de la Peña; reviewed by Brandon Williams for CASSANDRA-18946
2023-10-25 11:54:01 +01:00
Stefan Miklosovic b9f614f7e5
Remove deprecated properties in CompressionParams
This patch removes deprecated chunk_length_kb and sstable_compression in favor of
chunk_length_in_kb and class parameters.

The only deprecated compression parameter left, crc_check_chance (which is configurable outside
of compression parameters as a standalone table parameter) is meant to be treated separately.

patch by Stefan Miklosovic; reviewed by Maxim Muzafarov and Brandon Williams for CASSANDRA-18742
2023-09-29 15:19:12 +02:00
Brad Schoening b58d8f174d
Make the output of ON/OFF commands in cqlsh consistent
patch by Brad Schoening; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18547
2023-09-27 12:27:19 +02:00
Stefan Miklosovic 66bc1daf16
Merge branch 'cassandra-4.1' into cassandra-5.0 2023-09-05 16:58:50 +02:00
Mick Semb Wever 865954fd99
Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  Missing license info and headers
2023-08-31 22:43:33 +02:00
Mick Semb Wever 20125c5053
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Missing license info and headers
2023-08-31 22:41:56 +02:00
Mick Semb Wever aa2494b30b
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Missing license info and headers
2023-08-31 22:39:56 +02:00
Mick Semb Wever 14e89fc3c7
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Missing license info and headers
2023-08-31 22:36:33 +02:00
Mick Semb Wever ce49e775f7
Missing license info and headers
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18807
2023-08-31 22:30:42 +02:00
Brandon Williams ef2903f20f Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-18 14:00:28 -05:00
Brandon Williams 9e0ccf0f95 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-18 10:14:40 -05:00
Stefan Miklosovic ada67cb2a4
Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-08 18:05:20 +02:00
Shailaja Koppu 933137fb14 CIDR filtering authorizer
Patch by Shailaja Koppu, Yifan Cai; Reviewed by Dinesh Joshi, Yifan Cai for CASSANDRA-18592

Co-Authored-By: Yifan Cai <ycai@apache.org>
2023-07-28 20:10:02 -07:00
Stefan Miklosovic 4a46992724
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-07-25 09:55:47 +02:00
Stefan Miklosovic ac26b44f9d
Merge branch 'cassandra-4.1' into trunk 2023-07-25 10:43:18 +02:00
Mick Semb Wever f5df4b219e
Move build and test scripts in-tree, under .build/
See .build/README.md  .Build and test scripts cover all CI activities in an CI agnostic manner. Scripts are found in non-docker and dockerised variants.

The non-docker scripts are found first under .build/ .These interact directly with ant, providing additional checks and environment setup. It is intended that what can be pushed down into the base ant build layer should be. The
debian and redhat build scripts are hidden under .build/docker because they are generally not usuable outside of their corresponding linux dists, and we don't want to encourage anything to the contrary.  Bring the artifact/deb/rpm
build scripts (and associated docker images) from cassandra-builds repo to the .build directory.  These packaging script for debian and redhat are now separated from the artifacts scripts. An additional build script check-code.sh
has been added that is solely responsible for all linter and code checks (includes owasp dependency checker).  Only JDK11 and JDK17 are supported (as JDK8 is soon to be dropped).  Scripts do not clean (or realclean) so that
scripts can be better pipelined, but `ant jar` was required to be added to circleci and ci-cassandra.a.o cqlsh-tests.  Scripts can define a custom BUILD_DIR (build.dir) which can permit running parrallel builds off the same source
(though not all tests support this, or their support for it has atrophied).  All build and test artifacts, results, and logs are found under build/ (or the BUILD_DIR).  The build local venv and .ccm directories are now also
created under build (or BUILD_DIR).  The test venv, logs and results are wiped each run.  Use a separate mktemp directory each run, under /tmp (respect /tmp responsibility, and python fails when tmpdir is on a docker volume).
Don't set CASSANDRA_HOME when running python dtests (and fail-fast if `ant artifacts` was used to build instead of `ant jar`).

The docker scripts are found lower down under .build/docker/ .These scripts re-used the non-docker scripts inside containers. The docker images are versioned controlled in the same directory as dockerfiles, and tagged by their
md5sums.  When running the docker scripts these docker images will, if not in the local registry, will first be attempted to be pulled from dockerhub and only then fallback to be built locally.  This allows the dockerfiles to be
modified in existing patches and be run in existing CI as-is.  Docker scripts timeout after one hour.  virtualenv-clone is used, re-using the python versioned venvs in the image saves time over creating new ones each run.  The inner-spliting of docker containers has been removed.  It added a lot of complexity, for the most part duplicating the splitting concept, for little performance gain.

Ant target 'generate-unified-test-report' added, used for aggregating test reports and printing a summary.

 patch by Mick Semb Wever; reviewed by Brandon Williams, Josh McKenzie, Maxim Muzafarov, Stefan Miklosovic for CASSANDRA-18133
2023-07-12 12:59:37 +02:00
Leonard Ma a2dc44f072
Remove dependency on pytz library for setting CQLSH timezones on Python version >= 3.9
patch by Leonard Ma; reviewed by Brad Schoening, Brandon Williams and Stefan Miklosovic for CASSANDRA-17433
2023-06-05 21:13:30 +02:00
Brad Schoening 61333964f4
Add HISTORY command for CQLSH
patch by Brad Schoening; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-15046
2023-05-23 14:02:23 +02:00