3a7e5f8ed8
Revert "Upgrade slf4j to 1.7.25"
...
This reverts commit 234bdc87a5
2022-03-25 15:00:43 -05:00
234bdc87a5
Upgrade slf4j to 1.7.25
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17474
2022-03-25 06:14:42 -05:00
94c2ad5304
Merge branch 'cassandra-4.0' into trunk
2022-03-22 07:32:13 -05:00
b465fec770
Upgrade jackson to 2.13.2
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17460
2022-03-22 07:28:17 -05:00
3b1ce69fc1
Merge branch 'cassandra-4.0' into trunk
2022-03-14 14:09:31 -05:00
d9bd03552d
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-03-14 14:04:40 -05:00
541d769042
Merge branch 'cassandra-3.0' into cassandra-3.11
2022-03-14 14:04:26 -05:00
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
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
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
5a0d6154d1
[CASSANDRA-17176] Introduce TimeUUID
...
patch by Benedict; reviewed by Blake Eggleston for CASSANDRA-17176
2022-03-10 16:30:12 +00:00
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
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
894d33ce40
Increment version to 4.0.4
2022-02-17 09:26:44 +01:00
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
d0f4b42956
Increment version to 4.0.3
2022-02-11 11:08:24 +01:00
25828cb9b1
Increment version to 3.0.27
2022-02-11 11:06:48 +01:00
1e015ed2a2
Increment version to 3.11.13
2022-02-11 11:06:25 +01:00
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
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
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
e6b589b833
Merge branch 'cassandra-4.0' into trunk
2022-01-23 13:07:00 +01:00
e769d0d6d6
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-01-23 13:03:54 +01:00
9c6efe1222
Bump copyright to 2009-2022
2022-01-23 13:01:58 +01:00
add1d1d752
Merge branch 'cassandra-4.0' into trunk
2022-01-20 09:50:45 -06:00
cf9091a12c
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-01-20 09:49:36 -06:00
7e68448235
Merge branch 'cassandra-3.0' into cassandra-3.11
2022-01-20 09:48:13 -06:00
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
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
54aee87c56
Merge branch 'cassandra-4.0' into trunk
2022-01-05 23:11:36 +01:00
0aad2e9e86
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-01-05 23:00:27 +01:00
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
b83d722b99
Merge branch 'cassandra-4.0' into trunk
2022-01-03 20:34:25 -05:00
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
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
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
a6cfd64bee
Merge branch 'cassandra-4.0' into trunk
2021-11-17 10:57:51 +01:00
3f2066d150
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-11-17 10:42:16 +01:00
cd73c14cec
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-11-17 10:31:18 +01:00
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
cedde3d991
Merge branch 'cassandra-4.0' into trunk
2021-11-10 11:13:52 +00:00
07b908c78c
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-11-10 11:12:29 +00:00
bfe4a90852
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-11-10 11:11:43 +00:00
e4d96721bf
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-11-10 11:10:04 +00:00
5c7603c2ae
Upgrade to snakeyaml 1.26
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17028
2021-10-15 10:06:57 -05:00
5b82447098
[CASSANDRA-17013] CEP-10 Phase 1: in-jvm-dtest-api changes and version bump
2021-10-07 14:30:20 +01:00
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
bcdb575fd3
Merge branch 'cassandra-4.0' into trunk
2021-10-01 15:20:32 +01:00
36266ce257
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-10-01 15:19:35 +01:00
2614f7eeb4
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-10-01 15:18:40 +01:00
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
3cc59017a4
Merge branch 'cassandra-4.0' into trunk
2021-09-30 21:37:08 +02:00
59f5e57faf
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-30 21:34:16 +02:00
9bf14a6011
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-09-30 21:32:45 +02:00
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
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
e0777ff5ab
Merge branch 'cassandra-4.0' into trunk
2021-09-29 08:07:32 +02:00
e365908ee4
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-29 07:57:05 +02:00
095475b9cc
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-09-29 07:49:10 +02:00
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
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
7c3935ced3
Merge branch 'cassandra-4.0' into trunk
2021-09-17 17:29:45 -04:00
14af149ed5
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-17 17:26:41 -04:00
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
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
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
18b2100bc4
Merge branch 'cassandra-4.0' into trunk
2021-09-11 00:38:50 +02:00
05e7cc1553
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-11 00:31:25 +02:00
32194ec8d0
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-09-11 00:20:42 +02:00
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
9a34ecd4ad
Increment version to 4.0.2
2021-09-07 16:50:51 +01:00
b92620c387
Merge branch 'cassandra-4.0' into trunk
2021-08-30 21:38:40 +02:00
a6ea52118c
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-08-30 21:20:57 +02:00
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
1b5545beef
Merge branch 'cassandra-4.0' into trunk
2021-08-26 15:09:04 -07:00
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
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
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
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
760c7e88b8
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-07-28 14:39:46 -05:00
8e9e4aed99
Incrememnt version
2021-07-28 14:39:11 -05:00
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
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
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
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
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
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
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
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
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
f9a220c110
Merge branch 'cassandra-4.0' into trunk
2021-07-12 22:40:35 +02:00
4dcf7d9ebd
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-07-12 22:34:46 +02:00
0c1e1ccfad
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-07-12 22:22:42 +02:00
0a84dda36a
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-07-12 22:16:36 +02:00
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
80fd439be1
Merge branch 'cassandra-4.0.0' into cassandra-4.0
2021-07-08 23:44:06 +02:00
09a387bd3d
Change version from 4.0-rc3 to 4.0.0
2021-07-08 23:28:37 +02:00
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
c79124d5e6
Merge branch 'cassandra-4.0.0' into cassandra-4.0
2021-06-30 21:55:25 +02:00
d13bef96fd
Increment version to 4.0-rc3
2021-06-30 21:53:31 +02:00
d7aaaa5001
Merge branch 'cassandra-4.0' into trunk
2021-06-23 13:12:03 -07:00
26e21bb576
Upgrade lz4-java to 1.8.0 to add RH6 support back
...
patch by David Capwell; reviewed by Brandon Williams for CASSANDRA-16753
2021-06-23 13:04:26 -07:00
72dca97af9
Merge branch 'cassandra-4.0' into trunk
2021-06-17 12:11:59 +02:00
bd1ffa7617
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-06-17 12:11:01 +02:00
b857aa12bf
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-06-17 11:42:18 +02:00
d54eff3a4a
Remove full project building from the generate-idea-files ant target
...
- that target was unnecessarily building the whole project which made it problematic to update the project while merging/rebasing if conflicts in the code were failing the compilation
- updated system properties for default run test task in Intellij to match those when running tests from Ant
- fix test-memory target
patch by Jacek Lewandowski; reviewed by Mick Semb Wever for CASSANDRA-16697
2021-06-17 11:25:58 +02:00
a978754691
Merge branch 'cassandra-4.0' into trunk
2021-06-12 11:55:19 +02:00
d93e43ed9b
Cleanup dependencies scopes
...
patch by Angelo Polo; reviewed by Mick Semb Wever for CASSANDRA-16704
Co-authored-by: Angelo Polo <language.devel@gmail.com>
2021-06-12 11:51:11 +02:00
855dcad75b
Merge branch 'cassandra-4.0' into trunk
2021-05-26 13:57:40 -05:00
f4ab8cce1e
Keep python driver in artifacts.
...
Patch by brandonwilliams; approved by mck for CASSANDRA-16700
2021-05-26 13:56:48 -05:00
f637198484
Merge branch 'cassandra-4.0' into trunk
2021-05-12 11:32:04 +01:00
98b449f38a
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-05-12 11:28:55 +01:00
1e42c105ce
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-05-12 11:25:57 +01:00
a01cbfdce5
Add CircleCI jobs to repeat specific tests n times
...
patch by Andrés de la Peña; reviewed by Ekaterina Dimitrova and Berenguer Blasi for CASSANDRA-16625
2021-05-12 11:21:41 +01:00
d2b57fe463
Create release branch cassandra-4.0, increment trunk version to 4.1
2021-05-01 12:13:59 +02:00
438a9c835a
Add a microbenchmark for checksums
...
Patch by Alexey Zotov; reviewed by brandonwilliams for CASSANDRA-16360
2021-04-30 09:05:41 -05:00
10a1d65eb0
Fix compression test runs
...
Ensure the specified commitlog_compression_xxx.yaml file is appended to the used cassandra.compressed.yaml, according to the selected algorithm as defined by `test.compression.algo` the property. By default we use the default LZ4. An unknown compression algo with fail.
patch by Jacek Lewandowski; reviewed by Mick Semb Wever for CASSANDRA-16575
2021-04-28 10:43:46 +02:00
36a0f11221
Merge branch 'cassandra-3.11' into trunk
2021-04-27 12:01:30 +01:00
9449cd3d6e
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-04-27 11:57:00 +01:00
4763d5625a
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-04-27 11:56:07 +01:00
26163bb12a
Follow up fixes to CASSANDRA-16633
...
* Don't run rat check if git fails or not available
* Check for presence of rat.txt before running eclipse-warnings task
(to ensure that the report is always generated by CI runs)
Patch by Sam Tunnicliffe; reviewed by Mick Semb Wever for CASSANDRA-16633
2021-04-27 11:12:07 +01:00
9cda055faa
Merge branch 'cassandra-3.11' into trunk
2021-04-27 09:31:45 +01:00
87a46c36f0
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-04-27 09:20:25 +01:00
ad2f41ef88
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-04-27 09:18:50 +01:00
bd270260c8
Only include versioned files in rat-report
...
Patch by Sam Tunnicliffe; reviewed by Benedict Elliott Smith
and Mick Semb Wever for CASSANDRA-16633
2021-04-27 09:17:56 +01:00
5be6d7e6b1
Only include versioned files in rat-report
...
Patch by Sam Tunnicliffe; reviewed by Benedict Elliott Smith
and Mick Semb Wever for CASSANDRA-16633
2021-04-27 08:57:50 +01:00
bd488e49f2
Increment version to 4.0-rc2
2021-04-25 13:56:07 +02:00
7337fc0ab4
Merge branch 'cassandra-3.11' into trunk
2021-04-19 17:39:10 +02:00
2ec96ae669
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-04-19 17:34:05 +02:00
50a97a0d76
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-04-19 17:29:00 +02:00
53b0661cbb
Fix rat checking for files with missing license headers
...
patch by Mick Semb Wever; reviewed by Brandon Williams, Ekaterina Dimitrova for CASSANDRA-16558
2021-04-19 17:18:26 +02:00
038271cc6f
Use source release of python driver from pip rather than GitHub
...
patch by David Capwell; reviewed by Adam Holmberg, Michael Semb Wever for CASSANDRA-16599
2021-04-15 18:03:51 -07:00
65b6dfa822
Merge branch 'cassandra-3.11' into trunk
2021-04-16 00:44:26 +02:00
cca5ce56ac
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-04-16 00:43:03 +02:00
5f1b538ef5
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-04-16 00:41:27 +02:00
c52f50f046
Restore running each test class in its own separate jvm and cassandra directory
...
(Remove test parallelism from ant build.xml)
patch by Mick Semb Wever; reviewed by Yifan Cai, David Capwell for CASSANDRA-16595
2021-04-16 00:38:22 +02:00
94603c656e
Merge branch 'cassandra-3.11' into trunk
2021-04-15 13:13:09 +02:00
5b93a87a6f
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-04-15 13:07:39 +02:00
2a6059ef4a
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-04-15 13:04:17 +02:00
1185593907
Remove test parallelism from ant build.xml
...
patch by Mick Semb Wever; reviewed by Berenguer Blasi, Yifan Cai for CASSANDRA-16595
2021-04-15 12:55:31 +02:00
e848d47ed1
Upgrade jflex to 1.8.2
...
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16576
2021-04-11 21:22:12 +02:00
b80dd92251
Don't put apidocs (javadoc) into the binary artifact
...
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-15561
2021-04-09 17:32:46 +02:00
6cc730d689
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-04-09 17:26:38 +02:00
29e4612e88
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-04-08 17:42:48 -04:00
c65500e8a1
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-04-08 11:10:19 +02:00
6a45728b08
Add JStackJUnitTask to avoid downloading the jar
...
Patch by marcuse; reviewed by Brandon Williams, David Capwell, Michael Semb Wever for CASSANDRA-16570
2021-04-08 09:47:50 +02:00
17d379ca1b
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-04-06 19:09:08 +02:00
cf39d03127
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-16391
2021-04-02 10:17:08 +02:00
8f5b7fec71
Change version 4.0-beta5 to 4.0-rc1
2021-03-26 20:45:34 +01:00
1371883db3
Update bundled driver dependencies
...
This commit updates that bundled java and python drivers
to their latest released versions, 3.11.0 and 3.25.0
respectively.
Patch by Sam Tunnicliffe and Adam Holmberg; reviewed by
Brandon Williams for CASSANDRA-13951
Co-authored-by: Adam Holmberg <adam.holmberg@datastax.com>
2021-03-22 17:13:53 +00:00
dd6c261119
Add io.netty.tryReflectionSetAccessible=true to j11 server options in order to enable netty to use Unsafe direct byte buffer construction
...
Patch by Sam Tunnicliffe; reviewed by Brandon Williams, Ekaterina Dimitrova and Berenguer Blasi for CASSANDRA-16493
2021-03-19 17:36:13 -04:00
f8b79ce932
Merge branch 'cassandra-3.11' into trunk
2021-03-19 18:11:14 +01:00
e9209527f2
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-03-19 18:02:01 +01:00
1ee18ac22d
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-03-19 17:57:34 +01:00
730e89e229
Remove ant targets list-jvm-dtests and ant list-jvm-upgrade-dtests
...
patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-16519
2021-03-19 17:36:19 +01:00
2ff456953f
Make driver timeouts configurable and increase them for CqlTester
...
Patch by Jacek Lewandowski; reviewed by brandonwilliams for
CASSANDRA-16514
2021-03-14 12:49:25 -05:00
11d069a766
Fix probable collision when running unit tests in parallel, and use runners on testclasslist* targets
...
patch by Jacek Lewandowski; reviewed by Mick Semb Wever, Brandon Williams for CASSANDRA-16511
2021-03-12 15:48:33 +01:00
c7432e98a3
Merge branch 'cassandra-3.11' into trunk
2021-03-10 20:55:06 -05:00
b654000936
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-03-10 20:53:06 -05:00
efde6a76f9
Refuse DROP COMPACT STORAGE if some 2.x sstables are in use
...
patch by Sylvain Lebresne; review changes and tests by Ekaterina Dimitrova; reviewed by Benjamin Lerer and Brandon Williams for CASSANDRA-15897
2021-03-10 20:33:54 -05:00
995ce0ee21
Merge branch 'cassandra-3.11' into trunk
2021-03-04 08:14:57 -06:00
a66246f9e8
Upgrade jackson-databind to 2.9.10.8
...
Patch by brandonwilliams, reviewed by adelapena for CASSANDRA-16462
2021-03-04 08:14:16 -06:00
2d9d17894d
Fix cassandra-stress JMX connection
...
Patch by Berenguer Blasi; reviewed by brandonwilliams for CASSANDRA-16473
2021-03-03 09:34:41 -06:00
0541c51996
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-03-01 12:33:02 +00:00
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
637b242840
Merge branch 'cassandra-3.11' into trunk
2021-02-08 11:28:47 +01:00
b0a5a7cfc7
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-02-08 11:28:00 +01:00
4333b5c7d5
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-02-08 11:05:14 +01:00
d19f352437
Generate JMH json report with `ant microbench`
...
patch by Mick Semb Wever; reviewed by Tomek Łasica for CASSANDRA-16371
2021-02-08 10:55:58 +01:00
f69b11eee9
Improve system tables handling in case of disk failures
...
patch by Benjamin Lerer; reviewed by Andrés de la Peña and Marcus
Eriksson for CASSANDRA-14793
2021-02-04 15:04:22 +01:00
ed51d02f7c
Increment version to 3.11.11
2021-02-01 16:02:21 +01:00
f35ab19dbe
Increment version to 3.0.25
2021-02-01 15:59:15 +01:00
0a9e129e10
Upgrade Jacoco to 0.8.6 (for Java 11 support)
...
Patch by Jacek Lewandowski; reviewed by Michael Semb Wever for CASSANDRA-16365
2021-01-28 17:36:59 -05:00
7f1659cd1d
Upgrade netty and chronicle-queue dependencies to get Auditing and native library loading working on arm64 architectures
...
CASSANDRA-16384 test case AuditLoggerTest fail on aarch64 platform
CASSANDRA-16392 Unable to load the library netty_tcnative_linux_aarch_64
patch by Zhao Renhai (赵 仁海); reviewed by Mick Semb Wever for CASSANDRA-16384,CASSANDRA-16392
2021-01-22 10:02:20 +01:00
9fc0b75a65
Merge branch 'cassandra-3.11' into trunk
2021-01-19 10:30:12 -05:00
c1f60ae48a
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-01-19 10:24:51 -05:00
f42a4ebb8d
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-01-19 09:33:34 -05:00
92182bcc23
build.xml first test commit
2021-01-17 14:29:28 -05:00
2ef0ac6ae9
Bump copyright to 2009-2021
2021-01-07 22:47:22 +01:00
401e933b73
Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, in the cassandra-all pom
...
patch by Mick Semb Wever; reviewed by Adrian Cole for CASSANDRA-16303
2021-01-02 10:14:41 +01:00
200615ded5
Increment version to 4.0-beta5
2020-12-30 12:47:53 +01:00
1102687d06
Fix the missing bb position in ByteBufferAccessor.getUnsignedShort
...
patch by Jacek Lewandowski; reviewed by Berenguer Blasi and Benjamin Lerer
for CASSANDRA-16249
The patch also update tests to show the failure and to check that the code
does not assume a zero position for the ByteBuffers.
2020-12-15 14:51:22 +01:00
d41fe2aa8e
Merge branch 'cassandra-3.11' into trunk
2020-12-14 14:34:35 +01:00
850157e7cf
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-12-14 14:23:00 +01:00
07c469ca13
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-12-14 14:06:55 +01:00
033e099f9a
Add Metrics to instance API
...
Patch by Alex Petrov; reviewed by Benedict Elliott Smith for CASSANDRA-16136
2020-12-14 14:05:12 +01:00
acf8de28ce
Mck's mvn fix
2020-12-04 15:34:49 -06:00
ecbb970aec
Update build.xml for the newly pulled Netty version
2020-12-04 14:55:27 +00:00
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
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
0bb1c51162
Update jctools from 1.2.1 to 3.1.0
...
patch by Berenguer Blasi; reviewed by Mick Semb Wever for CASSANDRA-16255
2020-11-20 08:51:54 +01:00
2a135cad6d
Include test jars in dtest uber jar
...
patch by Alex Petrov; reviewed by David Capwell for CASSANDRA-16288
2020-11-19 14:04:38 -08:00
e3cf77c730
ninja: CASSANDRA-16212 caused jvm-dtests to OOM constantly, so disable metaspace limits until the issue is resolved
2020-11-19 10:42:46 -08:00
b73f034da1
Upgrade JNA to 5.6.0
...
Also remove remaining comments/doc referencing `-Dcassandra.boot_without_jna`
patch by Adrain Cole, Mick Semb Wever; reviewed by Benjamin Lerer, Joey Lynch for CASSANDRA-16212
Co-authored-by: Adrian Cole <adrian.f.cole@gmail.com>
2020-11-16 09:36:45 +01:00
f45b1edc91
Merge branch 'cassandra-3.11' into trunk
2020-11-04 13:03:42 +01:00
385434881f
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-11-04 12:48:42 +01:00
b6ef9b22f2
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-11-04 12:42:20 +01:00
140048f5b7
Increment versions to 2.2.20, 3.0.24, 3.11.10, 4.0-beta4
2020-11-04 12:39:05 +01:00
095540d54a
Merge branch 'cassandra-3.11' into trunk
2020-10-21 13:24:18 +01:00
a2f59be943
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-10-21 13:19:50 +01:00
d44dbd91c1
Merge branch 'cassandra-2.2' into cassandra-3.0
...
# Conflicts:
# CHANGES.txt
2020-10-21 13:19:13 +01:00
72941b9ec1
Package tools/bin scripts as executable
...
patch by Angelo Polo; reviewed by Andres de la Peña for CASSANDRA-16151
2020-10-21 13:09:51 +01:00
f6281619ae
Nodetool ring testing
...
Patch by Berenguer Blasi, reviewed by brandonwilliams for
CASSANDRA-16200
2020-10-19 10:38:21 -05:00
83b41b6b69
Merge branch 'cassandra-3.11' into trunk
...
# Conflicts:
# CHANGES.txt
# src/java/org/apache/cassandra/db/filter/ColumnFilter.java
# test/unit/org/apache/cassandra/db/filter/ColumnFilterTest.java
2020-10-19 15:31:20 +01:00
fde6600a52
Revert "Nodetool ring testing"
...
This reverts commit c54da9e243
2020-10-17 15:46:18 -05:00
c54da9e243
Nodetool ring testing
...
Patch by Berenguer Blasi, reviewed by brandonwilliams for
CASSANDRA-16200
2020-10-16 09:30:23 -05:00
06bc316c89
Merge branch 'cassandra-3.11' into trunk
2020-10-14 12:06:10 -07:00
a6c222499b
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-10-14 12:04:14 -07:00
7b3a15dd9f
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-10-14 12:02:14 -07:00
9a40e8079b
upgrade to dtest-api 0.0.6
...
patch by Jordan West; reviewed by David Capwell for CASSANDRA-16148
2020-10-14 11:59:44 -07:00
2ae1ec5dd2
Merge branch 'cassandra-3.11' into trunk
2020-10-12 11:07:44 -07:00
34dde962fc
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-10-12 11:06:32 -07:00
42989cee28
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-10-12 11:05:28 -07:00
521a6e2aa9
Fixed a NullPointerException when calling nodetool enablethrift
...
patch by David Capwell; reviewed by Ekaterina Dimitrova, Jordan West, Yifan Cai for CASSANDRA-16127
2020-10-12 11:04:37 -07:00
e37f766403
Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix
...
patch by Rahul Nandi; reviewed by Alex Petrov, David Capwell for CASSANDRA-16150
2020-10-09 13:02:38 -07:00
16da961f2b
Merge branch 'cassandra-3.11' into trunk
2020-10-07 14:35:18 -07:00
6c8c791f19
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-10-07 14:34:04 -07:00
8d2556fd59
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-10-07 14:33:02 -07:00
844d19d4e6
Add ant task to check license and fix all files missing a licence
...
patch by David Capwell; reviewed by Jordan West for CASSANDRA-16198
2020-10-07 14:32:12 -07:00
21a363becc
Merge branch 'cassandra-3.11' into trunk
2020-10-05 19:06:58 -07:00
b1efb8e418
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-10-05 19:05:44 -07:00
5a2b5a4e5e
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-10-05 19:04:15 -07:00
4d173e0a3f
Don't adjust nodeCount when setting node id topology in in-jvm dtests.
...
Make sure we don't throw any uncaught exceptions during in-jvm dtests.
patch by Marcus Eriksson; reviewed by Alex Petrov, David Capwell for CASSANDRA-16109,CASSANDRA-16101
2020-10-05 19:03:19 -07:00
936a81bf34
Merge branch 'cassandra-3.11' into trunk
2020-09-30 21:31:00 +02:00
f5d5e72f61
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-09-30 21:12:08 +02:00
9ee74c9dc0
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-09-30 21:08:26 +02:00
aaef142f48
In Jenkins propagate FAILURE from stages to pipeline, ssh artefacts to nightlies, and move ant's junitreport generation to a separate target "generate-test-report"
...
patch by Mick Semb Wever; reviewed by Berenguer Blasi for CASSANDRA-16128
2020-09-30 21:05:47 +02:00
3db64445f9
Cassandra website is building/including the wrong versioned nodetool docs
...
patch by Mick Semb Wever; reviewed by Anthony Grasso, Benjamin Lerer for CASSANDRA-16093
2020-09-24 14:18:54 +02:00
0dc5bd51f5
Changes required for Harry build
...
Patch by Alex Petrov; reviewed by Marcus Eriksson for CASSANDRA-16102
2020-09-18 23:39:10 +03:00
fc87d3e0ab
Merge branch 'cassandra-3.11' into trunk
2020-08-31 21:02:14 +02:00
ca37de06ef
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-08-31 21:00:57 +02:00
0eaed71d1d
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-08-31 20:59:29 +02:00
815de9982a
Merge branch 'cassandra-2.1' into cassandra-2.2
2020-08-31 20:57:58 +02:00
0271653f27
Increment versions after releases 2.1.22, 2.2.18, 3.0.22, 3.11.8, 4.0-beta2
2020-08-31 20:55:39 +02:00
d49360bf27
Increment version to 2.1.22
2020-08-28 12:46:43 +02:00
382bcad07d
Backport CASSANDRA-14970 to 2.1 - New releases must supply SHA-256 and/or SHA-512 checksums
...
patch by Mick Semb Wever; reviewed by Benjamin Lerer for CASSANDRA-16081
2020-08-28 12:18:44 +02:00
0697489f74
Add test which validates that Message serializedSize(version) == serialize(out, version).length
...
patch by David Capwell; reviewed by Caleb Rackliffe, Jon Meredith for CASSANDRA-16064
2020-08-26 15:25:34 -07:00
528e3ad00b
jvm-dtests crash on java 11
...
patch by David Capwell; reviewed by Alex Petrov, Jon Meredith for CASSANDRA-15981
2020-08-05 21:18:33 -07:00
292650d968
Merge branch 'cassandra-3.11' into trunk
2020-07-30 14:10:48 +01:00
2ef1f1c150
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-07-30 13:27:53 +01:00
e5c3d08a14
Operational improvements and hardening for replica filtering protection
...
patch by Caleb Rackliffe; reviewed by Andrés de la Peña for CASSANDRA-15907
2020-07-30 12:53:52 +01:00
d6a8afe64d
Increment to version 3.0.22
2020-07-29 16:37:23 +02:00
8c61214537
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-07-24 18:50:47 -07:00
ebf9c74c4e
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-07-24 18:48:32 -07:00
25fd7bd84f
Add support in jvm dtest to test thrift
...
patch by David Capwell; reviewed by Alex Petrov,Jon Meredith for CASSANDRA-15967
2020-07-24 18:47:04 -07:00
3f92ff7854
Increment version to 3.11.8
2020-07-25 00:32:42 +02:00
53e3309e4d
Increment version to 2.2.18
2020-07-24 23:51:54 +02:00
39c8ec2cf6
Increment version to 4.0-beta2
2020-07-24 00:07:47 +02:00
7ba6403f6a
Switch version 4.0-alpha5 to 4.0-beta1
2020-07-14 23:39:00 +02:00
9481e4e9fa
Fix javadoc on jdk11
...
patch by Mick Semb Wever; reviewed by shylaja kokoori, Robert Stupp for CASSANDRA-15809
2020-07-14 10:43:03 +02:00
Brandon Williams