Commit Graph

28772 Commits

Author SHA1 Message Date
Brandon Williams 81026b95c4 Merge branch 'cassandra-4.1' into trunk 2023-06-26 06:11:02 -05: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
Brandon Williams 72b1949157 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-26 06:05:24 -05:00
Brandon Williams b15a7da208 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-26 06:04:45 -05:00
Brandon Williams d99bccd649 Suppress CVE-2023-34455, CVE-2023-34454, CVE-2023-34453
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18608
2023-06-26 06:03:13 -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
mghildiy 7998e22127
Enhance nodetool compactionstats with additional metrics
patch by Manish Ghildiyal; reviewed by Stefan Miklosovic, Brandon Williams for CASSANDRA-18305

Co-authored-by: Stefan Miklosovic <smiklosovic@apache.org>
2023-06-23 11:14:55 +02:00
David Capwell ae537abc64 Added support for type VECTOR<type, dimension>
patch by David Capwell; reviewed by Andres de la Peña, Maxwell Guo, Mike Adamson for CASSANDRA-18504
2023-06-22 08:43:53 -07:00
Brandon Williams f11dcb069e Merge branch 'cassandra-4.1' into trunk 2023-06-21 18:00:26 -05:00
Brandon Williams 868df97d78 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-06-21 18:00:09 -05:00
Brandon Williams bc3700da05 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-21 18:00:01 -05:00
Brandon Williams 254991750c Add missing changes 2023-06-21 17:59:51 -05:00
Brandon Williams b96e8d946c Merge branch 'cassandra-4.1' into trunk 2023-06-21 06:27:08 -05:00
Brandon Williams fb6dd1f61c Merge branch 'cassandra-4.0' into cassandra-4.1 2023-06-21 06:26:54 -05:00
Brandon Williams 76d11fdf51 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-21 06:26:43 -05:00
Brandon Williams ece247b6ee Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-21 06:26:30 -05:00
Stefan Podkowinski e67fa69114 Remove hard-coded SSL cipher suites and protocols
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-10508

backported in CASSANDRA-18575 by German Eichberger; reviewed by
brandonwilliams
2023-06-21 06:25:18 -05:00
Stefan Miklosovic e2a6c99310
Expose bootstrap and decommission state to nodetool info
patch by Stefan Miklosovic; reviewed by Brandon Williams CASSANDRA-18555

Co-authored-by: Jaydeepkumar Chovatia <chovatia.jaydeep@gmail.com>
2023-06-20 22:31:05 +02:00
Meno25 f5a59176f9
Fix broken link in README.asc 2023-06-20 13:51:12 +02:00
Stefan Miklosovic 6482d2ec89
Merge branch 'cassandra-4.1' into trunk 2023-06-19 17:17:45 +02:00
Stefan Miklosovic 579c724adf
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-06-19 17:12:48 +02:00
Maciej Sokol 92d0a40c96
Fix assertion error when describing mv as table
patch by Maciej Sokol; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-18596
2023-06-19 17:08:12 +02:00
maxwellguo cc3e742c73 Fix SSTabledump errors when dumping data from index
patch by Maxwell Guo; reviewed by Andrés de la Peña and Branimir Lambov for CASSANDRA-17698
2023-06-19 13:22:48 +01:00
Andrés de la Peña 83a3316246 CircleCI: Add separate approval step for oa utests on separate workflows
patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-18593
2023-06-16 13:06:35 +01:00
Stefan Miklosovic c7260399d6
Merge branch 'cassandra-4.1' into trunk 2023-06-15 13:24:48 +02:00
Stefan Miklosovic 2b98d487d0
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-06-15 13:19:56 +02:00
Stefan Miklosovic 49dba85ec8
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-15 13:16:44 +02:00
Cameron Zemek 64d953fdca
Wait for live endpoints in gossip waiting to settle
patch by Cameron Zemek; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18543
2023-06-15 12:59:13 +02:00
Ekaterina Dimitrova a55d4183f5 Merge branch 'cassandra-4.1' into trunk 2023-06-14 14:18:21 -04:00
Ekaterina Dimitrova 622397e7e5 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-06-14 14:09:19 -04:00
Daniel Jatnieks c37bcbf7e9 Include TLSv1.2 in negotiatedProtocolMustBeAcceptedProtocolTest
Add a comment about the use of disabled TLSv1.1 with JDK 8 and higher to negotiatedProtocolMustBeAcceptedProtocolTest

Patch by Dan Jatnieks; reviewed by Ekaterina Dimitrova and Brandon Williams for CASSANDRA-18540
2023-06-14 14:00:03 -04:00
Brandon Williams 4f5cb2a6fa Merge branch 'cassandra-4.1' into trunk 2023-06-14 11:36:02 -05:00
Brandon Williams 1f6b37d189 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-06-14 11:35:40 -05:00
Brandon Williams 2fcdaa5b76 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-14 11:35:22 -05:00
ningzi.zhan 1eccb2bc1f Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column
Patch by Ningzi Zhan and Tomasz Lasica; reviewed by brandonwilliams,
edimitrova and Maxwell Guo for CASSANDRA-17818

Co-Authored-By: Tomek Lasica <tomasz.lasica@datastax.com>
2023-06-14 11:34:03 -05:00
Ekaterina Dimitrova 1d961679a0 Switch Java and Python upgrade tests from running on JDK8 to JDK11 in CircleCI
patch by Ekaterina Dimitrova; reviewed by Berenguer Blasi for CASSANDRA-18285
2023-06-14 10:08:19 -04:00
Bereng 43d90928a8 Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
  Slow builds due to checkstyle
2023-06-14 10:17:31 +02:00
Bereng b7c00d7d13 Slow builds due to checkstyle
patch by Berenguer Blasi; reviewed by Maxim Muzafarov, Michael Semb Wever for CASSANDRA-18588
2023-06-14 10:11:05 +02:00
Mick Semb Wever 41a669a100
Deduplicate the MixedMode* upgrade jvm-dtests
Also update method parameters to be clearer in how we declare testcase applicability

 patch by Mick Semb Wever; reviewed by David Capwell for CASSANDRA-18506
2023-06-13 10:03:07 +02:00
Andrés de la Peña 4f3cb5de37 Avoid unnecessary deserialization of terminal arguments when executing CQL functions
patch by Benjamin Lerer and Andrés de la Peña; reviewed by Benjamin Lerer for CASSANDRA-18566

Co-authored-by: Benjamin Lerer <b.lerer@gmail.com>
Co-authored-by: Andrés de la Peña <a.penya.garcia@gmail.com>
2023-06-12 13:32:02 +01:00
Jacek Lewandowski ba3ad7487a Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
  Track the amount of read data per row
2023-06-12 11:26:04 +02:00
Jacek Lewandowski b0cf9ba219 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Track the amount of read data per row
2023-06-12 11:26:03 +02:00
Jacek Lewandowski 5143bd81e8 Track the amount of read data per row
If an sstable is corrupted in a nasty way, we may read invalid cell sizes and try to read much more data for a row than we should. In rare scenarios this can lead even to OOMs.

This simple fix adds tracking and limiting the amount of data that is read per row. Row has its size stored in preamble which can be used as a limit. If the deserialization code tries to read more than that, it will simply fail with EOF which will prevent more serious problems later.

Patch by Jacek Lewandowski; reviewed by Berenguer Blasi and Maxwell Guo for CASSANDRA-18513

# Conflicts:
#	src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
2023-06-12 11:26:02 +02:00
Bereng dcb763ec2c Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
  Generate.sh -s param to skip autodetection of tests
2023-06-12 10:03:18 +02:00
Bereng 2973a7bdcd Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Generate.sh -s param to skip autodetection of tests
2023-06-12 10:02:36 +02:00
Bereng c94eb0e37b Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Generate.sh -s param to skip autodetection of tests
2023-06-12 10:01:49 +02:00
Bereng 7de3e61d75 Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Generate.sh -s param to skip autodetection of tests
2023-06-12 10:01:00 +02:00
Bereng c91e2714b9 Generate.sh -s param to skip autodetection of tests
patch by Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-18553
2023-06-12 09:58:58 +02:00