Commit Graph

89 Commits

Author SHA1 Message Date
Stefan Miklosovic 8c4e21eeca
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-03-19 12:26:29 +01:00
Stefan Miklosovic a16333387c
Update zstd-jni to 1.5.7-2
patch by Stefan Miklosovic; reviewed by Dmitry Konstantinov for CASSANDRA-20453
2025-03-19 12:24:33 +01:00
Stefan Miklosovic 16bca9d343
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-03-06 14:23:11 +01:00
Stefan Miklosovic ef354d0d5e
Update Zstd library to 1.5.7-1
patch by Stefan Miklosovic; reviewed by Yifan Cai for CASSANDRA-20367
2025-03-06 14:19:01 +01:00
Mick Semb Wever aa20c9ab11
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Update netbeans project file for latest deps
2024-05-29 11:09:35 +02:00
Mick Semb Wever 34e7fe4b4f
Update netbeans project file for latest deps
patch by Mick Semb Wever; reviewed by Enrico Olivelli for CASSANDRA-19667
2024-05-29 10:55:59 +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
Jacek Lewandowski efba69dbe1 Add simulator/test to IntelliJ configuration
Patch by Jacek Lewandowski; reviewed by Stefan Miklosovic for CASSANDRA-18698
2023-07-27 11:25:08 +02:00
Stefan Miklosovic 9860c1e9d9
Fix copying of JAR of a trigger to temporary file
While testing the fix for trigger, we fixed the corresponding
trigger example. While on it, we detected that ssl-factory example was
not working either so it is fixed in this commit as well.

patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18264
2023-02-17 16:36:42 +01:00
Jon Meredith 5c4c7b69aa Merge branch 'cassandra-4.0' into cassandra-4.1 2023-02-13 17:46:28 -07:00
Jon Meredith 4e0aad3319 Split and order IDEA workspace template VM_PARAMETERS
patch by Jon Meredith; reviewed by David Capwell for CASSANDRA-18242
2023-02-13 17:43:21 -07: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 da5ec9a8e3 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-01-10 09:06:56 +01:00
Stefan Miklosovic f17e431f24 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-01-10 09:04:51 +01:00
Stefan Miklosovic 156cc6fedc Merge branch 'cassandra-3.0' into cassandra-3.11 2023-01-10 09:02:46 +01:00
Maxim Muzafarov 877d6e6e95 Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira
patch by Maxim Muzafarov; reviewed by David Capwell, Aleksey Yeschenko, Stefan Miklosovic for CASSANDRA-18126
2023-01-09 09:37:53 +01:00
Mick Semb Wever b7ef579703
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Update NetBeans project file for dependency changes since 7th July 2021
2022-11-02 18:32:53 +01:00
Mick Semb Wever 0db0b8f781
Update NetBeans project file for dependency changes since 7th July 2021
patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for CASSANDRA-18002
2022-11-02 18:31:05 +01:00
Mick Semb Wever fbb3079144
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Fix JMX security vulnerabilities
2022-10-18 22:55:59 +02:00
Mick Semb Wever 9a24fa81e5
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Fix JMX security vulnerabilities
2022-10-18 22:53:37 +02:00
Mick Semb Wever 95d0a936f9
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Fix JMX security vulnerabilities
2022-10-18 22:50:49 +02:00
Abe Ratnofsky b2660bcf78
Fix JMX security vulnerabilities
patch by Abe Ratnofsky; reviewed by Jon Meredith, Mick Semb Wever, Sam Tunnicliffe for CASSANDRA-17921
2022-10-18 22:47:49 +02: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
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
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
Brandon Williams ec04802e52 Merge branch 'cassandra-4.0' into trunk 2021-10-21 07:39:25 -05:00
Brandon Williams e8d905e636 Merge branch 'cassandra-3.11' into cassandra-4.0 2021-10-21 07:39:15 -05:00
Brandon Williams 386fe19d7d Merge branch 'cassandra-3.0' into cassandra-3.11 2021-10-21 07:38:48 -05:00
Brandon Williams 94611e9f2b Set fork mode to class in IntelliJ default test config
Patch by Jacek Lewandowski; reviewed by brandonwilliams and marcuse for
CASSANDRA-17053
2021-10-21 07:37:53 -05: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
Marcus Eriksson 9e9dffb704 Remove OrderedJUnit4ClassRunner
Patch by marcuse; reviewed by Caleb Rackliffe for CASSANDRA-16942
2021-09-20 13:37:32 +02:00
Caleb Rackliffe 4950878639 update IDEA setup generation to mark test/conf as test resources
patch by Abe Ratnofsky; reviewed by Caleb Rackliffe and Brandon Williams for CASSANDRA-16745
2021-07-25 11:37:33 -05:00
jacek-lewandowski 8857d04489 Fix broken IntelliJ configuration Authored by Jacek Lewandowski; reviewed by Ekaterina Dimitrova and Michael Semb Wever for CASSANDRA-16618 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
jacek-lewandowski d3e174fa22 Fix broken IntelliJ configuration Authored by Jacek Lewandowski; reviewed by Ekaterina Dimitrova and Michael Semb Wever for CASSANDRA-16618 2021-07-25 11:35:45 -05:00
Mick Semb Wever 6bf9b8b694 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: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 bd1ffa7617
Merge branch 'cassandra-3.11' into cassandra-4.0 2021-06-17 12:11:01 +02:00
Mick Semb Wever b857aa12bf
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-06-17 11:42:18 +02:00
Jacek Lewandowski 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
Caleb Rackliffe 6ef3eaf771 update IDEA setup generation to mark test/conf as test resources
patch by Abe Ratnofsky; reviewed by Caleb Rackliffe and Brandon Williams for CASSANDRA-16745
2021-06-16 14:15:40 -05:00
Aleksei Zotov 5578627d74
Update NetBeans classpath after CASSANDRA-16570 (jstackunit) and CASSANDRA-16576 (jflex)
patch by Aleksei Zotov; reviewed by Mick Semb Wever
2021-04-27 20:20:21 +02:00
jacek-lewandowski 26bf07890e Fix broken IntelliJ configuration
Authored by Jacek Lewandowski; reviewed by Ekaterina Dimitrova and Michael Semb Wever for CASSANDRA-16618
2021-04-22 17:28:38 -04:00
Mick Semb Wever 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
Mick Semb Wever 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
Mick Semb Wever 1a92e4a649
Merge branch 'cassandra-3.11' into trunk 2021-03-27 00:38:31 +01:00
Mick Semb Wever e031ed09a9
ninja-fix: update netbeans project dependencies after CASSANDRA-16249,CASSANDRA-13951,CASSANDRA-16136,CASSANDRA-16462 2021-03-26 14:38:23 +01:00
zhaorenhai 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