Commit Graph

1496 Commits

Author SHA1 Message Date
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
Brandon Williams add1d1d752 Merge branch 'cassandra-4.0' into trunk 2022-01-20 09:50:45 -06:00
Brandon Williams cf9091a12c Merge branch 'cassandra-3.11' into cassandra-4.0 2022-01-20 09:49:36 -06:00
Brandon Williams 7e68448235 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-01-20 09:48:13 -06:00
Brandon Williams 28004d9c60 Upgrade logback to 1.2.9
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17204

includes backported test changes from CASSANDRA-14183
2022-01-20 09:47:11 -06:00
Yuqi Gu 2043cb9fb6 Upgrade Snappy and JNA version to support Apple M1
Patch-By Yuqi Gu; Reviewed by Dinesh Joshi and Yifan Cai for CASSANDRA-17040
2022-01-07 11:02:48 -08:00
Mick Semb Wever 54aee87c56
Merge branch 'cassandra-4.0' into trunk 2022-01-05 23:11:36 +01:00
Mick Semb Wever 0aad2e9e86
Merge branch 'cassandra-3.11' into cassandra-4.0 2022-01-05 23:00:27 +01:00
Lorina Poland 05b0eaecad
Migrate documentation to AsciiDoc
This commit sets up a new documentation structure and format:

* The directory struture changes from a Sphinx project to an Antora module layout.
* The formatting of the content changes from reStructuredText to AsciiDoc.

The documentation must now be built and published with Antora. Initially only from the cassandra-website repository.

This change was done to make maintaining versioned website documentation easier. As Antora is designed to generate versioned documentation.

The old directory structure was:

<ROOT>
  - doc/
    - cql3/
      - CQL.css
      - CQL.textile
    - source/
      - _static/
      - _templates/
      - _theme/
      - _util/
      - <other directory sections>/
      - conf.py
      - index.rst
      - <other *.rst pages>
    - make.bat
    - Makefile
    - README.md
    - SASI.md
    - <*.spec files>
    - <generation scripts>

The new directory structure organises the documentation into modules:

<ROOT>
  - doc/
    - cql3
    - modules/
      - cassandra/
        - assets/
        - examples/
        - pages/
        - partials/
        - nav.adoc
      - ROOT/
        - pages/
        - nav.adoc
    - scripts/
    - antora.yaml
    - README.md
    - SASI.md

 patch by Lorina Poland, Anthony Grasso; reviewed by Anthony Grasso, Mick Semb Wever for CASSANDRA-16763

Co-authored-by: Anthony Grasso <anthony@thelastpickle.com>
2022-01-05 22:03:02 +01:00
Ekaterina Dimitrova b83d722b99 Merge branch 'cassandra-4.0' into trunk 2022-01-03 20:34:25 -05:00
Ekaterina Dimitrova 3ceaed125c Update ant-junit to version 1.10.12
patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever for CASSANDRA-17218
2022-01-03 20:26:52 -05:00
Venkata Harikrishna Nukala 1911a887e8 Fix slow keycache load which blocks startup for tables with many sstables.
Patch by Venkata Harikrishna Nukala; reviewed by Marcus Eriksson and Joseph Lynch for CASSANDRA-14898
2021-12-09 10:14:16 -05:00
Benedict Elliott Smith 209c35aa62 [CEP-10] Phase 4: Cluster and Code Simulation
patch by Benedict; reviewed by Sam Tunnicliffe for CASSANDRA-17008

Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
Co-authored-by: Sam Tunnicliffe <samt@apache.org>
Co-authored-by: Alex Petrov <oleksandr.petrov@gmail.com>
2021-11-30 16:05:54 +00:00
Mick Semb Wever a6cfd64bee
Merge branch 'cassandra-4.0' into trunk 2021-11-17 10:57:51 +01:00
Mick Semb Wever 3f2066d150
Merge branch 'cassandra-3.11' into cassandra-4.0 2021-11-17 10:42:16 +01:00
Mick Semb Wever cd73c14cec
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-11-17 10:31:18 +01:00
Sumanth Pasupuleti 44d81b5d09
Create property for local repository
patch by Sumanth Pasupuleti; reviewed by Mick Semb Wever for CASSANDRA-16917
2021-11-15 16:20:28 +01:00
Benedict Elliott Smith cedde3d991 Merge branch 'cassandra-4.0' into trunk 2021-11-10 11:13:52 +00:00
Benedict Elliott Smith 07b908c78c Merge branch 'cassandra-3.11' into cassandra-4.0 2021-11-10 11:12:29 +00:00
Benedict Elliott Smith bfe4a90852 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-11-10 11:11:43 +00:00
Benedict Elliott Smith e4d96721bf Merge branch 'cassandra-2.2' into cassandra-3.0 2021-11-10 11:10:04 +00:00
Brandon Williams 5c7603c2ae Upgrade to snakeyaml 1.26
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17028
2021-10-15 10:06:57 -05:00
Benedict Elliott Smith 5b82447098 [CASSANDRA-17013] CEP-10 Phase 1: in-jvm-dtest-api changes and version bump 2021-10-07 14:30:20 +01:00
Benedict Elliott Smith be1f050bc8 [CASSANDRA-16925] CEP-10 Phase 1: Mockable Task Execution
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
Co-authored-by: Sam Tunnicliffe <samt@apache.org>
2021-10-07 14:27:52 +01:00
Andrés de la Peña bcdb575fd3 Merge branch 'cassandra-4.0' into trunk 2021-10-01 15:20:32 +01:00
Andrés de la Peña 36266ce257 Merge branch 'cassandra-3.11' into cassandra-4.0 2021-10-01 15:19:35 +01:00
Andrés de la Peña 2614f7eeb4 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-10-01 15:18:40 +01:00
Andrés de la Peña 0c4653110d Make -Dtest.methods consistently optional in all Ant test targets
patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-17014
2021-10-01 15:17:07 +01:00
Stefan Miklosovic 3cc59017a4 Merge branch 'cassandra-4.0' into trunk 2021-09-30 21:37:08 +02:00
Stefan Miklosovic 59f5e57faf Merge branch 'cassandra-3.11' into cassandra-4.0 2021-09-30 21:34:16 +02:00
Stefan Miklosovic 9bf14a6011 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-09-30 21:32:45 +02:00
Stefan Miklosovic 225a4c8faf add OWASP dependency check to Ant build
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-14612
2021-09-30 21:30:36 +02:00
Benedict Elliott Smith 15a2fe00fc [CASSANDRA-16923] CEP-10 Phase 1: Mockable System Clock
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
Co-authored-by: Aleksey Yeschenko  <aleksey@apache.org>
Co-authored-by: Sam Tunnicliffe <samt@apache.org>
2021-09-29 19:38:34 +01:00
Stefan Miklosovic e0777ff5ab Merge branch 'cassandra-4.0' into trunk 2021-09-29 08:07:32 +02:00
Stefan Miklosovic e365908ee4 Merge branch 'cassandra-3.11' into cassandra-4.0 2021-09-29 07:57:05 +02:00
Stefan Miklosovic 095475b9cc Merge branch 'cassandra-3.0' into cassandra-3.11 2021-09-29 07:49:10 +02:00
Stefan Miklosovic 6b16b67cd4 update jBCrypt dependency to version 0.4
patch by Stefan Miklosovic; reviewed by Dinesh Joshi for CASSANDRA-9384
2021-09-29 07:39:29 +02:00
David Capwell c7526f943f Add soft/hard limits to local reads to protect against reading too much data in a single query
patch by David Capwell; reviewed by Caleb Rackliffe and Marcus Eriksson for CASSANDRA-16896
2021-09-28 12:49:12 -05:00
Ekaterina Dimitrova 7c3935ced3 Merge branch 'cassandra-4.0' into trunk 2021-09-17 17:29:45 -04:00
Ekaterina Dimitrova 14af149ed5 Merge branch 'cassandra-3.11' into cassandra-4.0 2021-09-17 17:26:41 -04:00
Tatu Saloranta e4d2802276 Update Jackson from 2.9.10 to 2.12.5
patch by Tatu Saloranta; reviewed by Ekaterina Dimitrova, Brandon Williams, Michael Semb Wever for CASSANDRA-16851
2021-09-17 17:25:25 -04:00
Aleksei Zotov 7faff38826 Upgrade Caffeiene to 2.9.2
Patch by Aleksei Zotov; reviewed by brandonwilliams and mck for
CASSANDRA-15153
2021-09-17 08:51:30 -05:00
Aleksei Zotov dd3d83a819 Upgrade Caffeine to 2.5.6
Patch by Aleksei Zotov; reviewed by brandonwilliams and mck for
CASSANDRA-15153
2021-09-17 08:48:35 -05:00
Mick Semb Wever 18b2100bc4
Merge branch 'cassandra-4.0' into trunk 2021-09-11 00:38:50 +02:00
Mick Semb Wever 05e7cc1553
Merge branch 'cassandra-3.11' into cassandra-4.0 2021-09-11 00:31:25 +02:00
Mick Semb Wever 32194ec8d0
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-09-11 00:20:42 +02:00
Mick Semb Wever b6f0864982
Add semver4j to the default shared packages in the jvm dtests
(Upgrade to dtest-api-0.0.9)

 patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-16803
2021-09-10 23:55:30 +02:00
Sam Tunnicliffe 9a34ecd4ad Increment version to 4.0.2 2021-09-07 16:50:51 +01:00
Mick Semb Wever b92620c387
Merge branch 'cassandra-4.0' into trunk 2021-08-30 21:38:40 +02:00
Mick Semb Wever a6ea52118c
Merge branch 'cassandra-3.11' into cassandra-4.0 2021-08-30 21:20:57 +02:00
Mick Semb Wever b0cdaec5ae
Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies
patch by Tatu Saloranta; reviewed by Mick Semb Wever for CASSANDRA-16854
2021-08-30 21:09:17 +02:00
Yifan Cai 1b5545beef Merge branch 'cassandra-4.0' into trunk 2021-08-26 15:09:04 -07:00
Yifan Cai 42025fd73a Bump zstd-jni version to 1.5.0-4
patch by Yifan Cai; reviewed by Dinesh Joshi for CASSANDRA-16884
2021-08-26 15:07:53 -07:00
Abi Palagashvili ad24942481 Add TTL support to nodetool snapshots
Patch by Abi Palagashvili; Reviewed by Paulo Motta and Stefan Miklosovic for CASSANDRA-16789

Co-authored-by: Paulo Motta <pauloricardomg@gmail.com>
Co-authored-by: Stefan Miklosovic <smiklosovic@apache.org>

Closes #1046
2021-08-26 14:57:58 -03:00
David Capwell 4b3f07fc74 allow blocking IPs from updating metrics about traffic
patch by David Capwell; reviewed by Benjamin Lerer, Caleb Rackliffe, Jon Meredith for CASSANDRA-16859
2021-08-20 17:24:16 -07:00
Ekaterina Dimitrova ca6bb2af02 Resolve ant-junit dependency issue CASSANDRA-16827
patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever for CASSANDRA-16827
2021-08-10 10:49:09 -04:00
Brandon Williams 760c7e88b8 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-07-28 14:39:46 -05:00
Brandon Williams 8e9e4aed99 Incrememnt version 2021-07-28 14:39:11 -05:00
Mick Semb Wever 3e54ed76b2 Don't put apidocs (javadoc) into the binary artifact
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-15561
2021-07-25 11:37:33 -05:00
Mick Semb Wever 7fafda8e90 Don't fork jvms in the build
On build machines with less than 1GB ram, use ANT_OPTS="-Xmx512m"

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16583
2021-07-25 11:37:33 -05:00
Ekaterina Dimitrova b2cfe2e5d7 Fix warning about multiple versions of ant detected when running ant test patch by Ekaterina Dimitrova; reviewed by Brandon Williams and Mick Semb Wever for CASSANDRA-16571 2021-07-25 11:37:33 -05:00
Mick Semb Wever fd7732389a Update IDE, Eclipse and NetBeans, classpaths for tests
patch by Mick Semb Wever, Berenguer Blasi; reviewd by Ekaterina Dimitrova, Benjamin Lerer for CASSANDRA-16560
2021-07-25 11:37:33 -05:00
Marcus Eriksson c44dfab9b5 Add JStackJUnitTask to avoid downloading the jar
Patch by marcuse; reviewed by Brandon Williams, David Capwell, Michael Semb Wever for CASSANDRA-16570
2021-07-25 11:37:32 -05:00
Mick Semb Wever e6950518d1 Offline build mode
When all dependencies are already in the local `~/.m2/repository/` we should not be needing an internet connection. ("Offline" mode should be automatic)

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16559
2021-07-25 11:37:32 -05:00
Mick Semb Wever 2fdf1d2762 Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
- This removes lib/ from version control.
- The generated pom files are now the source of truth to the project's depdendencies, and the lib/ folder re-created during the build from compile scope dependencies excluding provided and system scopes. Project dependencies are first downloaded to the maven local repository at `~/.m2/repository`.
- Maven is now required to be installed to build, that is the `mvn` command needs to be found in the path.
- The new resolver-ant-tasks targets have been encapsulated into the `build/build-resolver.xml` ant file.
- Most classpaths in build.xml are replaced with resolver:resolve definitions.
- The build-deps-pom generated pom file is now only used for declaring test dependencies.

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16557
2021-07-25 11:37:32 -05:00
Mick Semb Wever e243026c85 Don't put apidocs (javadoc) into the binary artifact
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-15561
2021-07-25 11:35:45 -05:00
Mick Semb Wever 3259d6de37 Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
- This removes lib/ from version control.
- The generated pom files are now the source of truth to the project's depdendencies, and the lib/ folder re-created during the build from compile scope dependencies excluding provided and system scopes. Project dependencies are first downloaded to the maven local repository at `~/.m2/repository`.
- Maven is now required to be installed to build, that is the `mvn` command needs to be found in the path.
- The new resolver-ant-tasks targets have been encapsulated into the `build/build-resolver.xml` ant file.
- Most classpaths in build.xml are replaced with resolver:resolve definitions.
- The build-deps-pom generated pom file is now only used for declaring test dependencies.

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16557
2021-07-25 11:35:45 -05:00
Mick Semb Wever f9a220c110
Merge branch 'cassandra-4.0' into trunk 2021-07-12 22:40:35 +02:00
Mick Semb Wever 4dcf7d9ebd
Merge branch 'cassandra-3.11' into cassandra-4.0 2021-07-12 22:34:46 +02:00
Mick Semb Wever 0c1e1ccfad
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-07-12 22:22:42 +02:00
Mick Semb Wever 0a84dda36a
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-07-12 22:16:36 +02:00
Mick Semb Wever b3f9921881
Introduce SemVer4j for version representation, parsing and handling. And correct supported upgrade paths. Add v4X to Java DTests (after cassandra-4.0 branch was created)
Change upgrades from testing only a single path, to testing all upgrade paths that are defined as supported within the specified from-to range.
Change all upgrades to v40 and v4X to be open ended (i.e. implicit CURRENT version).

 patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-16649
2021-07-12 22:09:40 +02:00
Mick Semb Wever 80fd439be1
Merge branch 'cassandra-4.0.0' into cassandra-4.0 2021-07-08 23:44:06 +02:00
Mick Semb Wever 09a387bd3d
Change version from 4.0-rc3 to 4.0.0 2021-07-08 23:28:37 +02:00
Mick Semb Wever 65b42304f5
ninja-fix: return cassandra-4.0's version to 4.0-rc2 (4.0.x version numbers are not yet supported: CASSANDRA-16781 and CASSANDRA-16649) 2021-07-02 14:57:41 +02:00
Mick Semb Wever c79124d5e6
Merge branch 'cassandra-4.0.0' into cassandra-4.0 2021-06-30 21:55:25 +02:00