Commit Graph

1771 Commits

Author SHA1 Message Date
Maxim Muzafarov dc7234134c
Upgrade snappy-java to 1.1.10.4
patch by Maxim Muzafarov; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18878
2023-09-27 20:49:09 +02:00
Jacek Lewandowski 02cdaf5b92 Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  JMH improvements - faster build and async profiler
2023-09-25 12:39:40 +02:00
Jacek Lewandowski 54ef3a1c7e Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  JMH improvements - faster build and async profiler
2023-09-25 12:39:39 +02:00
Jacek Lewandowski 2747dbf091 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  JMH improvements - faster build and async profiler
2023-09-25 12:39:38 +02:00
Jacek Lewandowski 3658ba58c7 JMH improvements - faster build and async profiler
- Don't create uber jar for microbenchmarks
- Add async profiler to jmh tests
- Benchmark classes names validation
- Add jmh.args property to make it possible passing extra args to JMH
- Add missing test/anttasks to idea configuration

Patch by Jacek Lewandowski; reviewed by Branimir Lambov, Maxim Muzafarov, Stefan Miklosovic for CASSANDRA-18871
2023-09-25 12:39:36 +02:00
Ekaterina Dimitrova 89065ffa21 Merge branch 'cassandra-5.0' into trunk 2023-09-14 12:15:45 -04:00
Ekaterina Dimitrova 2b23fc58aa Fix accessing java.nio.Bits.TOTAL_CAPACITY in Java17
patch by Ekaterina Dimitrova; reviewed by Stefan Miklosovoc and Mick Semb Wever for CASSANDRA-18848
2023-09-14 12:00:11 -04:00
Mick Semb Wever f19dd0bb13
Increment version to 5.0-alpha2 2023-09-08 16:12:12 +02:00
Ekaterina Dimitrova 4621ec7782 Merge branch 'cassandra-5.0' into trunk 2023-08-30 10:51:35 -04:00
Ekaterina Dimitrova ae8abf5cd6 Closing some JDK internals post jamm upgrade
patch by Ekaterina Dimitrova; reviewed by Benjamin Lerer for CASSANDRA-18439
2023-08-30 10:47:01 -04:00
Brandon Williams 7750a9430b Merge branch 'cassandra-5.0' into trunk 2023-08-28 09:49:24 -05:00
Brandon Williams b670b7b0c8 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-28 09:48:18 -05:00
Derek Chen-Becker 5e2985f10e Ensure unit tests honor tmp.dir
Modify unit tests so that any files created are rooted in the directory
specified by the "tmp.dir" Ant property. Ant already passes the value of
tmp.dir to the JVM's java.io.tmpdir parameter, so the primary changes are
to make use of Files.createTempDirectory to generate per-test work
directories. Also update the test checkstyle rules to catch any future
usage of hardcoded "/tmp".

Patch by Derek Chen-Becker; reviewed by bereng and brandonwilliams for CASSANDRA-18750
2023-08-28 09:47:13 -05:00
Jon Meredith 6fb82b75d5 Merge branch 'cassandra-5.0' into trunk 2023-08-24 16:45:40 -06:00
Jon Meredith d2f8e8e105 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-24 16:44:48 -06:00
Jon Meredith ac3b356063 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-08-24 16:43:53 -06:00
Jon Meredith 4034fbb6dd Merge branch 'cassandra-3.11' into cassandra-4.0 2023-08-24 16:34:44 -06:00
Doug Rohrer c6d7d070c5 IsolatedJMX should not release all TCPEndpoints on instance shutdown
patch by Doug Rohrer; reviewed by Jon Meredith, Stefan Miklosovic for CASSANDRA-18725
2023-08-24 16:32:28 -06:00
Bereng 77cf2185b6 Add jmh microbenchmarks to eclipse IDE
patch by Berenguer Blasi; reviewed by Benjamin Lerer, Maxim Muzafarov for CASSANDRA-18702
2023-08-24 08:42:15 +02:00
Stefan Miklosovic 8ddfbb6a3c
Increase version to 3.11.17 2023-08-18 18:08:32 +02:00
Brandon Williams 94c3cf74ef Merge branch 'cassandra-5.0' into trunk 2023-08-18 10:15:46 -05:00
Brandon Williams 9e0ccf0f95 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-18 10:14:40 -05:00
Brandon Williams f4ee77ceba Merge branch 'cassandra-4.0' into cassandra-4.1 2023-08-18 10:12:32 -05:00
Brandon Williams ba50ec9cd9 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-08-18 10:10:11 -05:00
Brandon Williams 1dd38998a0 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-08-18 10:09:49 -05:00
Brandon Williams 6bb585bf5d Warn when cqlsh does not match the server version it was built with
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18745
2023-08-18 10:08:52 -05:00
Mick Semb Wever d3a7387836
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Update trunk to version 5.1
2023-08-14 14:26:08 +02:00
Mick Semb Wever 89fe2223b4
Update trunk to version 5.1
- update jvm-dtest supported upgrade paths
 - update circeci and in-tree scripts to build 5.0 dtest jar
 - update in-tree scripts for better repetitive testing of jvm-dtest-upgrade tests
 - fix jvm-dtest-upgrade tests that broke with 5.0 -> 5.1 upgrades
 - update docs trunk -> 5.0

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18705
2023-08-14 14:25:19 +02:00
Jacek Lewandowski 53d1644ff4 Upgraded to Netty 4.1.96
- Add Bouncycastle dependency
- Upgrade tcnative boringssl
- Add TLSv1.3 to encryption options tests
- Revert defaults after changes in Netty 4.1.75
- Remove Guava 18 from deps - we accidentally ended with Guava 30+ and 18 on the classpath because JimFS includes it as a transient dependency.

Patch by Jacek Lewandowski and Brandon Williams; reviewed by Ekaterina Dimitrova and Berenguer Blasi for CASSANDRA-17992

Co-authored-by: Jacek Lewandowski <lewandowski.jacek@gmail.com>
Co-authored-by: Brandon Williams <driftx@gmail.com>
2023-08-04 00:12:59 +02:00
Ekaterina Dimitrova cdefe1e8f9 Fix javadoc task
patch by Ekaterina Dimitrova and Zili Chen; reviewed by Jacek Lewandowski, Stefan Miklosovic and Brandon Williams for CASSANDRA-17687
2023-08-01 12:52:17 -04:00
Stefan Miklosovic 778f9f3ed5
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-07-28 17:11:15 +02:00
Stefan Miklosovic a0fdda1976
Remove AssertJ from the production code
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18700
2023-07-28 17:09:52 +02:00
Jacek Lewandowski 738dfde735 Fix building dtest.jar (part 2)
Excludes META-INF/license/** from the unpacked content which fixes building dtest-jar on case-insensitive file systems

Patch by Jacek Lewandowski; reviewed by Brandon Williams and Ekaterina Dimitrova for CASSANDRA-18690
2023-07-27 10:14:15 +02:00
Ekaterina Dimitrova c1bf002234 Fix building dtest jar
patch by Jacek Lewandowski; reviewed by Ekaterina Dimitrova and Brandon Williams for CASSANDRA-18690
2023-07-25 16:14:34 -04:00
Ekaterina Dimitrova b92184e90c Update SyncUtil for JDK11 and JDK17
Remove --add-opens java.base/java.nio=ALL-UNNAMED which is not needed anymore

patch by Ekaterina Dimitrova; reviewed by Jacek Lewandowki for CASSANDRA-17909
2023-07-25 15:33:39 -04:00
Ekaterina Dimitrova b61bd93e57 Upgrade ecj version to 3.33.0
Bump source and target version to 11 for Java UDFs
ICompilationUnit has new default methods

patch by Ekaterina Dimitrova; reviewed by Andres de la Pena and Berenguer Blasi for CASSANRA-18190
2023-07-24 21:49:43 -04:00
Daniel Jatnieks fe8a6eb70f CASSANDRA-18180 Fix bulkLoaderSuccessfullyStreamsOverSsl fails with ClassCastException on JDK17
Fix ClassCastException  from jdk GaloisCounterMode when using JDK17 provider

Add javac exports to build.xml for java.base/jdk.internal.ref and java.base/sun.nio.ch

Replace checktestnameshelper ant task in build.xml with _check-test-names java target to be able to pass jvm args to TestNameCheckTask

patch by Dan Janieks; revewed by Ekaterina Dimitrova and Andres de la Pena for CASSANDRA-18180
2023-07-24 20:58:49 -04:00
Ekaterina Dimitrova 02f6353e1f Ninja fix: add fake eclipse-warnings task so that Jenkins doesn't fail until the build scripts are updated
This fix was already tested with Jenkins in 18190 which will be committed later
2023-07-24 16:10:22 -04:00
Ekaterina Dimitrova 3755934e52 Drop JDK8 and add JDK17, remove eclipse-warnings in favor of Checker Framework and upgrade checkstyle
patch by Ekaterina Dimitrova; reviewed by Jeremiah Jordan, Berenguer Blasi, Michael Semb Wever and Jacek Lewandowski for CASSANDRA-18255
2023-07-24 15:16:53 -04:00
Stefan Miklosovic 9bc0f89308
increment version to 4.1.4 2023-07-24 13:33:24 +02:00
Benjamin Lerer 600f4d9a69 Upgrade Jamm version to 0.4.0
This upgrade also fixes issues with PhantomReferences and the test problems from CASSANDRA-17884 anad CASSANDRA-16304

patch by Benjamin Lerer; reviewed by Ekaterina Dimitrova for CASSANDRA-18239
2023-07-22 14:55:49 -04:00
Jacek Lewandowski ad26ffcd57 Run checks in a separate task and fix build warnings
Patch by Jacek Lewandowski; reviewed by Mick Semb Wever and Stefan Miklosovic for CASSANDRA-18618
2023-07-21 05:57:37 +02:00
Stefan Miklosovic 2584f4f070
increment version to 4.0.12 2023-07-18 11:26:19 +02:00
Brandon Williams d6b305421a Merge branch 'cassandra-4.1' into trunk 2023-07-17 11:37:16 -05:00
Brandon Williams 7524ed5bfe Merge branch 'cassandra-4.0' into cassandra-4.1 2023-07-17 11:32:49 -05:00
Marianne Lyne Manaog a7bf85c4f3 Add jvm/test args to microbench
Patch by Marianne Lyne Manaog; reviewed by brandonwilliams and
edimitrova for CASSANDRA-18658
2023-07-17 11:29:19 -05:00
Jacek Lewandowski 17afd5e6be Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Moved jflex from runtime to build dependencies
2023-07-13 15:33:12 +02:00
Jacek Lewandowski 4f0865f769 Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Moved jflex from runtime to build dependencies
2023-07-13 15:33:11 +02:00
Jacek Lewandowski 32afc93b0d Moved jflex from runtime to build dependencies
Patch by Jacek Lewandowski; reviewed by Berenguer Blasi, Mick Semb Wever and Stefan Miklosovic for CASSANDRA-18664
2023-07-13 15:33:10 +02:00
Mick Semb Wever f038059e89
ninja-fix test*some targets need to pass a relative path to outfile
patch by Mick Semb Wever; reviewed by Stefan Miklosovic, Berenguer Blasi, Jacek Lewandowski for CASSANDRA-18133
2023-07-13 13:55:09 +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
Jakub Zytka ac25943876 Make `ant generate-idea-files` support the current JDK
ant generate-idea-files now support JDK 8, JDK 11 and JDK 17.
To add support of another JDK the java-jvmargs property must be set for the JDK in question (see how it's done in build.xml for Java 11 and 17)

Other minor, but notable changes are:
- test jvmargs are now added to idea run configurations
- .idea dir and project iml file are first removed and then recreated during `ant generate-idea-files`

 patch by Jakub Zytka; reviewed by Mick Semb Wever, Štefan Miklošovič, Ekaterina Dimitrova for CASSANDRA-18467
2023-07-05 10:37:54 -04:00
Brandon Williams 41e62e6147 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-06-26 06:07:53 -05:00
Brandon Williams 776b33753b Upgrade snappy to 1.1.10.1
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18608
2023-06-26 06:06:38 -05:00
Bereng 9026f96234 Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
  Move checkstyle files into .build
2023-06-26 10:12:07 +02:00
Bereng f7b952387a Move checkstyle files into .build
patch by Berenguer Blasi; reviewed by Stefan Miklosovic for CASSANDRA-18603
2023-06-26 10:08:17 +02:00
Brandon Williams c32a848008 Run checkstyle only on j8
Patch by brandonwilliams; reviewed by edimitrova for CASSANDRA-18423
2023-06-05 05:39:28 -05:00
Bereng 1adbea5a06 Extend maximum expiration date
patch by Berenguer Blasi; reviewed by Andrés de la Peña for CASSANDRA-14227
2023-06-05 07:18:34 +02:00
Jon Meredith 914484dfd8 Ninja fix missing IDEA sun.rmi.transport.tcp compiler export after CASSANDRA-18511 2023-06-02 13:50:21 -06:00
Jon Meredith 4bcadc6bfb Merge branch 'cassandra-4.1' into trunk 2023-05-31 12:36:07 -06:00
Jon Meredith 208a71c008 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-05-31 12:12:50 -06:00
Jon Meredith 57293e8281 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-05-31 12:04:29 -06:00
Doug Rohrer 43ec184391 Add support for JMX in the in-jvm dtest framework
patch by Doug Rohrer; reviewed by Alex Petrov, Jon Meredith, Francisco Guerrero Hernandez for CASSANDRA-18511
2023-05-31 12:02:26 -06:00
Mick Semb Wever 2101ce947e
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Increment version to 4.0.11 and 4.1.3
2023-05-29 13:48:35 +02:00
Mick Semb Wever 71b79cfbe3
Increment version to 4.0.11 and 4.1.3 2023-05-29 13:38:07 +02:00
Brandon Williams 785e291900 Increment version to 3.0.30 2023-05-15 11:21:48 -05:00
Brandon Williams ee5b601ce7 Increment version to 3.11.16 2023-05-05 05:57:31 -05:00
Stefan Miklosovic f2427a0c86
Increment version to 4.0.10 2023-04-14 11:20:04 +02:00
Ekaterina Dimitrova 91f6a9aca8 Merge branch 'cassandra-4.1' into trunk 2023-04-13 10:29:14 -04:00
Ekaterina Dimitrova bb36090fa0 Set correctly keepBriefBrief property
patch by Ekaterina Dimitrova; reviewed by Andres de la Pena and Michael Semb Wever for CASSANDRA-18267
2023-04-13 10:09:43 -04:00
Stefan Miklosovic a8fa357bbc
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-04-06 23:32:14 +02:00
Stefan Miklosovic 03be6d7926
update zstd-jni library to version 1.5.5
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18429
2023-04-06 23:24:16 +02:00
Ekaterina Dimitrova d1d733bee5 Fix JDK17 startup issue after CASSANDRA-17199; temporary workaround, to be reverted after CASSANDRA-18239
Patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever for CASSANDRA-18431
2023-04-05 20:53:42 -04:00
Maxim Muzafarov e98258a132 Upgrade checkstyle to 10.8.1 for j11 and 8.45.1 for j8
Patch by Maxim Muzafarov; reviewed by brandonwilliams and smiklosovic
for CASSANDRA-18262
2023-03-30 05:19:58 -05:00
Brandon Williams 3021c33cab Increment version to 4.1.2 2023-03-21 07:00:29 -05:00
Brandon Williams 7ad746cc83 Revert "Switch checkstyle to j11."
This reverts commit 4e3447ae17.
2023-03-13 11:59:37 -05:00
Brandon Williams 4e3447ae17 Switch checkstyle to j11.
Patch by brandonwilliams; reviewed by edimitrova for CASSANDRA-18262
2023-03-10 10:41:10 -06:00
Mick Semb Wever f14fa978e4
Upgrade to Opcodes.ASM9
patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for CASSANDRA-17971
2023-03-09 10:21:39 +01:00
Mick Semb Wever 7ca806c60a
Change trunk from 4.2 to 5.0
– update MessagingService (remove the 4.1 version that was only a placeholder in test code bc serialisation test files were previously incorrectly serialising random UUIds for TimeUUIDs)
 – update upgrade jvm-dtests
 – remove older serialization binary files we are no longer testing against

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-17973
2023-03-07 11:03:38 +01:00
Ekaterina Dimitrova d1e3c781b5 Add JDK17 startup scripts
patch by Ekaterina Dimitrova; reviewed by Mick Semb Wever for CASSANDRA-18258
2023-02-27 12:06:44 -05:00
Brandon Williams 03996ecc6d Merge branch 'cassandra-4.1' into trunk 2023-02-22 10:25:39 -06:00
Brandon Williams 474e778bcc Merge branch 'cassandra-4.0' into cassandra-4.1 2023-02-22 10:25:24 -06:00
Brandon Williams 1d532bce7b Merge branch 'cassandra-3.11' into cassandra-4.0 2023-02-22 10:25:08 -06:00
Brandon Williams a5b05cea5e Merge branch 'cassandra-3.0' into cassandra-3.11 2023-02-22 10:24:22 -06:00
Brandon Williams eb36a86a72 Removing trailing year from copyright.
Patch by brandonwilliams; reviewed by mck for CASSANDRA-18261
2023-02-22 10:23:47 -06:00
Mick Semb Wever d7352209b2
ninja-fix: compile and use JdkProperties
patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for CASSANDRA-18179
2023-02-17 08:01:07 +01:00
Jon Meredith 2ea47b1b74 Merge branch 'cassandra-4.1' into trunk 2023-02-16 15:18:37 -07:00
Jon Meredith b728a0011b Merge branch 'cassandra-4.0' into cassandra-4.1 2023-02-16 15:08:16 -07:00
Jon Meredith 3a4fff38b5 Ninja fix CASSANDRA-18242 - was not generating IDEA workspace for J11 correctly 2023-02-16 15:05:37 -07:00
Stefan Miklosovic a49efd8b44
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-02-15 13:39:00 +01:00
Stefan Miklosovic fcc16f5f2b
Update zstd-jni to version 1.5.4-1
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18259
2023-02-15 13:37:01 +01:00
Stefan Miklosovic 7b079503eb
Increment version to 4.0.9 2023-02-15 10:12:15 +01:00
Mick Semb Wever 86604f5038
Prepare for JDK17 experimental support
Removes the use of CASSANDRA_USE_JDK11 and introduces the build.xml properties `java.default` and `java.supported`.

 patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for CASSANDRA-18179
2023-02-12 20:43:46 +01:00
Stefan Miklosovic 67b483b5c8
Merge branch 'cassandra-4.1' into trunk 2023-02-01 15:35:20 +01:00
Stefan Miklosovic bede10f36c
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-02-01 15:28:50 +01:00
nvharikrishna ba434b8231
Fix NPE in fqltool dump on null value
If fullquerylog is enabled and a prepared query executed with null value
binded, then fqltool dump is running into NPE. Checking value for null before
wrapping it.

patch by N V Harikrishna; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18113
2023-02-01 14:46:44 +01:00
Jacek Lewandowski 763793e89d Merge branch 'cassandra-4.1' into trunk 2023-02-01 09:49:17 +01:00
Jacek Lewandowski dcc19cf865 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-02-01 09:47:12 +01:00
Jacek Lewandowski 9bf128aaa3 Improve unit tests performance
- Don't flush schema on every schema update in unit tests
- Use unix command to delete test data
- Shorten teardown
- Stable processor count presented by JMX on Jenkins, CircleCI and local

Patch by <jacek-lewandowski>, reviewed by <michaelsembwever> and <josh-mckenzie> for CASSANDRA-17427
2023-02-01 09:40:50 +01:00
Stefan Miklosovic 61a83b3cef
Merge branch 'cassandra-4.1' into trunk 2023-01-28 17:55:57 +01:00
Stefan Miklosovic b81d39306c
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-01-28 17:11:29 +01:00
Stefan Miklosovic 2a8e1972fd
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-01-28 16:54:39 +01:00
Stefan Miklosovic 8076f37c06
Merge branch 'cassandra-3.0' into cassandra-3.11 2023-01-28 16:33:36 +01:00
Stefan Miklosovic 4c8e9097bd
Introduce check for names of test classes
patch by Stefan Miklosovic; reviewed by Berenguer Blasi and David Capwell for CASSANDRA-17943
2023-01-28 16:18:51 +01:00
Bereng b8a87abba4 Do not leak 2015 synthetic memtable Epoch
patch by Berenguer Blasi; reviewed by Caleb Rackliffe for CASSANDRA-18118
2023-01-12 08:15:19 +01:00
Mick Semb Wever af5029d643
Increment versions to 4.1.1 2022-12-16 11:34:23 -08:00
David Capwell 4941b279bc CEP-10: Simulator Java11 Support
patch by David Capwell; reviewed by Benedict Elliott Smith, Ekaterina Dimitrova for CASSANDRA-17178
2022-12-13 15:04:31 -08:00
Mick Semb Wever 676b3e4483
Increment version to 4.1.0 2022-11-22 15:41:18 +01:00
Mick Semb Wever 6be7fed242
Prepare for 4.1-rc1 2022-11-17 10:55:14 +01:00
Mick Semb Wever 4469f017c0
Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
  ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
2022-11-05 16:33:50 +01:00
Mick Semb Wever 2695bf7d38
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
2022-11-05 16:13:18 +01:00
Mick Semb Wever 17e6942775
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
2022-11-05 15:59:18 +01:00
Mick Semb Wever f9b2cd6f3f
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
2022-11-05 15:51:14 +01:00
Mick Semb Wever 30a3266780
ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000) 2022-11-05 15:50:28 +01:00
Andrés de la Peña f67f5613f4 Merge branch 'cassandra-4.1' into trunk 2022-11-04 16:27:38 +00:00
Andrés de la Peña 1cdb747b4c Merge branch 'cassandra-4.0' into cassandra-4.1 2022-11-04 16:26:51 +00:00
Andrés de la Peña 5e705a8492 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-11-04 16:26:08 +00:00
Andrés de la Peña bdd6606486 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-11-04 16:25:25 +00:00
Andrés de la Peña 95400649d8 Improve behaviour of the Ant flag to skip test building, no-build-test
patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-18000
2022-11-04 16:24:38 +00:00
Abe Ratnofsky 230fe8e647 Include Git SHA in --verbose flag for nodetool version
Patch by Abe Ratnofsky; review by Brandon Williams, Caleb Rackliffe, Michael Semb Wever and Stefan Miklosovic for CASSANDRA-17753
2022-10-25 21:28:29 +02:00
Mick Semb Wever ac165325bc
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Increment versions to 3.0.29, 3.11.15, 4.0.8
2022-10-23 23:26:55 +02:00
Mick Semb Wever ed07f7d6bc
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Increment versions to 3.0.29, 3.11.15, 4.0.8
2022-10-23 23:22:36 +02:00
Mick Semb Wever a3b4119b5a
Increment versions to 3.0.29, 3.11.15, 4.0.8 2022-10-23 23:18:45 +02:00
Ekaterina Dimitrova 2f9ab68453 Update Byteman to 4.0.20 and Jacoco to 0.8.8
patch by Ekaterina Dimitrova; reviewed by Jacek Lewandowski and Michael Semb Wever for CASSANDRA-16413
2022-10-21 22:01:19 -04:00
Branimir Lambov 7c55c73825 Adds a trie-based memtable implementation
patch by Branimir Lambov; reviewed by Jason Rutherglen, Jacek Lewandowski, Andres de la Peña and Caleb Rackliffe for CASSANDRA-17240
2022-10-21 12:55:56 +03:00
Ekaterina Dimitrova 6f709ca0ec Merge branch 'cassandra-4.1' into trunk 2022-10-20 14:02:45 -04:00
Andrés de la Peña f13cdddcad Merge branch 'cassandra-3.0' into cassandra-3.11 2022-10-18 16:47:08 +01:00
Andrés de la Peña 9aa28a81ec CircleCI: Automatically detect and repeat new or modified JUnit tests
patch by Andrés de la Peña; reviewed by Josh McKenzie for CASSANDRA-17939
2022-10-18 16:44:37 +01:00
Mick Semb Wever c4bccb000a
Increment version to 4.1-beta2 2022-10-05 17:14:37 -05:00
Mick Semb Wever 65c9875b39
increment version to 4.1-beta1
ref: https://lists.apache.org/thread/ho4r1lk2gsgs1z61ldzg64h84x3rbg4o
2022-09-26 23:33:01 +02:00
Stefan Miklosovic ff47de11d6 Merge branch 'cassandra-4.1' into trunk 2022-09-26 22:37:29 +02:00
Stefan Miklosovic 5d3c747719 add checkstyle modules for checking redundant and unused imports in Java code
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-17876

Co-authored-by: Ling Mao <maoling@apache.org>
2022-09-26 21:41:15 +02:00
Stefan Miklosovic 387c274a62 Merge branch 'cassandra-4.1' into trunk 2022-09-02 15:23:12 +02:00
Stefan Miklosovic a61edad15f remove pure_sasl from the repository
This is follow-up for CASSANDRA-16456. The dependency
should be downloaded and put into the lib/ folder.

patch by Stefan Miklosovic; reviewed by Mick Semb Wever for CASSANDRA-16456
2022-09-02 15:21:52 +02:00
Mick Semb Wever d82cb5703d
Increment version to 4.0.7 2022-08-25 17:49:58 +02:00
Abe Ratnofsky 1e27ffc6ad Remove dependency on Maven Ant Tasks
patch by Abe Ratnofsky; reviewed by David Capwell, Michael Semb Wever for CASSANDRA-17750
2022-08-24 22:40:26 -07:00
Ekaterina Dimitrova dbadd08585 Update ASM(9.1 to 9.3), Mockito(1.10.10 to 1.12.13) and ByteBuddy(3.2.4 to 4.7.0)
patch by Ekaterina Dimitrova; reviewed by Brandon Williams for CASSANDRA-17835
2022-08-24 12:12:18 -04:00
Brandon Williams dd74bd4a03 Merge branch 'cassandra-4.1' into trunk 2022-08-18 05:57:59 -05:00
Brandon Williams f579bddb75 Merge branch 'cassandra-4.0' into cassandra-4.1 2022-08-18 05:57:21 -05:00
Brandon Williams 9ec945acf9 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-08-18 05:57:00 -05:00
Brandon Williams 6838fc552d Merge branch 'cassandra-3.0' into cassandra-3.11 2022-08-18 05:55:53 -05:00
Brandon Williams 9e32c44455 Don't build javadoc with artifacts
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17712
2022-08-18 05:53:15 -05:00
Josh McKenzie 3e0b94565a Add support to generate a One-Shot heap dump on unhandled exceptions
Patch by Caleb Rackliffe; reviewed by Josh McKenzie, David Capwell, and Jon Meredith for CASSANDRA-17795

Co-authored-by: Caleb Rackliffe <calebrackliffe@gmail.com>
Co-authored-by: Josh McKenzie <jmckenzie@apache.org>
2022-08-15 10:48:29 -04:00
Ekaterina Dimitrova b94bf3f218 Merge branch 'cassandra-4.1' into trunk 2022-07-29 13:35:55 -04:00
Ekaterina Dimitrova fe28f482db Fix sstable_preemptive_open_interval_in_mb disabled value - backward compatibility
patch by Ekaterina Dimitrova; reviewed by Andres de la Pena and Jon Meredith for CASSANDRA-17737
2022-07-29 13:26:31 -04:00
Mick Semb Wever c5747547fa
Increment version to 4.0.6 2022-07-18 22:29:36 +02:00
Benedict Elliott Smith 315a1a72a6 Merge branch 'cassandra-4.1' into trunk 2022-07-14 17:20:52 +01:00
Benedict Elliott Smith 60f742c739 Followup to CASSANDRA-17530: Fix synchronisation of ClassTransformer, and make compilation deterministic
patch by Benedict; reviewed by Blake Eggleston for CASSANDRA-17530
2022-07-14 17:20:40 +01:00
Bereng dfd152cfa0 Merge branch 'cassandra-4.1' into trunk 2022-07-14 11:41:55 +02:00
Bereng 14fc06a3ce Raise test timeouts
patch by Berenguer Blasi; reviewed by Michael Semb Wever for CASSANDRA-17729
2022-07-14 11:39:09 +02:00
Benedict Elliott Smith 8468d33a31 Merge branch 'cassandra-4.1' into trunk 2022-07-12 12:29:12 +01:00
Benedict Elliott Smith 067121da63 Paxos v2 Linearizability Violation
patch by Benedict; reviewed by Blake Eggleston for CASSANDRA-17530
2022-07-12 12:28:59 +01:00
Yifan Cai ab0a9b5f5c Merge branch 'cassandra-4.1' into trunk 2022-07-06 17:44:11 -07:00
Francisco Guerrero a250126f0f Remove commons-lang dependency during build runtime
patch by Francisco Guerrero; reviewed by Dinesh Joshi, Yifan Cai for CASSANDRA-17724
2022-07-06 17:41:12 -07:00
Bereng 92069ec093 testsome target doesn't work with wildcards
Patch by Bernardo Botella Corbi; reviewed by Brandon Williams and Berenguer Blasi for CASSANDRA-17083
2022-06-22 07:12:07 +02:00
Mick Semb Wever 1ca7a11dd0
Increment version to 4.1-alpha2 2022-05-27 23:07:34 +02:00
Mick Semb Wever 33b6a3d0f9
Prepare for 4.1-alpha1
ref: https://lists.apache.org/thread/hm2ljw4cpwvlb2hf79hpg78s74w39of0
2022-05-20 13:55:34 +02:00
Mick Semb Wever 756683c7cf
Prepare debian changelog for 4.0.4, bump version to 4.0.5 2022-05-14 01:29:41 +02:00
Mick Semb Wever 6ad666e3a8
Prepare debian changelog for 3.11.13, bump version to 3.11.14 2022-05-14 01:28:32 +02:00
Mick Semb Wever f20f17b4a7
Prepare debian changelog for 3.0.27, bump version to 3.0.28 2022-05-14 01:26:46 +02:00
Mick Semb Wever 413f1aed27
Create release branch cassandra-4.1, increment trunk version to 4.2 2022-05-01 23:22:08 +02:00
Branimir Lambov e4e19e33fa Add memtable API (CEP-11)
patch by Branimir Lambov; reviewed by Andrés de la Peña and Caleb Rackliffe for CASSANDRA-17034
2022-04-29 14:56:20 +03:00
Brandon Williams bb3749f2bb Merge branch 'cassandra-4.0' into trunk 2022-04-28 09:10:47 -05:00
Brandon Williams eac7b1de35 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-04-28 09:09:11 -05:00
Brandon Williams 4bb1a07b5b Upgrade jackson-databind to 2.13.2.2
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17556
2022-04-28 09:05:02 -05: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
David Capwell 3409e5d9b3 Enhance SnakeYAML properties to be reusable outside of YAML parsing, support camel case conversion to snake case, and add support to ignore properties
patch by David Capwell; reviewed by Caleb Rackliffe, Stefan Miklosovic for CASSANDRA-17166
2022-04-22 20:17:45 -07:00
Benedict Elliott Smith 018c8e0d5e Optimise BTree build, update and transform operations
Patch Benedict Elliott Smith; reviewed by Branimir Lambov and Benjamin Lerer for CASSANDRA-15510
2022-04-22 19:27:19 +02:00
David Capwell 7db3285e7b Migrate track_warnings to more standard naming conventions and use latest configuration types rather than long
patch by David Capwell; reviewed by Andres de la Peña, Caleb Rackliffe for CASSANDRA-17560
2022-04-21 14:32:25 -07:00
David Capwell 6013f16de7 Merge branch 'cassandra-4.0' into trunk 2022-04-12 11:56:22 -07:00
David Capwell 1ebdc7e758 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-04-12 11:48:08 -07:00
David Capwell d7a9f41cf1 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-04-12 11:46:43 -07:00
David Capwell 850336217b Add support for vnodes in jvm-dtest
patch by David Capwell; reviewed by Alex Petrov, Josh McKenzie for CASSANDRA-17332
2022-04-12 11:45:31 -07:00
David Capwell 2fde9af74f Clients using JMX are unable to handle non-standard java types but we leak this into our interfaces
patch by David Capwell; reviewed by Alex Petrov, Andres de la Peña for CASSANDRA-17527
2022-04-08 13:22:20 -07:00
Brandon Williams f32d2b06de Upgrade slf4j to 1.7.25
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17474
2022-03-31 07:21:25 -05:00
Brandon Williams a6864cccd4 Upgrade jackson to 2.13.2
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17492
2022-03-29 07:15:09 -05:00
Brandon Williams 3a7e5f8ed8 Revert "Upgrade slf4j to 1.7.25"
This reverts commit 234bdc87a5.
2022-03-25 15:00:43 -05:00
Brandon Williams 234bdc87a5 Upgrade slf4j to 1.7.25
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17474
2022-03-25 06:14:42 -05:00
Brandon Williams 94c2ad5304 Merge branch 'cassandra-4.0' into trunk 2022-03-22 07:32:13 -05:00
Brandon Williams b465fec770 Upgrade jackson to 2.13.2
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17460
2022-03-22 07:28:17 -05:00
Brandon Williams 3b1ce69fc1 Merge branch 'cassandra-4.0' into trunk 2022-03-14 14:09:31 -05:00
Brandon Williams d9bd03552d Merge branch 'cassandra-3.11' into cassandra-4.0 2022-03-14 14:04:40 -05:00
Brandon Williams 541d769042 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-03-14 14:04:26 -05:00
Brandon Williams 34f59904f5 Require at least ant >= 1.10
Patch by brandonwilliams; reviewed by smiklosovic and paulo for
CASSANDRA-17428
2022-03-14 14:02:29 -05:00
Caleb Rackliffe 7b91e4cc18 Remove all usages of junit.framework and ban them via Checkstyle
patch by Caleb Rackliffe; reviewed by Marcus Eriksson for CASSANDRA-17316

Co-authored-by: Marcus Eriksson <marcuse@apache.org>
2022-03-11 12:32:04 -06:00
Benedict Elliott Smith d2923275e3 CEP-14: Paxos Improvements
This work encompasses a range of improvements to Paxos, summarised as:

 - The introduction of Paxos Repair for ensuring consistency during range movements
 - The reduction of network round-trips by a factor of 2x for reads and writes

patch by Benedict Elliott Smith and Blake Eggleston; reviewed by Alex Petrov, Aleksey Yeschenko and Sam Tunnicliffe for CASSANDRA-17164
2022-03-10 16:30:12 +00:00
Benedict Elliott Smith 5a0d6154d1 [CASSANDRA-17176] Introduce TimeUUID
patch by Benedict; reviewed by Blake Eggleston for CASSANDRA-17176
2022-03-10 16:30:12 +00:00
Dmitry Potepalov a8bbd22d37 Fix ignored streaming encryption settings in sstableloader
Patch by Dmitry Potepalov; reviewed by bereng and brandonwilliams for
CASSANDRA-17367

Encryption settings were silently lost in BulkLoadConnectionFactory.
Forced the bulk loader test to do some actual streaming besides just
handshaking on the native port, the test does not pass without the
change in BulkLoadConnectionFactory.
2022-03-02 08:00:40 -06:00
Dmitry Potepalov 0e249fd15e Fix ignored streaming encryption settings in sstableloader
Patch by Dmitry Potepalov; reviewed by bereng and brandonwilliams for
CASSANDRA-17367

Encryption settings were silently lost in BulkLoadConnectionFactory.
Forced the bulk loader test to do some actual streaming besides just
handshaking on the native port, the test does not pass without the
change in BulkLoadConnectionFactory.
2022-03-02 07:45:13 -06:00
Mick Semb Wever 894d33ce40
Increment version to 4.0.4 2022-02-17 09:26:44 +01:00
Alex Petrov 81922c5a7b Intoduce Harry to the tree
Patch by Alex Petrov; reviewed by Caleb Rackliffe and Abe Ratnofsky for CASSANDRA-16262.
2022-02-16 09:00:36 +01:00
Mick Semb Wever d0f4b42956
Increment version to 4.0.3 2022-02-11 11:08:24 +01:00
Mick Semb Wever 25828cb9b1
Increment version to 3.0.27 2022-02-11 11:06:48 +01:00
Mick Semb Wever 1e015ed2a2
Increment version to 3.11.13 2022-02-11 11:06:25 +01:00
Yash Ladha 6d7b0a1079 Fix classpath file creation for eclipse
Patch by Yash Ladha; reviewed by Benjamin Lerer and Berenguer Blasi for CASSANDRA-17294

When building the eclipse file for development, `.classpath` file was
not correctly generated as it was not getting closed. Also there were
missing third-party libs that were essential for development.

This commit fixes the generation of classpath for
`generate-eclipse-files` command.
2022-02-09 15:08:15 +01:00
Jacek Lewandowski d543dae2cd
Fix restarting a node when other nodes are down in dtests
patch by Jacek Lewandowski; reviewed by Michael Semb Wever for CASSANDRA-17214
2022-01-26 13:35:47 +01:00
Ekaterina Dimitrova 0a6be7e412 Substitute ant script and scriptdef with custom ant tasks
patch by Ekaterina Dimitrova; reviewed by Michaem Semb Wever for CASSANDRA-17224
2022-01-24 10:12:51 -05:00
Mick Semb Wever e6b589b833
Merge branch 'cassandra-4.0' into trunk 2022-01-23 13:07:00 +01:00
Mick Semb Wever e769d0d6d6
Merge branch 'cassandra-3.11' into cassandra-4.0 2022-01-23 13:03:54 +01:00
Mick Semb Wever 9c6efe1222
Bump copyright to 2009-2022 2022-01-23 13:01:58 +01:00