(cassandra-dtest) branch trunk updated: Ninja fix: test_pkey_requirement, revert empty lines removal from cql output, CASSANDRA-19341
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1f81e1c9 Ninja fix: test_pkey_requirement, revert empty lines removal
from cql output, CASSANDRA-19341
1f81e1c9 is described below
commit 1f81e1c9b98c7b444098daf721415dc8599bffdd
Author: Ekaterina Dimitrova
AuthorDate: Tue May 7 09:39:37 2024 -0400
Ninja fix: test_pkey_requirement, revert empty lines removal from cql
output, CASSANDRA-19341
---
json_test.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/json_test.py b/json_test.py
index 94c09f55..69b8b5a5 100644
--- a/json_test.py
+++ b/json_test.py
@@ -1242,6 +1242,7 @@ class TestJsonFullRowInsertSelect(Tester):
def test_pkey_requirement(self):
"""
Create schema:
+
>>> cqlsh('''
... CREATE TABLE primitive_type_test (
... key1 text PRIMARY KEY,
@@ -1261,7 +1262,9 @@ class TestJsonFullRowInsertSelect(Tester):
... col14 varint,
... col15 boolean)
... ''')
+
Try to create a JSON row with the pkey omitted from the column list,
and omitted from the JSON data:
+
>>> cqlsh_err_print('''INSERT INTO primitive_type_test JSON
'{"col1": "bar"}' ''')
:2:InvalidRequest: Error from server: code=2200 [Invalid
query] message="Invalid null value in condition for column key1"
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (973aad7b68 -> b0150e86fb)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 973aad7b68 Merge branch 'cassandra-4.1' into cassandra-5.0 add b0150e86fb Clean up KeyRangeIterator classes * replace KeyRangeConcatIterator's PriorityQeueu with List * remove KeyRangeIterator.current and simplify * remove injected exception and tests - not relevant to the current implementation * expand randomized testing * inline getCurrent() -> peek(); rename getCount to getMaxKeys * redefine skipTo contract to not return a value (which saves unnecessary work when skipTo is called multiple times in a row) * calling hasNext in skipTo is a [...] No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../index/sai/disk/IndexSearchResultIterator.java | 39 ++ .../disk/v1/postings/PostingListRangeIterator.java | 2 +- .../sai/iterators/KeyRangeConcatIterator.java | 105 -- .../iterators/KeyRangeIntersectionIterator.java| 132 -- .../index/sai/iterators/KeyRangeIterator.java | 99 -- .../sai/iterators/KeyRangeOrderingIterator.java| 2 +- .../index/sai/iterators/KeyRangeUnionIterator.java | 84 +++- .../index/sai/memory/InMemoryKeyRangeIterator.java | 4 +- .../cassandra/index/sai/plan/QueryController.java | 33 +++-- .../cassandra/utils/AbstractGuavaIterator.java | 5 +- .../index/sai/disk/SingleNodeQueryFailureTest.java | 100 ++ .../sai/disk/v1/BalancedTreeIndexSearcherTest.java | 2 - .../sai/disk/v1/InvertedIndexSearcherTest.java | 2 - .../iterators/AbstractKeyRangeIteratorTester.java | 119 .../sai/iterators/KeyRangeConcatIteratorTest.java | 83 +-- .../KeyRangeIntersectionIteratorTest.java | 127 ++--- .../sai/iterators/KeyRangeUnionIteratorTest.java | 151 - .../index/sai/iterators/LongIterator.java | 21 +-- .../index/sai/utils/SAIRandomizedTester.java | 10 ++ 20 files changed, 600 insertions(+), 521 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a1b0a310eded202d86d6fd0f746a5176ff8cabbe Merge: 2944d77aac b0150e86fb Author: Ekaterina Dimitrova AuthorDate: Wed Apr 3 18:29:55 2024 -0400 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../index/sai/disk/IndexSearchResultIterator.java | 39 ++ .../disk/v1/postings/PostingListRangeIterator.java | 2 +- .../sai/iterators/KeyRangeConcatIterator.java | 105 -- .../iterators/KeyRangeIntersectionIterator.java| 132 -- .../index/sai/iterators/KeyRangeIterator.java | 99 -- .../sai/iterators/KeyRangeOrderingIterator.java| 2 +- .../index/sai/iterators/KeyRangeUnionIterator.java | 84 +++- .../index/sai/memory/InMemoryKeyRangeIterator.java | 4 +- .../cassandra/index/sai/plan/QueryController.java | 33 +++-- .../cassandra/utils/AbstractGuavaIterator.java | 5 +- .../index/sai/disk/SingleNodeQueryFailureTest.java | 100 ++ .../sai/disk/v1/BalancedTreeIndexSearcherTest.java | 2 - .../sai/disk/v1/InvertedIndexSearcherTest.java | 2 - .../iterators/AbstractKeyRangeIteratorTester.java | 119 .../sai/iterators/KeyRangeConcatIteratorTest.java | 83 +-- .../KeyRangeIntersectionIteratorTest.java | 127 ++--- .../sai/iterators/KeyRangeUnionIteratorTest.java | 151 - .../index/sai/iterators/LongIterator.java | 21 +-- .../index/sai/utils/SAIRandomizedTester.java | 10 ++ 20 files changed, 600 insertions(+), 521 deletions(-) diff --cc CHANGES.txt index c8ce4d9fae,6d6b3ea50c..c770ef1b7c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ -5.0-beta2 +5.1 + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Clean up KeyRangeIterator classes (CASSANDRA-19428) * Warn clients about possible consistency violations for filtering queries against multiple mutable columns (CASSANDRA-19489) * Align buffer with commitlog segment size (CASSANDRA-19471) * Ensure SAI indexes empty byte buffers for types that allow them as a valid input (CASSANDRA-19461) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (2944d77aac -> a1b0a310ed)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 2944d77aac Merge branch 'cassandra-5.0' into trunk add b0150e86fb Clean up KeyRangeIterator classes * replace KeyRangeConcatIterator's PriorityQeueu with List * remove KeyRangeIterator.current and simplify * remove injected exception and tests - not relevant to the current implementation * expand randomized testing * inline getCurrent() -> peek(); rename getCount to getMaxKeys * redefine skipTo contract to not return a value (which saves unnecessary work when skipTo is called multiple times in a row) * calling hasNext in skipTo is a [...] new a1b0a310ed Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + .../index/sai/disk/IndexSearchResultIterator.java | 39 ++ .../disk/v1/postings/PostingListRangeIterator.java | 2 +- .../sai/iterators/KeyRangeConcatIterator.java | 105 -- .../iterators/KeyRangeIntersectionIterator.java| 132 -- .../index/sai/iterators/KeyRangeIterator.java | 99 -- .../sai/iterators/KeyRangeOrderingIterator.java| 2 +- .../index/sai/iterators/KeyRangeUnionIterator.java | 84 +++- .../index/sai/memory/InMemoryKeyRangeIterator.java | 4 +- .../cassandra/index/sai/plan/QueryController.java | 33 +++-- .../cassandra/utils/AbstractGuavaIterator.java | 5 +- .../index/sai/disk/SingleNodeQueryFailureTest.java | 100 ++ .../sai/disk/v1/BalancedTreeIndexSearcherTest.java | 2 - .../sai/disk/v1/InvertedIndexSearcherTest.java | 2 - .../iterators/AbstractKeyRangeIteratorTester.java | 119 .../sai/iterators/KeyRangeConcatIteratorTest.java | 83 +-- .../KeyRangeIntersectionIteratorTest.java | 127 ++--- .../sai/iterators/KeyRangeUnionIteratorTest.java | 151 - .../index/sai/iterators/LongIterator.java | 21 +-- .../index/sai/utils/SAIRandomizedTester.java | 10 ++ 20 files changed, 600 insertions(+), 521 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) branch trunk updated: Extend timeout for parallel_upgrade and parallel_upgrade_with_internode_ssl upgrade tests (fix 2 for CASSANDRA-19409)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new f4de30a9 Extend timeout for parallel_upgrade and parallel_upgrade_with_internode_ssl upgrade tests (fix 2 for CASSANDRA-19409) f4de30a9 is described below commit f4de30a92a5537c5c03b5595bc07619be5b15188 Author: Ekaterina Dimitrova AuthorDate: Thu Feb 29 16:10:27 2024 -0500 Extend timeout for parallel_upgrade and parallel_upgrade_with_internode_ssl upgrade tests (fix 2 for CASSANDRA-19409) patch by Ekaterina Dimitrova; reviewed by Berenguer Blasi for CASSANDRA-19409 --- upgrade_tests/upgrade_through_versions_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/upgrade_tests/upgrade_through_versions_test.py b/upgrade_tests/upgrade_through_versions_test.py index 539cf9e7..cbd8c720 100644 --- a/upgrade_tests/upgrade_through_versions_test.py +++ b/upgrade_tests/upgrade_through_versions_test.py @@ -380,6 +380,7 @@ class TestUpgrade(Tester): values=dict(self.extra_config) ) +@pytest.mark.timeout(3000) def test_parallel_upgrade(self): """ Test upgrading cluster all at once (requires cluster downtime). @@ -393,6 +394,7 @@ class TestUpgrade(Tester): """ self.upgrade_scenario(rolling=True) +@pytest.mark.timeout(3000) def test_parallel_upgrade_with_internode_ssl(self): """ Test upgrading cluster all at once (requires cluster downtime), with internode ssl. - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (106be29feb -> 54cf65476a)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 106be29feb Merge branch 'cassandra-4.1' into cassandra-5.0 add 54cf65476a Fix NullPointerException in ANN+WHERE when adding rows in another partition No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../index/sai/iterators/KeyRangeOrderingIterator.java | 3 ++- .../apache/cassandra/index/sai/cql/VectorTypeTest.java | 18 ++ 3 files changed, 21 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit cd347bdc5810654ea04cc45e0affa9304d0f1798 Merge: bf124a30da 54cf65476a Author: Ekaterina Dimitrova AuthorDate: Thu Feb 29 09:23:52 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../index/sai/iterators/KeyRangeOrderingIterator.java | 3 ++- .../apache/cassandra/index/sai/cql/VectorTypeTest.java | 18 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 884a94a59a,d650f0cf34..24da866a5f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -5.0-beta2 +5.1 + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Fix NullPointerException in ANN+WHERE when adding rows in another partition (CASSANDRA-19404) * Record latencies for SAI post-filtering reads against local storage (CASSANDRA-18940) * Fix VectorMemoryIndex#update logic to compare vectors. Fix Index view (CASSANDRA-19168) * Deprecate native_transport_port_ssl (CASSANDRA-19392) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (bf124a30da -> cd347bdc58)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from bf124a30da Merge branch 'cassandra-5.0' into trunk add 54cf65476a Fix NullPointerException in ANN+WHERE when adding rows in another partition new cd347bdc58 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + .../index/sai/iterators/KeyRangeOrderingIterator.java | 3 ++- .../apache/cassandra/index/sai/cql/VectorTypeTest.java | 18 ++ 3 files changed, 21 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) branch trunk updated: TypeError in logging fixed
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new e1846961 TypeError in logging fixed
e1846961 is described below
commit e1846961b652979517d5a89e7f1731cacfb7a5c6
Author: Ekaterina Dimitrova
AuthorDate: Tue Feb 27 10:14:36 2024 -0500
TypeError in logging fixed
patch by Ekaterina Dimitrova; reviewed by Brandon Williams for
CASSANDRA-19446
---
conftest.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conftest.py b/conftest.py
index f324b3d5..be4f02c1 100644
--- a/conftest.py
+++ b/conftest.py
@@ -370,7 +370,7 @@ def fixture_dtest_setup(request,
if failed or not dtest_config.delete_logs:
copy_logs(request, dtest_setup.cluster)
except Exception as e:
-logger.error("Error saving log:", str(e))
+logger.error("Error saving log: %s", str(e))
finally:
dtest_setup.cleanup_cluster(request, failed)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (2482c8a936 -> 53cd2d8286)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 2482c8a936 Merge branch 'cassandra-4.1' into cassandra-5.0 add 53cd2d8286 Fix VectorMemoryIndex#update logic to compare vectors Fix Index view No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + .../cassandra/index/sai/memory/VectorMemoryIndex.java | 3 +-- .../apache/cassandra/index/sai/view/RangeTermTree.java| 15 ++- src/java/org/apache/cassandra/index/sai/view/View.java| 3 ++- 4 files changed, 10 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (cf71b602e6 -> ec9a553f7d)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from cf71b602e6 Merge branch 'cassandra-5.0' into trunk add 53cd2d8286 Fix VectorMemoryIndex#update logic to compare vectors Fix Index view new ec9a553f7d Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt | 1 + .../cassandra/index/sai/memory/VectorMemoryIndex.java | 3 +-- .../apache/cassandra/index/sai/view/RangeTermTree.java| 15 ++- src/java/org/apache/cassandra/index/sai/view/View.java| 3 ++- 4 files changed, 10 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ec9a553f7d3a6230b0c6848391fddd68dec94102 Merge: cf71b602e6 53cd2d8286 Author: Ekaterina Dimitrova AuthorDate: Fri Feb 23 14:08:05 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../cassandra/index/sai/memory/VectorMemoryIndex.java | 3 +-- .../apache/cassandra/index/sai/view/RangeTermTree.java| 15 ++- src/java/org/apache/cassandra/index/sai/view/View.java| 3 ++- 4 files changed, 10 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index 8460e99058,20e0c6e959..eecbc9e50e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -5.0-beta2 +5.1 + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565) + * Simplify the bind marker and Term logic (CASSANDRA-18813) + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Fix VectorMemoryIndex#update logic to compare vectors. Fix Index view (CASSANDRA-19168) * Deprecate native_transport_port_ssl (CASSANDRA-19392) * Update packaging shell includes (CASSANDRA-19283) * Fix data corruption in VectorCodec when using heap buffers (CASSANDRA-19167) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a9b6fafc4f18fd23889e155b7560c9dd66eb5419 Merge: c09d0d929b ef6864fa66 Author: Ekaterina Dimitrova AuthorDate: Wed Jan 31 11:23:06 2024 -0500 Merge branch 'cassandra-5.0' into trunk test/conf/cassandra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (c09d0d929b -> a9b6fafc4f)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from c09d0d929b Allow CQL client certificate authentication to work without sending an AUTHENTICATE request add aa561f2373 Switch memtable_allocation_type from offheap_objects to heap_buffers in test/conf/cassandra.yaml add 74079562f2 Merge branch 'cassandra-3.11' into cassandra-4.0 add 8709b28224 Merge branch 'cassandra-4.0' into cassandra-4.1 add ef6864fa66 Merge branch 'cassandra-4.1' into cassandra-5.0 new a9b6fafc4f Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: test/conf/cassandra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-3.11 updated (604776b9c6 -> aa561f2373)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 604776b9c6 Merge branch 'cassandra-3.0' into cassandra-3.11 add aa561f2373 Switch memtable_allocation_type from offheap_objects to heap_buffers in test/conf/cassandra.yaml No new revisions were added by this update. Summary of changes: test/conf/cassandra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (21988ed3f0 -> 74079562f2)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 21988ed3f0 Merge branch 'cassandra-3.11' into cassandra-4.0 add aa561f2373 Switch memtable_allocation_type from offheap_objects to heap_buffers in test/conf/cassandra.yaml add 74079562f2 Merge branch 'cassandra-3.11' into cassandra-4.0 No new revisions were added by this update. Summary of changes: test/conf/cassandra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (846735eb8e -> 8709b28224)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 846735eb8e Merge branch 'cassandra-4.0' into cassandra-4.1 add aa561f2373 Switch memtable_allocation_type from offheap_objects to heap_buffers in test/conf/cassandra.yaml add 74079562f2 Merge branch 'cassandra-3.11' into cassandra-4.0 add 8709b28224 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: test/conf/cassandra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (1e8a1a21ab -> ef6864fa66)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 1e8a1a21ab Fix data corruption in VectorCodec when using heap buffers add aa561f2373 Switch memtable_allocation_type from offheap_objects to heap_buffers in test/conf/cassandra.yaml add 74079562f2 Merge branch 'cassandra-3.11' into cassandra-4.0 add 8709b28224 Merge branch 'cassandra-4.0' into cassandra-4.1 add ef6864fa66 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: test/conf/cassandra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (e3ce316cce -> 1e8a1a21ab)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from e3ce316cce Fix java17.adoc page add 1e8a1a21ab Fix data corruption in VectorCodec when using heap buffers No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + .../cassandra/cql3/functions/types/VectorCodec.java | 16 +--- .../cql3/validation/operations/CQLVectorTest.java| 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (dadf850ce2 -> cdda544904)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from dadf850ce2 Merge branch 'cassandra-5.0' into trunk add 1e8a1a21ab Fix data corruption in VectorCodec when using heap buffers add cdda544904 Merge branch 'cassandra-5.0' into trunk No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + .../cassandra/cql3/functions/types/VectorCodec.java | 16 +--- .../cql3/validation/operations/CQLVectorTest.java| 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (fbd7ba5fa1 -> dadf850ce2)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from fbd7ba5fa1 Merge branch 'cassandra-5.0' into trunk add e3ce316cce Fix java17.adoc page new dadf850ce2 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc/modules/cassandra/pages/reference/java17.adoc | 46 ++- 1 file changed, 20 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit dadf850ce296630e90aaf9aa55046ab368e07d20 Merge: fbd7ba5fa1 e3ce316cce Author: Ekaterina Dimitrova AuthorDate: Mon Jan 29 18:45:39 2024 -0500 Merge branch 'cassandra-5.0' into trunk doc/modules/cassandra/pages/reference/java17.adoc | 46 ++- 1 file changed, 20 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (0f4a237d01 -> e3ce316cce)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 0f4a237d01 Merge branch 'cassandra-4.1' into cassandra-5.0 add e3ce316cce Fix java17.adoc page No new revisions were added by this update. Summary of changes: doc/modules/cassandra/pages/reference/java17.adoc | 46 ++- 1 file changed, 20 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (99d9faeef5 -> 846735eb8e)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 99d9faeef5 Prepare debian changelog for 4.1.4 add 22e12adaec Fix Compact Storage section in NEWS.txt add 604776b9c6 Merge branch 'cassandra-3.0' into cassandra-3.11 add 21988ed3f0 Merge branch 'cassandra-3.11' into cassandra-4.0 add 846735eb8e Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: NEWS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-3.11 updated (09c46750f6 -> 604776b9c6)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 09c46750f6 Merge branch 'cassandra-3.0' into cassandra-3.11 add 22e12adaec Fix Compact Storage section in NEWS.txt add 604776b9c6 Merge branch 'cassandra-3.0' into cassandra-3.11 No new revisions were added by this update. Summary of changes: NEWS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (87f2a7b763 -> 0f4a237d01)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 87f2a7b763 Avoid over-skipping of key iterators from static column indexes during mixed intersections add 22e12adaec Fix Compact Storage section in NEWS.txt add 604776b9c6 Merge branch 'cassandra-3.0' into cassandra-3.11 add 21988ed3f0 Merge branch 'cassandra-3.11' into cassandra-4.0 add 846735eb8e Merge branch 'cassandra-4.0' into cassandra-4.1 add 0f4a237d01 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: NEWS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (2a7c64027d -> 21988ed3f0)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 2a7c64027d increment version to 4.0.13 add 22e12adaec Fix Compact Storage section in NEWS.txt add 604776b9c6 Merge branch 'cassandra-3.0' into cassandra-3.11 add 21988ed3f0 Merge branch 'cassandra-3.11' into cassandra-4.0 No new revisions were added by this update. Summary of changes: NEWS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-3.0 updated (4c3b96e4cd -> 22e12adaec)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 4c3b96e4cd Updated the OWASP plugin to 9.0.5 and refactored dependency checks add 22e12adaec Fix Compact Storage section in NEWS.txt No new revisions were added by this update. Summary of changes: NEWS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (cf93734492 -> fbd7ba5fa1)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from cf93734492 ninja: update CHANGES.txt for CASSANDRA-19289 add 22e12adaec Fix Compact Storage section in NEWS.txt add 604776b9c6 Merge branch 'cassandra-3.0' into cassandra-3.11 add 21988ed3f0 Merge branch 'cassandra-3.11' into cassandra-4.0 add 846735eb8e Merge branch 'cassandra-4.0' into cassandra-4.1 add 0f4a237d01 Merge branch 'cassandra-4.1' into cassandra-5.0 new fbd7ba5fa1 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NEWS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit fbd7ba5fa15f3934fa3461979145fc475bad55c1 Merge: cf93734492 0f4a237d01 Author: Ekaterina Dimitrova AuthorDate: Mon Jan 29 18:18:19 2024 -0500 Merge branch 'cassandra-5.0' into trunk NEWS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (8fd44ca8fc -> 9f5e45e5a2)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8fd44ca8fc Upgrade Python driver to 3.29.0 add 9f5e45e5a2 Append additional JVM options when using JDK17+ No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + bin/cassandra.in.sh| 8 conf/jvm17-clients.options | 4 conf/jvm17-server.options | 3 --- tools/bin/cassandra.in.sh | 8 5 files changed, 17 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (03f0d37cb0 -> aa644c9dfa)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 03f0d37cb0 Merge branch 'cassandra-5.0' into trunk add 9f5e45e5a2 Append additional JVM options when using JDK17+ new aa644c9dfa Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + bin/cassandra.in.sh| 8 conf/jvm17-clients.options | 4 conf/jvm17-server.options | 3 --- tools/bin/cassandra.in.sh | 8 5 files changed, 17 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit aa644c9dfa6680c73a9400f295f450b623dee784 Merge: 03f0d37cb0 9f5e45e5a2 Author: Ekaterina Dimitrova AuthorDate: Fri Jan 19 18:59:00 2024 -0500 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + bin/cassandra.in.sh| 8 conf/jvm17-clients.options | 4 conf/jvm17-server.options | 3 --- tools/bin/cassandra.in.sh | 8 5 files changed, 17 insertions(+), 7 deletions(-) diff --cc CHANGES.txt index 565b1d80b6,268bfa42b3..ebf48c2315 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -5.0-beta2 +5.1 + * Limit cassandra startup to supported JDKs, allow higher JDKs by setting CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688) + * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104) + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Append additional JVM options when using JDK17+ (CASSANDRA-19001) * Upgrade Python driver to 3.29.0 (CASSANDRA-19245) * Creating a SASI index after creating an SAI index does not break secondary index queries (CASSANDRA-18939) * Optionally fail when a non-partition-restricted query is issued against an index (CASSANDRA-18796) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated: Limit cassandra startup to supported JDKs
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 89e33a16ea Limit cassandra startup to supported JDKs
89e33a16ea is described below
commit 89e33a16eae20f6956127c78466b6626f41449c2
Author: shyla226
AuthorDate: Wed Aug 9 14:45:01 2023 -0700
Limit cassandra startup to supported JDKs
Set CASSANDRA_JDK_UNSUPPORTED to use a newer JDK
patch by Shylaja Kokoori; reviewed by Berenguer Blasi, Ekaterina Dimitrova,
Michael Semb Wever and Stefan Miklosovic for CASSANDRA-18688
---
CHANGES.txt | 1 +
bin/cassandra.in.sh | 27
debian/patches/cassandra_in.sh_dirs.diff | 54 +++-
redhat/cassandra.in.sh | 25 ---
tools/bin/cassandra.in.sh| 29 +
5 files changed, 118 insertions(+), 18 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 152f63056f..d1ed33baee 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.1
+ * Limit cassandra startup to supported JDKs, allow higher JDKs by setting
CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688)
* Standardize nodetool tablestats formatting of data units (CASSANDRA-19104)
* Make nodetool tablestats use number of significant digits for time and
average values consistently (CASSANDRA-19015)
* Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875)
diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
index dfa17643fd..6b347da7a8 100644
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@ -48,7 +48,7 @@ fi
cassandra_storagedir="$CASSANDRA_HOME/data"
# JAVA_HOME can optionally be set here
-#JAVA_HOME=/usr/local/jdk6
+# JAVA_HOME=/usr/local/jdk11
for jar in "$CASSANDRA_HOME"/lib/*.jar; do
CLASSPATH="$CLASSPATH:$jar"
@@ -116,19 +116,34 @@ if [ -z $JAVA ] ; then
exit 1;
fi
+# Matches variable 'java.supported' in build.xml
+java_versions_supported=11,17
+
# Determine the sort of JVM we'll be running on.
java_ver_output=`"${JAVA:-java}" -version 2>&1`
jvmver=`echo "$java_ver_output" | grep '[openjdk|java] version' | awk -F'"'
'NR==1 {print $2}' | cut -d\- -f1`
JVM_VERSION=${jvmver%_*}
short=$(echo "${jvmver}" | cut -c1-2)
-JAVA_VERSION=17
-if [ "$short" = "11" ] ; then
- JAVA_VERSION=11
-elif [ "$JVM_VERSION" \< "17" ] ; then
-echo "Cassandra 5.0 requires Java 11 or Java 17."
+# Unsupported JDKs below the upper supported version are not allowed
+if [ "$short" != "$(echo "$java_versions_supported" | cut -d, -f1)" ] && [
"$JVM_VERSION" \< "$(echo "$java_versions_supported" | cut -d, -f2)" ] ; then
+echo "Unsupported Java $JVM_VERSION. Supported are
$java_versions_supported"
exit 1;
fi
+# Allow execution of supported Java versions, and newer if
CASSANDRA_JDK_UNSUPPORTED is set
+is_supported_version=$(echo "$java_versions_supported" | tr "," '\n' | grep -F
-x "$short")
+if [ -z "$is_supported_version" ] ; then
+if [ -z "$CASSANDRA_JDK_UNSUPPORTED" ] ; then
+echo "Unsupported Java $JVM_VERSION. Supported are
$java_versions_supported"
+echo "If you would like to test with newer Java versions set
CASSANDRA_JDK_UNSUPPORTED to any value (for example,
CASSANDRA_JDK_UNSUPPORTED=true). Unset the parameter for default behavior"
+exit 1;
+else
+echo
"##"
+echo "Warning! You are using JDK$short. This Cassandra version only
supports $java_versions_supported."
+echo
"##"
+fi
+fi
+JAVA_VERSION=$short
jvm=`echo "$java_ver_output" | grep -A 1 '[openjdk|java] version' | awk 'NR==2
{print $1}'`
case "$jvm" in
diff --git a/debian/patches/cassandra_in.sh_dirs.diff
b/debian/patches/cassandra_in.sh_dirs.diff
index 6642165beb..2926966c42 100644
--- a/debian/patches/cassandra_in.sh_dirs.diff
+++ b/debian/patches/cassandra_in.sh_dirs.diff
@@ -33,7 +33,7 @@
+cassandra_storagedir=/var/lib/cassandra
# JAVA_HOME can optionally be set here
- #JAVA_HOME=/usr/local/jdk6
+ #JAVA_HOME=/usr/local/jdk11
@@ -47,6 +47,10 @@ for jar in "$CASSANDRA_HOME"/lib/*.jar; do
CLASSPATH="$CLASSPATH:$jar"
done
@@ -45,3 +45,55 @@
CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
# JSR223 - collect all JSR223 engines' jars
+ #
+ # Java executable and per-Java version JVM settings
+ #
+
+ # Use JAVA_HOME if s
(cassandra) branch cassandra-4.0 updated (475c0035e6 -> 290a5990d4)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 475c0035e6 [CASSANDRA-18999] Gossiper::hasMajorVersion3Nodes returns true when a cluster is upgrading patch version without Cassandra 3 nodes. add 290a5990d4 Fix flaky test org.apache.cassandra.tools.BulkLoaderTest.testBulkLoader_WithArgs1 No new revisions were added by this update. Summary of changes: test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 292f0a672457eb43c3bfa77cf795f17f5d2c6709 Merge: 7d6cc31b21 50d0b2731b Author: Ekaterina Dimitrova AuthorDate: Wed Jan 10 13:25:47 2024 -0500 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix flaky test org.apache.cassandra.tools.BulkLoaderTest.testBulkLoader_WithArgs1 test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (3d1b981d89 -> dc6afb0cf3)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 3d1b981d89 Merge branch 'cassandra-4.0' into cassandra-4.1 add 290a5990d4 Fix flaky test org.apache.cassandra.tools.BulkLoaderTest.testBulkLoader_WithArgs1 add dc6afb0cf3 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (e04a3176ff -> 50d0b2731b)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from e04a3176ff Merge branch 'cassandra-4.1' into cassandra-5.0 add 290a5990d4 Fix flaky test org.apache.cassandra.tools.BulkLoaderTest.testBulkLoader_WithArgs1 add dc6afb0cf3 Merge branch 'cassandra-4.0' into cassandra-4.1 add 50d0b2731b Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (7d6cc31b21 -> 292f0a6724)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 7d6cc31b21 Merge branch 'cassandra-5.0' into trunk add 290a5990d4 Fix flaky test org.apache.cassandra.tools.BulkLoaderTest.testBulkLoader_WithArgs1 add dc6afb0cf3 Merge branch 'cassandra-4.0' into cassandra-4.1 add 50d0b2731b Merge branch 'cassandra-4.1' into cassandra-5.0 new 292f0a6724 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (1b7e895f56 -> 316a239c7c)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 1b7e895f56 Merge branch 'cassandra-5.0' into trunk add 55fecfb65e Fix BulkLoaderTest.testBulkLoader_WithArgs2 add 08d9b70b4d Merge branch 'cassandra-4.0' into cassandra-4.1 add a2911c7391 Merge branch 'cassandra-4.1' into cassandra-5.0 new 316a239c7c Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (91a242fe00 -> a2911c7391)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 91a242fe00 SAI in-memory index should check max term size add 55fecfb65e Fix BulkLoaderTest.testBulkLoader_WithArgs2 add 08d9b70b4d Merge branch 'cassandra-4.0' into cassandra-4.1 add a2911c7391 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 316a239c7c71971de0d4c694bd59fa8540485a23 Merge: 1b7e895f56 a2911c7391 Author: Ekaterina Dimitrova AuthorDate: Mon Nov 20 16:43:40 2023 -0500 Merge branch 'cassandra-5.0' into trunk test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (7fdb88d10a -> 55fecfb65e)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 7fdb88d10a Merge branch 'cassandra-3.11' into cassandra-4.0 add 55fecfb65e Fix BulkLoaderTest.testBulkLoader_WithArgs2 No new revisions were added by this update. Summary of changes: test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (6a282b50b9 -> 08d9b70b4d)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 6a282b50b9 Merge branch 'cassandra-4.0' into cassandra-4.1 add 55fecfb65e Fix BulkLoaderTest.testBulkLoader_WithArgs2 add 08d9b70b4d Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cep-21-tcm-review updated (ccc3081c18 -> 31ef31d50a)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cep-21-tcm-review in repository https://gitbox.apache.org/repos/asf/cassandra.git from ccc3081c18 Small JavaDoc, warnings, and code style fixes add 31ef31d50a ninja fix: Initialize class - moved braces by mistake No new revisions were added by this update. Summary of changes: .../apache/cassandra/tcm/transformations/cms/Initialize.java | 12 1 file changed, 8 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cep-21-tcm-review updated: Small JavaDoc, warnings, and code style fixes
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch cep-21-tcm-review
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cep-21-tcm-review by this push:
new ccc3081c18 Small JavaDoc, warnings, and code style fixes
ccc3081c18 is described below
commit ccc3081c1845b2a4664314b5cd9ba1ae4d8f543d
Author: Ekaterina Dimitrova
AuthorDate: Tue Oct 24 12:12:15 2023 -0400
Small JavaDoc, warnings, and code style fixes
---
.../apache/cassandra/config/CassandraRelevantProperties.java | 2 +-
.../org/apache/cassandra/tcm/ClusterMetadataService.java | 8
src/java/org/apache/cassandra/tcm/Period.java| 2 +-
src/java/org/apache/cassandra/tcm/Processor.java | 4 ++--
src/java/org/apache/cassandra/tcm/RecentlySealedPeriods.java | 2 +-
src/java/org/apache/cassandra/tcm/RemoteProcessor.java | 3 ---
src/java/org/apache/cassandra/tcm/Retry.java | 9 +++--
src/java/org/apache/cassandra/tcm/listeners/LogListener.java | 2 +-
.../cassandra/tcm/listeners/MetadataSnapshotListener.java| 2 +-
src/java/org/apache/cassandra/tcm/log/LocalLog.java | 7 +++
src/java/org/apache/cassandra/tcm/log/LogStorage.java| 4 ++--
src/java/org/apache/cassandra/tcm/membership/Directory.java | 2 +-
src/java/org/apache/cassandra/tcm/migration/Election.java| 4 ++--
.../cassandra/tcm/transformations/cms/FinishAddToCMS.java| 2 +-
.../apache/cassandra/tcm/transformations/cms/Initialize.java | 12
15 files changed, 31 insertions(+), 34 deletions(-)
diff --git
a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index 554e407bbf..b8b3a4c04b 100644
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@ -513,7 +513,7 @@ public enum CassandraRelevantProperties
TCM_PROGRESS_BARRIER_TIMEOUT_MILLIS("cassandra.progress_barrier_timeout_ms",
"360"),
/**
- * Maximum sized of the {@code RecentlySealedPeriods} in-memory index.
+ * Maximum size of the {@code RecentlySealedPeriods} in-memory index.
*/
TCM_RECENTLY_SEALED_PERIOD_INDEX_SIZE("cassandra.recently_sealed_period_index_size",
"10"),
diff --git a/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java
b/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java
index 9575e4b635..80d0b40f04 100644
--- a/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java
+++ b/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java
@@ -82,9 +82,9 @@ import static
org.apache.cassandra.utils.Clock.Global.nanoTime;
import static org.apache.cassandra.utils.Collectors3.toImmutableSet;
/**
- * the entry point to TCM. It is responsible for transforming cluster metadata
consistently in the cluster.
+ * The entry point to TCM. It is responsible for transforming cluster metadata
consistently in the cluster.
* Transformation is performed by the current {@link Processor}.
- *
+ *
* There are 3 processors availabe that are used depending on the node state:
*
* gossip - the processor is used during upgrade
@@ -606,7 +606,7 @@ public class ClusterMetadataService
}
/**
- * Fetches log entries from directly from CMS, at least to the specified
epoch.
+ * Fetches log entries directly from CMS, at least to the specified epoch.
*
* This operation is blocking and also waits for all retrieved log entries
to be
* enacted, so on return all transformations to ClusterMetadata will be
visible.
@@ -796,7 +796,7 @@ public class ClusterMetadataService
return commitsPaused.get();
}
/**
- * Switchable implementation that allow us to go between local and remote
implementation whenever we need it.
+ * Switchable implementation that allows us to go between local and remote
implementation whenever we need it.
* When the node becomes a member of CMS, it switches back to being a
regular member of a cluster, and all
* the CMS handlers get disabled.
*/
diff --git a/src/java/org/apache/cassandra/tcm/Period.java
b/src/java/org/apache/cassandra/tcm/Period.java
index 03c07ded32..88743003bd 100644
--- a/src/java/org/apache/cassandra/tcm/Period.java
+++ b/src/java/org/apache/cassandra/tcm/Period.java
@@ -53,7 +53,7 @@ public class Period
/**
* Last resort fallback to find where in the log table (either local or
distributed) we can find a
- * given epoch. If the current ClusterMetadata.period > Period.FIRST (as
should be the case normally),
+ * given epoch. If the current {@code ClusterMetadata.period} > {@code
Period.FIRST} (as should be the case normally),
* we start there and w
[cassandra] branch cep-21-tcm-review updated: Suggested tiny fixes No CI was run as it is just small fixes and CI is having a bad day with this branch anyway
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch cep-21-tcm-review
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cep-21-tcm-review by this push:
new c38301e23a Suggested tiny fixes No CI was run as it is just small
fixes and CI is having a bad day with this branch anyway
c38301e23a is described below
commit c38301e23afd99d475ab2b4c479af3b5e1579268
Author: Ekaterina Dimitrova
AuthorDate: Tue Oct 17 19:52:08 2023 -0400
Suggested tiny fixes
No CI was run as it is just small fixes and CI is having a bad day with
this branch anyway
---
ci/harry_simulation.sh | 4 +---
.../org/apache/cassandra/auth/AuthKeyspace.java| 4 ++--
.../statements/schema/CreateKeyspaceStatement.java | 4 +++-
.../cassandra/locator/InetAddressAndPort.java | 4 ++--
.../schema/DistributedMetadataLogKeyspace.java | 10 -
.../apache/cassandra/schema/ReplicationParams.java | 2 +-
.../cassandra/service/StorageServiceMBean.java | 24 +++---
.../cassandra/tcm/ClusterMetadataService.java | 8 +++-
.../org/apache/cassandra/tcm/log/LogState.java | 9 +++-
.../cassandra/tcm/ownership/PlacementForRange.java | 4 ++--
.../tcm/ownership/VersionedEndpoints.java | 6 --
.../simulator/test/ShortPaxosSimulationTest.java | 8
12 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/ci/harry_simulation.sh b/ci/harry_simulation.sh
index 537784b3b7..47d254463f 100755
--- a/ci/harry_simulation.sh
+++ b/ci/harry_simulation.sh
@@ -35,8 +35,6 @@ common=(-Dstorage-config=$current_dir/../test/conf
-Dcassandra.test.sstableformatdevelopment=true
-Djava.security.egd=file:/dev/urandom
-Dcassandra.testtag=.jdk11
--Dstorage-config=$current_dir/../test/conf
--Djava.awt.headless=true
-Dcassandra.keepBriefBrief=true
-Dcassandra.allow_simplestrategy=true
-Dcassandra.strict.runtime.checks=true
@@ -57,7 +55,7 @@ common=(-Dstorage-config=$current_dir/../test/conf
-Dcassandra.test.logConfigPath=$current_dir/../test/conf/log4j2-dtest-simulator.xml
-Dcassandra.test.logConfigProperty=log4j.configurationFile
-Dlog4j2.configurationFile=$current_dir/../test/conf/log4j2-dtest-simulator.xml
--javaagent:$current_dir/../lib/jamm-0.3.2.jar
+-javaagent:$current_dir/../lib/jamm-0.4.0.jar
-javaagent:$current_dir/../build/test/lib/jars/simulator-asm.jar
-Xbootclasspath/a:$current_dir/../build/test/lib/jars/simulator-bootstrap.jar
-XX:ActiveProcessorCount=4
diff --git a/src/java/org/apache/cassandra/auth/AuthKeyspace.java
b/src/java/org/apache/cassandra/auth/AuthKeyspace.java
index 98a9496064..7546a2e948 100644
--- a/src/java/org/apache/cassandra/auth/AuthKeyspace.java
+++ b/src/java/org/apache/cassandra/auth/AuthKeyspace.java
@@ -41,13 +41,13 @@ public final class AuthKeyspace
{
}
-public static final int DEFAULT_RF =
CassandraRelevantProperties.SYSTEM_AUTH_DEFAULT_RF.getInt();
+private static final int DEFAULT_RF =
CassandraRelevantProperties.SYSTEM_AUTH_DEFAULT_RF.getInt();
/**
* Generation is used as a timestamp for automatic table creation on
startup.
* If you make any changes to the tables below, make sure to increment the
* generation and document your change here.
- *
+ *
* gen 0: original definition in 3.0
* gen 1: compression chunk length reduced to 16KiB,
memtable_flush_period_in_ms now unset on all tables in 4.0
*/
diff --git
a/src/java/org/apache/cassandra/cql3/statements/schema/CreateKeyspaceStatement.java
b/src/java/org/apache/cassandra/cql3/statements/schema/CreateKeyspaceStatement.java
index 6d432fe5a8..68b91d0ad5 100644
---
a/src/java/org/apache/cassandra/cql3/statements/schema/CreateKeyspaceStatement.java
+++
b/src/java/org/apache/cassandra/cql3/statements/schema/CreateKeyspaceStatement.java
@@ -35,7 +35,9 @@ import org.apache.cassandra.db.guardrails.Guardrails;
import org.apache.cassandra.exceptions.AlreadyExistsException;
import org.apache.cassandra.locator.LocalStrategy;
import org.apache.cassandra.locator.SimpleStrategy;
-import org.apache.cassandra.schema.*;
+import org.apache.cassandra.schema.Keyspaces;
+import org.apache.cassandra.schema.KeyspaceMetadata;
+import org.apache.cassandra.schema.Schema;
import org.apache.cassandra.schema.KeyspaceParams.Option;
import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff;
import org.apache.cassandra.service.ClientState;
diff --git a/src/java/org/apache/cassandra/locator/InetAddressAndPort.java
b/src/java/org/apache/cassandra/locator/InetAddressAndPort.java
index 50f3368b20..60c7fd5bf1 100644
--- a/src/java/org/apache/cassandra/locator/InetAddressAndPort.java
+++ b/src/java/org/apache/cassandra/locator/InetAddressAndPort.java
[cassandra] branch trunk updated (16b43e4d4b -> 210a59b194)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 16b43e4d4b Merge branch 'cassandra-5.0' into trunk add eb30005251 Upgrade caffeine cache and fix CIDR permissions cache invalidation new 210a59b194 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .build/parent-pom-template.xml | 2 +- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/AuthCache.java| 2 +- src/java/org/apache/cassandra/auth/CIDRPermissionsCache.java | 5 +++-- src/java/org/apache/cassandra/metrics/ChunkCacheMetrics.java | 5 +++-- .../cassandra/tools/nodetool/InvalidateCIDRPermissionsCacheTest.java | 3 +++ 6 files changed, 12 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 210a59b1948f467a652024badc8c7d6b81d543c1 Merge: 16b43e4d4b eb30005251 Author: Ekaterina Dimitrova AuthorDate: Tue Oct 3 16:17:34 2023 -0400 Merge branch 'cassandra-5.0' into trunk .build/parent-pom-template.xml | 2 +- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/AuthCache.java| 2 +- src/java/org/apache/cassandra/auth/CIDRPermissionsCache.java | 5 +++-- src/java/org/apache/cassandra/metrics/ChunkCacheMetrics.java | 5 +++-- .../cassandra/tools/nodetool/InvalidateCIDRPermissionsCacheTest.java | 3 +++ 6 files changed, 12 insertions(+), 6 deletions(-) diff --cc CHANGES.txt index 5cd15c18f9,91b5320c18..ed3690e986 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -5.0-alpha2 +5.1 + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Upgrade caffeine cache and fix CIDR permissions cache invalidation (CASSANDRA-18805) * Remove deprecated properties in CompressionParams (CASSANDRA-18742) * Add support for repair coordinator to retry messages that timeout (CASSANDRA-18816) * Upgrade slf4j-api to 1.7.36 (CASSANDRA-18882) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (d828cd0228 -> eb30005251)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from d828cd0228 Test failure: org.apache.cassandra.repair.ConcurrentIrWithPreviewFuzzTest add eb30005251 Upgrade caffeine cache and fix CIDR permissions cache invalidation No new revisions were added by this update. Summary of changes: .build/parent-pom-template.xml | 2 +- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/AuthCache.java| 2 +- src/java/org/apache/cassandra/auth/CIDRPermissionsCache.java | 5 +++-- src/java/org/apache/cassandra/metrics/ChunkCacheMetrics.java | 5 +++-- .../cassandra/tools/nodetool/InvalidateCIDRPermissionsCacheTest.java | 3 +++ 6 files changed, 12 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (90e12e3fc9 -> b07034eeb7)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 90e12e3fc9 Merge branch 'cassandra-4.1' into cassandra-5.0 add 4eeaf6a6ee Update hdrhistogram to 2.1.12 add 486acc68f1 Merge branch 'cassandra-4.0' into cassandra-4.1 add b07034eeb7 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated (4974a8237c -> 486acc68f1)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 4974a8237c Merge branch 'cassandra-4.0' into cassandra-4.1 add 4eeaf6a6ee Update hdrhistogram to 2.1.12 add 486acc68f1 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + build.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (8cc2b48192 -> c60b2ca65f)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8cc2b48192 Merge branch 'cassandra-5.0' into trunk add 4eeaf6a6ee Update hdrhistogram to 2.1.12 add 486acc68f1 Merge branch 'cassandra-4.0' into cassandra-4.1 add b07034eeb7 Merge branch 'cassandra-4.1' into cassandra-5.0 new c60b2ca65f Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c60b2ca65f85f2502453bc35a11e656e6eddd9b1 Merge: 8cc2b48192 b07034eeb7 Author: Ekaterina Dimitrova AuthorDate: Tue Oct 3 11:12:32 2023 -0400 Merge branch 'cassandra-5.0' into trunk .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.0 updated (cb1f1399b1 -> 4eeaf6a6ee)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from cb1f1399b1 Improve performance of compactions when table does not have an index add 4eeaf6a6ee Update hdrhistogram to 2.1.12 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + build.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (6708499e4c -> 2b23fc58aa)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 6708499e4c Remove metrics-reporter-config dependency add 2b23fc58aa Fix accessing java.nio.Bits.TOTAL_CAPACITY in Java17 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + build.xml | 1 + conf/jvm17-clients.options | 1 + conf/jvm17-server.options | 1 + src/java/org/apache/cassandra/service/GCInspector.java | 11 +-- 5 files changed, 5 insertions(+), 10 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (830f88d4ab -> 89065ffa21)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 830f88d4ab Merge branch 'cassandra-5.0' into trunk add 2b23fc58aa Fix accessing java.nio.Bits.TOTAL_CAPACITY in Java17 new 89065ffa21 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + build.xml | 1 + conf/jvm17-clients.options | 1 + conf/jvm17-server.options | 1 + src/java/org/apache/cassandra/service/GCInspector.java | 11 +-- 5 files changed, 5 insertions(+), 10 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 89065ffa2189861c0437fd1f1a5748df006e8907 Merge: 830f88d4ab 2b23fc58aa Author: Ekaterina Dimitrova AuthorDate: Thu Sep 14 12:08:45 2023 -0400 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + build.xml | 1 + conf/jvm17-clients.options | 1 + conf/jvm17-server.options | 1 + src/java/org/apache/cassandra/service/GCInspector.java | 11 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --cc CHANGES.txt index 6b81061a5d,55b0b78e36..bdda12f603 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -5.0-alpha2 +5.1 + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Fix accessing java.nio.Bits.TOTAL_CAPACITY in Java17 (CASSANDRA-18848) * Remove metrics-reporter-config dependency (CASSANDRA-18743) * Fix SAI's SegmentMetadata min and max primary keys (CASSANDRA-18734) * Remove commons-codec dependency (CASSANDRA-18772) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (00c0cbb958 -> 6708499e4c)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 00c0cbb958 Merge branch 'cassandra-4.1' into cassandra-5.0 add 6708499e4c Remove metrics-reporter-config dependency No new revisions were added by this update. Summary of changes: .build/build-rat.xml | 1 - CHANGES.txt| 1 + NEWS.txt | 2 ++ conf/jvm-server.options| 3 -- conf/metrics-reporter-config-sample.yaml | 41 -- .../pages/getting-started/configuring.adoc | 4 +-- .../managing/configuration/cass_env_sh_file.adoc | 5 --- .../pages/managing/operating/metrics.adoc | 10 -- .../config/CassandraRelevantProperties.java| 1 - .../apache/cassandra/service/CassandraDaemon.java | 37 --- 10 files changed, 4 insertions(+), 101 deletions(-) delete mode 100644 conf/metrics-reporter-config-sample.yaml - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (1959502d8b -> 830f88d4ab)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 1959502d8b Merge branch 'cassandra-5.0' into trunk add 6708499e4c Remove metrics-reporter-config dependency new 830f88d4ab Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .build/build-rat.xml | 1 - CHANGES.txt| 1 + NEWS.txt | 2 ++ conf/jvm-server.options| 3 -- conf/metrics-reporter-config-sample.yaml | 41 -- .../pages/getting-started/configuring.adoc | 4 +-- .../managing/configuration/cass_env_sh_file.adoc | 5 --- .../pages/managing/operating/metrics.adoc | 10 -- .../config/CassandraRelevantProperties.java| 1 - .../apache/cassandra/service/CassandraDaemon.java | 37 --- 10 files changed, 4 insertions(+), 101 deletions(-) delete mode 100644 conf/metrics-reporter-config-sample.yaml - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 830f88d4ab2aaa1f7b88b90747a808d0a4e2a708 Merge: 1959502d8b 6708499e4c Author: Ekaterina Dimitrova AuthorDate: Tue Sep 12 10:22:23 2023 -0400 Merge branch 'cassandra-5.0' into trunk .build/build-rat.xml | 1 - CHANGES.txt| 1 + NEWS.txt | 2 ++ conf/jvm-server.options| 3 -- conf/metrics-reporter-config-sample.yaml | 41 -- .../pages/getting-started/configuring.adoc | 4 +-- .../managing/configuration/cass_env_sh_file.adoc | 5 --- .../pages/managing/operating/metrics.adoc | 10 -- .../config/CassandraRelevantProperties.java| 1 - .../apache/cassandra/service/CassandraDaemon.java | 37 --- 10 files changed, 4 insertions(+), 101 deletions(-) diff --cc CHANGES.txt index 82b022fc40,e8abddb227..6b81061a5d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -5.0-alpha2 +5.1 + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Remove metrics-reporter-config dependency (CASSANDRA-18743) * Fix SAI's SegmentMetadata min and max primary keys (CASSANDRA-18734) * Remove commons-codec dependency (CASSANDRA-18772) Merged from 4.1: - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (bf39188cdc -> 9be8369ae6)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from bf39188cdc Ninja fix for CASSANDRA-18606 add 9be8369ae6 Remove commons-codec dependency patch by Ekaterina Dimitrova; reviewed by Brandon Williams (CASSANDRA-18772) No new revisions were added by this update. Summary of changes: .build/cassandra-deps-template.xml | 4 .build/parent-pom-template.xml | 5 - CHANGES.txt| 1 + 3 files changed, 1 insertion(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f8d5a1aa162706771000eca18dd9f21282dd2be3 Merge: 7ecac39570 9be8369ae6 Author: Ekaterina Dimitrova AuthorDate: Tue Sep 5 13:58:28 2023 -0400 Merge branch 'cassandra-5.0' into trunk .build/cassandra-deps-template.xml | 4 .build/parent-pom-template.xml | 5 - CHANGES.txt| 1 + 3 files changed, 1 insertion(+), 9 deletions(-) diff --cc CHANGES.txt index 7294d99c8a,953ca7f3dc..26dab609c1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,12 +1,7 @@@ -5.0-alpha2 +5.1 + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Remove commons-codec dependency (CASSANDRA-18772) -Merged from 4.1: -Merged from 4.0: -Merged from 3.11: -Merged from 3.0: - * Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818) - -5.0-alpha1 * Fix rpm installations to work with jdk17 (CASSANDRA-18817) * Fix Depends and Build-Depends for Java for Debian packages (CASSANDRA-18809) * Update command line flags --add-exports and --add-opens for JDK17 (CASSANDRA-18439) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (7ecac39570 -> f8d5a1aa16)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 7ecac39570 Merge branch 'cassandra-5.0' into trunk add 9be8369ae6 Remove commons-codec dependency patch by Ekaterina Dimitrova; reviewed by Brandon Williams (CASSANDRA-18772) new f8d5a1aa16 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .build/cassandra-deps-template.xml | 4 .build/parent-pom-template.xml | 5 - CHANGES.txt| 1 + 3 files changed, 1 insertion(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (637a427274 -> ae8abf5cd6)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 637a427274 Add missing features to the page listing the 5.0 new features add ae8abf5cd6 Closing some JDK internals post jamm upgrade patch by Ekaterina Dimitrova; reviewed by Benjamin Lerer for CASSANDRA-18439 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + build.xml | 15 --- conf/jvm17-clients.options | 17 +++-- conf/jvm17-server.options | 26 -- 4 files changed, 12 insertions(+), 47 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (e9b9f9a35f -> 4621ec7782)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from e9b9f9a35f Merge branch 'cassandra-5.0' into trunk add ae8abf5cd6 Closing some JDK internals post jamm upgrade patch by Ekaterina Dimitrova; reviewed by Benjamin Lerer for CASSANDRA-18439 new 4621ec7782 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + build.xml | 15 --- conf/jvm17-clients.options | 17 +++-- conf/jvm17-server.options | 26 -- 4 files changed, 12 insertions(+), 47 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 4621ec77821c306de448e6826f46551d75e7ec18 Merge: e9b9f9a35f ae8abf5cd6 Author: Ekaterina Dimitrova AuthorDate: Wed Aug 30 10:49:00 2023 -0400 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + build.xml | 15 --- conf/jvm17-clients.options | 17 +++-- conf/jvm17-server.options | 26 -- 4 files changed, 12 insertions(+), 47 deletions(-) diff --cc CHANGES.txt index 16e2221245,0d67ab6cf7..4a22943de8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,16 +1,8 @@@ -5.0-alpha2 +5.1 +Merged from 5.0: + * Update command line flags --add-exports and --add-opens for JDK17 (CASSANDRA-18439) * Update commons-lang3 to 3.13.0 (CASSANDRA-18789) * Forbid SAI indexes with analysis options on primary key columns (CASSANDRA-18782) -Merged from 4.1: - * Waiting indefinitely on ReceivedMessage response in StreamSession#receive() can cause deadlock (CASSANDRA-18733) - * Allow empty keystore_password in encryption_options (CASSANDRA-18778) -Merged from 4.0: -Merged from 3.11: -Merged from 3.0: - * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585) - -5.0-alpha1 * Expose bootstrap failure state via JMX and nodetool info (CASSANDRA-18749) * Reduce size of per-SSTable index components for SAI (CASSANDRA-18673) * Remove unnecessary Netty dependencies after upgrade to version 4.1.96 (CASSANDRA-18729) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (e4c97f1925 -> 046c8447ec)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from e4c97f1925 CircleCI: Fix BASE_BRANCH in generate.sh add 046c8447ec Update commons-lang3 to 3.13.0 No new revisions were added by this update. Summary of changes: .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b04c2aeddce22b667f523d5e1988f6f1892710a9 Merge: 269c04474f 046c8447ec Author: Ekaterina Dimitrova AuthorDate: Mon Aug 28 09:46:33 2023 -0400 Merge branch 'cassandra-5.0' into trunk .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 2c043d558f,6ac699d84a..9fd9c63069 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,14 +1,7 @@@ -5.0-alpha2 +5.1 +Merged from 5.0: + * Update commons-lang3 to 3.13.0 (CASSANDRA-18789) * Forbid SAI indexes with analysis options on primary key columns (CASSANDRA-18782) -Merged from 4.1: - * Allow empty keystore_password in encryption_options (CASSANDRA-18778) -Merged from 4.0: -Merged from 3.11: -Merged from 3.0: - * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585) - -5.0-alpha1 * Expose bootstrap failure state via JMX and nodetool info (CASSANDRA-18749) * Reduce size of per-SSTable index components for SAI (CASSANDRA-18673) * Remove unnecessary Netty dependencies after upgrade to version 4.1.96 (CASSANDRA-18729) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (269c04474f -> b04c2aeddc)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 269c04474f Merge branch 'cassandra-5.0' into trunk add 046c8447ec Update commons-lang3 to 3.13.0 new b04c2aeddc Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (052a264741 -> 269c04474f)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 052a264741 Merge branch 'cassandra-5.0' into trunk add e4c97f1925 CircleCI: Fix BASE_BRANCH in generate.sh new 269c04474f Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 269c04474fefdce70225b27d6ca9857e39546ba6 Merge: 052a264741 e4c97f1925 Author: Ekaterina Dimitrova AuthorDate: Mon Aug 28 09:29:10 2023 -0400 Merge branch 'cassandra-5.0' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (c611632eb5 -> e4c97f1925)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from c611632eb5 SamplingManager samples before cancelling. add e4c97f1925 CircleCI: Fix BASE_BRANCH in generate.sh No new revisions were added by this update. Summary of changes: .circleci/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f713a6618fe1d9fde23b1552cd0c8fc7309e3e05 Merge: d058194354 816d1ac181 Author: Ekaterina Dimitrova AuthorDate: Wed Aug 16 11:25:34 2023 -0400 Merge branch 'cassandra-5.0' into trunk .../org/apache/cassandra/cql3/validation/entities/UFTest.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (ed3968bf86 -> 816d1ac181)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from ed3968bf86 Merge branch 'cassandra-4.1' into cassandra-5.0 add 816d1ac181 Fix UFTest#testSchemaChange No new revisions were added by this update. Summary of changes: .../org/apache/cassandra/cql3/validation/entities/UFTest.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (d058194354 -> f713a6618f)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from d058194354 Merge branch 'cassandra-5.0' into trunk add 816d1ac181 Fix UFTest#testSchemaChange new f713a6618f Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/cassandra/cql3/validation/entities/UFTest.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (000533cb63 -> 56b332b4cf)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 000533cb63 Prevent InaccessibleObjectException when the Leak Detector is traversing objects add 430be9d9f6 CircleCI: make all java distributed tests run in Medium containers add a69733cd12 Merge branch 'cassandra-3.11' into cassandra-4.0 add c778a76adb Merge branch 'cassandra-4.0' into cassandra-4.1 add 56b332b4cf Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: .circleci/config.yml.PAID| 12 ++--- .circleci/config_template.yml| 8 +++- .circleci/config_template.yml.PAID.patch | 82 ++-- 3 files changed, 58 insertions(+), 44 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.0 updated (dcc74883ba -> a69733cd12)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from dcc74883ba Merge branch 'cassandra-3.11' into cassandra-4.0 add 430be9d9f6 CircleCI: make all java distributed tests run in Medium containers add a69733cd12 Merge branch 'cassandra-3.11' into cassandra-4.0 No new revisions were added by this update. Summary of changes: .circleci/config.yml.PAID| 6 +- .circleci/config_template.yml| 8 ++- .circleci/config_template.yml.PAID.patch | 102 ++- 3 files changed, 68 insertions(+), 48 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-3.11 updated (f86929eae0 -> 430be9d9f6)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from f86929eae0 Prepare debian changelog for 3.11.16 add 430be9d9f6 CircleCI: make all java distributed tests run in Medium containers No new revisions were added by this update. Summary of changes: .circleci/config.yml.PAID| 6 +++--- .circleci/config_template.yml| 8 +++- .circleci/config_template.yml.PAID.patch | 32 .circleci/readme.md | 2 +- 4 files changed, 31 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9f2005cd5788c35e412d4842d9bcf7b207f19673 Merge: 8f3c8e721e 56b332b4cf Author: Ekaterina Dimitrova AuthorDate: Sun Aug 13 17:26:01 2023 -0400 Merge branch 'cassandra-5.0' into trunk .circleci/config.yml.PAID| 12 ++--- .circleci/config_template.yml| 8 +++- .circleci/config_template.yml.PAID.patch | 82 ++-- 3 files changed, 58 insertions(+), 44 deletions(-) diff --cc .circleci/config_template.yml.PAID.patch index affd99d7ef,e44b610607..7ca86ce04f --- a/.circleci/config_template.yml.PAID.patch +++ b/.circleci/config_template.yml.PAID.patch @@@ -1,6 -1,6 +1,6 @@@ - --- config_template.yml 2023-07-24 11:55:54.0 -0400 - +++ config_template.yml.PAID 2023-07-24 11:58:41.0 -0400 - @@ -157,14 +157,14 @@ + --- config_template.yml 2023-08-11 10:06:39.0 -0400 -+++ config_template.yml.PAID 2023-08-11 10:07:25.0 -0400 + config_template.yml.PAID 2023-08-11 10:22:35.0 -0400 + @@ -157,20 +157,20 @@ j11_par_executor: _par_executor executor: name: java11-executor - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (8f3c8e721e -> 9f2005cd57)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8f3c8e721e Merge branch 'cassandra-5.0' into trunk add 430be9d9f6 CircleCI: make all java distributed tests run in Medium containers add a69733cd12 Merge branch 'cassandra-3.11' into cassandra-4.0 add c778a76adb Merge branch 'cassandra-4.0' into cassandra-4.1 add 56b332b4cf Merge branch 'cassandra-4.1' into cassandra-5.0 new 9f2005cd57 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/config.yml.PAID| 12 ++--- .circleci/config_template.yml| 8 +++- .circleci/config_template.yml.PAID.patch | 82 ++-- 3 files changed, 58 insertions(+), 44 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated (a7ffdba8d3 -> c778a76adb)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from a7ffdba8d3 Merge branch 'cassandra-4.0' into cassandra-4.1 add 430be9d9f6 CircleCI: make all java distributed tests run in Medium containers add a69733cd12 Merge branch 'cassandra-3.11' into cassandra-4.0 add c778a76adb Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: .circleci/config.yml.PAID| 12 ++--- .circleci/config_template.yml| 8 +++- .circleci/config_template.yml.PAID.patch | 81 +--- 3 files changed, 57 insertions(+), 44 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (f8d4e2a3c8 -> 000533cb63)
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from f8d4e2a3c8 Disable heap dump creation by default on crash for tests
that use test/conf/cassandra.yaml
add 000533cb63 Prevent InaccessibleObjectException when the Leak Detector
is traversing objects
No new revisions were added by this update.
Summary of changes:
CHANGES.txt| 1 +
.../UnaccessibleFieldException.java} | 10 +--
.../org/apache/cassandra/utils/concurrent/Ref.java | 78 +++---
3 files changed, 74 insertions(+), 15 deletions(-)
copy src/java/org/apache/cassandra/{serializers/MarshalException.java =>
exceptions/UnaccessibleFieldException.java} (74%)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8f3c8e721e991d1e2219ac32edacde9d5c19ce82 Merge: 5ade7a6cd8 000533cb63 Author: Ekaterina Dimitrova AuthorDate: Fri Aug 11 15:44:36 2023 -0400 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../exceptions/UnaccessibleFieldException.java | 34 ++ .../org/apache/cassandra/utils/concurrent/Ref.java | 78 +++--- 3 files changed, 102 insertions(+), 11 deletions(-) diff --cc CHANGES.txt index 969b959e01,984b9ef99d..6761949457 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -5.0 +5.1 +Merged from 5.0: + * Prevent InaccessibleObjectException when the Leak Detector is traversing objects (CASSANDRA-18708) * Remove legacy command line options from cassandra-stress (CASSANDRA-18529) * Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161) * Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (5ade7a6cd8 -> 8f3c8e721e)
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 5ade7a6cd8 Merge branch 'cassandra-5.0' into trunk
add 000533cb63 Prevent InaccessibleObjectException when the Leak Detector
is traversing objects
new 8f3c8e721e Merge branch 'cassandra-5.0' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt| 1 +
.../UnaccessibleFieldException.java} | 10 +--
.../org/apache/cassandra/utils/concurrent/Ref.java | 78 +++---
3 files changed, 74 insertions(+), 15 deletions(-)
copy src/java/org/apache/cassandra/{serializers/MarshalException.java =>
exceptions/UnaccessibleFieldException.java} (74%)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra-website] branch trunk updated: Update How to commit page post CASSANDRA-18618 and 5.0 branch creation
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-website.git The following commit(s) were added to refs/heads/trunk by this push: new c99e80d57 Update How to commit page post CASSANDRA-18618 and 5.0 branch creation c99e80d57 is described below commit c99e80d57465640b438b0a8c4d8338224c90c454 Author: Ekaterina Dimitrova AuthorDate: Wed Aug 9 15:23:49 2023 -0400 Update How to commit page post CASSANDRA-18618 and 5.0 branch creation patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever for CASSANDRA-18738 --- .../ROOT/pages/development/how_to_commit.adoc | 54 +++--- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc b/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc index ceb8ac243..383fcf605 100644 --- a/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc +++ b/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc @@ -14,12 +14,12 @@ Hypothetical CASSANDRA-12345 ticket is a cassandra-4.0 based bug fix that requires different code for cassandra-4.0, cassandra-4.1, and trunk. Contributor Jackie supplied a patch for the root branch (12345-4.0.patch), and patches for the remaining branches -(12345-4.1.patch, 12345-trunk.patch). +(12345-4.1.patch, 12345-5.0.patch, 12345-trunk.patch). On cassandra-4.0::: . `+git am -3 12345-4.0.patch+` (any problem b/c of CHANGES.txt not merging anymore, fix it in place) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) . `+git commit --amend+` (Notice this will squash the 4.0 applied patch into the forward merge commit) @@ -27,22 +27,30 @@ On cassandra-4.1::: . `+git merge cassandra-4.0 -s ours --log+` . `+git apply -3 12345-4.1.patch+` (any issue with CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) . `+git commit --amend+` (Notice this will squash the 4.1 applied patch into the forward merge commit) +On cassandra-5.0::: +. `+git merge cassandra-4.1 -s ours --log+` +. `+git apply -3 12345-5.0.patch+` (any issue with CHANGES.txt : fix +and [.title-ref]#git add CHANGES.txt#) +. `+ant realclean && ant jar check+` (rebuild to make sure code +compiles) +. `+git commit --amend+` (Notice this will squash the 4.1 applied +patch into the forward merge commit) On trunk::: - . `+git merge cassandra-4.1 -s ours --log+` + . `+git merge cassandra-5.0 -s ours --log+` . `+git apply -3 12345-trunk.patch+` (any issue with CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar check+` (rebuild to make sure code compiles) . `+git commit --amend+` (Notice this will squash the trunk applied patch into the forward merge commit) On any branch::: - . `+git push origin cassandra-4.0 cassandra-4.1 trunk --atomic -n+` + . `+git push origin cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk --atomic -n+` (dryrun check) - . `+git push origin cassandra-4.0 cassandra-4.1 trunk --atomic+` + . `+git push origin cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk --atomic+` == Git branch based Contribution @@ -51,7 +59,7 @@ Same scenario, but a branch-based contribution: On cassandra-4.0::: . `+git cherry-pick +` (any problem b/c of CHANGES.txt not merging anymore, fix it in place) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) On cassandra-4.1::: . `+git merge cassandra-4.0 -s ours --log+` @@ -59,24 +67,34 @@ On cassandra-4.1::: format-patch and apply is [.title-ref]#cherry-pick -n#) . `+git apply -3 .patch+` (any issue with CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#) - . `+ant realclean && ant jar build-test+` (rebuild to make sure code + . `+ant realclean && ant jar+` (rebuild to make sure code compiles) . `+git commit --amend+` (Notice this will squash the 4.1 applied patch into the forward merge commit) +On cassandra-5.0::: +. `+git merge cassandra-4.1 -s ours --log+` +. `+git format-patch -1 +` (alternative to +format-patch and apply is [.title-ref]#cherry-pick -n#) +. `+git apply -3 .patch+` (any issue with +CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#) +. `+ant realclean && ant jar check+` (rebuild to make sure code +compiles) +. `+git commit --amend+` (Notice this will squash the 5.0 applied +patch into the forward merge commit) On trun
[cassandra] branch cassandra-5.0 updated (7482d88f48 -> 0c22f9b42c)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 7482d88f48 Add guardrail for vector dimensions add 0c22f9b42c Upgrade JMH from 1.21 to 1.36. The upgrade is fixing inaccessible object exceptions when running benchmarks with JMH+profiler+JDK17 No new revisions were added by this update. Summary of changes: .build/parent-pom-template.xml | 4 ++-- CHANGES.txt| 1 + 2 files changed, 3 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d707bb98b4e0f4d79bb66fad649f97ddf6fd84d7 Merge: de0a556c5d 0c22f9b42c Author: Ekaterina Dimitrova AuthorDate: Wed Aug 9 10:00:27 2023 -0400 Merge branch 'cassandra-5.0' into trunk .build/parent-pom-template.xml | 4 ++-- CHANGES.txt| 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index bda248627e,078aebd993..df38dc8f6a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,6 +1,16 @@@ -5.0 +5.1 +Merged from 5.0: + * Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696) * Add guardrail for vector dimensions (CASSANDRA-18730) +Merged from 4.1: +Merged from 4.0: +Merged from 3.11: +Merged from 3.0: + * Fix CQLSH online help topic link (CASSANDRA-17534) + * Remove unused suppressions (CASSANDRA-18724) + + +5.0 * Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992) * Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723) * CIDR filtering authorizer (CASSANDRA-18592) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (de0a556c5d -> d707bb98b4)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from de0a556c5d Merge branch 'cassandra-5.0' into trunk add 0c22f9b42c Upgrade JMH from 1.21 to 1.36. The upgrade is fixing inaccessible object exceptions when running benchmarks with JMH+profiler+JDK17 new d707bb98b4 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .build/parent-pom-template.xml | 4 ++-- CHANGES.txt| 1 + 2 files changed, 3 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated: Fix HandshakeTest initiated twice for the outbound connection
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4f232324ba Fix HandshakeTest initiated twice for the outbound
connection
4f232324ba is described below
commit 4f232324ba030ff640a790b4029d9f722e96872b
Author: Maxim Muzafarov
AuthorDate: Tue Aug 1 22:01:55 2023 +0200
Fix HandshakeTest initiated twice for the outbound connection
patch by Maxim Muzafarov; reviewed by Jon Meredith and Mchael Semb Wever
for CASSANDRA-18704
---
.../org/apache/cassandra/net/HandshakeTest.java| 47 +-
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/test/unit/org/apache/cassandra/net/HandshakeTest.java
b/test/unit/org/apache/cassandra/net/HandshakeTest.java
index 7c536f4baf..46e399259d 100644
--- a/test/unit/org/apache/cassandra/net/HandshakeTest.java
+++ b/test/unit/org/apache/cassandra/net/HandshakeTest.java
@@ -25,6 +25,8 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
import com.google.common.net.InetAddresses;
@@ -40,6 +42,7 @@ import org.apache.cassandra.utils.concurrent.AsyncPromise;
import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import io.netty.channel.EventLoop;
@@ -52,6 +55,7 @@ import static
org.apache.cassandra.net.OutboundConnectionInitiator.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
// TODO: test failure due to exception, timeout, etc
public class HandshakeTest
@@ -59,6 +63,7 @@ public class HandshakeTest
private static final SocketFactory factory = new SocketFactory();
static final InetAddressAndPort TO_ADDR =
InetAddressAndPort.getByAddressOverrideDefaults(InetAddresses.forString("127.0.0.2"),
7012);
static final InetAddressAndPort FROM_ADDR =
InetAddressAndPort.getByAddressOverrideDefaults(InetAddresses.forString("127.0.0.1"),
7012);
+private volatile Throwable handshakeEx;
@BeforeClass
public static void startup()
@@ -73,6 +78,12 @@ public class HandshakeTest
factory.shutdownNow();
}
+@Before
+public void setup()
+{
+handshakeEx = null;
+}
+
private Result handshake(int outMin, int outMax) throws
ExecutionException, InterruptedException
{
return handshake(new AcceptVersions(outMin, outMax), null);
@@ -298,13 +309,13 @@ public class HandshakeTest
.withAcceptVersions(new AcceptVersions(minimum_version,
current_version))
.withDefaults(ConnectionCategory.MESSAGING)
.withEncryption(getServerEncryptionOptions(connectionType, optional))
+.withDebugCallbacks(new HandshakeAcknowledgeChecker(t -> handshakeEx =
t))
.withFrom(FROM_ADDR);
OutboundConnections outboundConnections =
OutboundConnections.tryRegister(new ConcurrentHashMap<>(), TO_ADDR, settings);
GossipDigestSyn syn = new GossipDigestSyn("cluster", "partitioner",
new ArrayList<>(0));
Message message = Message.out(Verb.GOSSIP_DIGEST_SYN,
syn);
OutboundConnection outboundConnection =
outboundConnections.connectionFor(message);
outboundConnection.enqueue(message);
-outboundConnection.initiate();
return outboundConnection;
}
@@ -322,6 +333,7 @@ public class HandshakeTest
OutboundConnection outboundConnection = initiateOutbound(endpoint,
fromConnectionType, fromOptional);
waitForConnection(outboundConnection);
assertTrue(outboundConnection.isConnected());
+assertNull(handshakeEx);
}
finally
{
@@ -337,4 +349,37 @@ public class HandshakeTest
Thread.sleep(1000);
}
}
+
+private static class HandshakeAcknowledgeChecker implements
OutboundDebugCallbacks
+{
+private final AtomicInteger acks = new AtomicInteger(0);
+private final Consumer fail;
+
+private HandshakeAcknowledgeChecker(Consumer fail)
+{
+this.fail = fail;
+}
+
+@Override
+public void onSendSmallFrame(int messageCount, int payloadSizeInBytes)
+{
+}
+
+@Override
+public void onSentSmallFrame(int messageCount, int payloadSizeInBytes)
+{
+}
+
+@Override
+public void onFailedSmallFrame(int messageCount, int
payloadSizeInBytes)
+{
+}
+
+@Override
+public void onConnect(int messagingVersion, OutboundConnectionSettings
settings)
[cassandra] branch trunk updated: Fix BulkLoader ignoring cipher suites options.
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1c7e7db2d0 Fix BulkLoader ignoring cipher suites options.
1c7e7db2d0 is described below
commit 1c7e7db2d062e54c38a05e073caa40889188657c
Author: Ekaterina Dimitrova
AuthorDate: Tue Aug 1 14:37:26 2023 -0400
Fix BulkLoader ignoring cipher suites options.
patch by Dan Jatnieks; reviewed by Ekaterina Dimitrova and Jon Meredith for
CASSANDRA-18582
---
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/EncryptionOptions.java | 5 +
src/java/org/apache/cassandra/tools/BulkLoader.java | 3 ++-
.../distributed/test/SSTableLoaderEncryptionOptionsTest.java | 1 +
.../src/org/apache/cassandra/stress/util/JavaDriverClient.java | 3 ++-
5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 9875217ba8..cc40181f4c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -179,6 +179,7 @@ Merged from 4.0:
4.1.4
Merged from 4.0:
+ * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
* Migrate Python optparse to argparse (CASSANDRA-17914)
Merged from 3.11:
Merged from 3.0:
diff --git a/src/java/org/apache/cassandra/config/EncryptionOptions.java
b/src/java/org/apache/cassandra/config/EncryptionOptions.java
index b223b6a896..9db2406a44 100644
--- a/src/java/org/apache/cassandra/config/EncryptionOptions.java
+++ b/src/java/org/apache/cassandra/config/EncryptionOptions.java
@@ -408,6 +408,11 @@ public class EncryptionOptions
return ap == null ? new String[0] : ap.toArray(new String[0]);
}
+public String[] cipherSuitesArray()
+{
+return cipher_suites == null ? null : cipher_suites.toArray(new
String[0]);
+}
+
public TlsEncryptionPolicy tlsEncryptionPolicy()
{
if (getOptional())
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java
b/src/java/org/apache/cassandra/tools/BulkLoader.java
index 8d5a1d4c67..8802b9e837 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -273,8 +273,9 @@ public class BulkLoader
// Temporarily override newSSLEngine to set accepted protocols until
it is added to
// RemoteEndpointAwareJdkSSLOptions. See CASSANDRA-13325 and
CASSANDRA-16362.
-RemoteEndpointAwareJdkSSLOptions sslOptions = new
RemoteEndpointAwareJdkSSLOptions(sslContext, null)
+RemoteEndpointAwareJdkSSLOptions sslOptions = new
RemoteEndpointAwareJdkSSLOptions(sslContext,
clientEncryptionOptions.cipherSuitesArray())
{
+@Override
protected SSLEngine newSSLEngine(SocketChannel channel,
InetSocketAddress remoteEndpoint)
{
SSLEngine engine = super.newSSLEngine(channel, remoteEndpoint);
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java
b/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java
index 00834bae58..94ea1d0441 100644
---
a/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java
@@ -98,6 +98,7 @@ public class SSTableLoaderEncryptionOptionsTest extends
AbstractEncryptionOption
"--truststore",
validTrustStorePath,
"--truststore-password", validTrustStorePassword,
"--conf-path",
"test/conf/sstableloader_with_encryption.yaml",
+"--ssl-ciphers",
"TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA",
sstables_to_upload.absolutePath());
tool.assertOnCleanExit();
assertTrue(tool.getStdout().contains("Summary statistics"));
diff --git
a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
index f05c513c93..f938cd9887 100644
--- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
@@ -165,8 +165,9 @@ public class JavaDriverClient
// Temporarily override newSSLEngine to set accepted protocols
until it is added to
// RemoteEndpointAwareJdkSSLOptions. See CASSANDRA-13325 and
CASSANDRA-16362.
-RemoteEndpointAwareJdkSS
[cassandra] branch cassandra-4.0 updated (31f65c12de -> 4a2a585ec0)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 31f65c12de Merge branch 'cassandra-3.11' into cassandra-4.0 add 4a2a585ec0 Fix BulkLoader ignoring cipher suites options. No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + src/java/org/apache/cassandra/config/EncryptionOptions.java| 2 +- src/java/org/apache/cassandra/tools/BulkLoader.java| 3 ++- .../cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java | 1 + .../stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java | 3 ++- 5 files changed, 7 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 57269bbbc15d509e076343decadd101b1feaceb6 Merge: cdefe1e8f9 fb7e4e7c48 Author: Ekaterina Dimitrova AuthorDate: Tue Aug 1 14:00:49 2023 -0400 Merge branch 'cassandra-4.1' into trunk - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (cdefe1e8f9 -> 57269bbbc1)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from cdefe1e8f9 Fix javadoc task patch by Ekaterina Dimitrova and Zili Chen; reviewed by Jacek Lewandowski, Stefan Miklosovic and Brandon Williams for CASSANDRA-17687 add 4a2a585ec0 Fix BulkLoader ignoring cipher suites options. add fb7e4e7c48 Merge branch 'cassandra-4.0' into cassandra-4.1 new 57269bbbc1 Merge branch 'cassandra-4.1' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated (a3e7558ebb -> fb7e4e7c48)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from a3e7558ebb Merge branch 'cassandra-4.0' into cassandra-4.1 add 4a2a585ec0 Fix BulkLoader ignoring cipher suites options. add fb7e4e7c48 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/config/EncryptionOptions.java | 5 + src/java/org/apache/cassandra/tools/BulkLoader.java | 3 ++- .../distributed/test/SSTableLoaderEncryptionOptionsTest.java | 1 + .../src/org/apache/cassandra/stress/util/JavaDriverClient.java | 3 ++- 5 files changed, 11 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated: Fix javadoc task patch by Ekaterina Dimitrova and Zili Chen; reviewed by Jacek Lewandowski, Stefan Miklosovic and Brandon Williams for CASSANDRA-17687
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new cdefe1e8f9 Fix javadoc task patch by Ekaterina Dimitrova and Zili
Chen; reviewed by Jacek Lewandowski, Stefan Miklosovic and Brandon Williams for
CASSANDRA-17687
cdefe1e8f9 is described below
commit cdefe1e8f9ebc96dfa88437911948e9705d04e4b
Author: Ekaterina Dimitrova
AuthorDate: Mon Jul 31 16:38:00 2023 -0400
Fix javadoc task
patch by Ekaterina Dimitrova and Zili Chen; reviewed by Jacek Lewandowski,
Stefan Miklosovic and Brandon Williams for CASSANDRA-17687
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index c990f3f8ea..fb2ac14540 100644
--- a/build.xml
+++ b/build.xml
@@ -335,7 +335,7 @@
windowtitle="${ant.project.name} API"
classpathref="cassandra.classpath"
bottom="Copyright copy; 2009- The Apache Software Foundation"
useexternalfile="yes" encoding="UTF-8" failonerror="false"
-maxmemory="256m" additionalparam="--frames">
+maxmemory="256m" additionalparam="${jdk11plus-javac-exports}">
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated (778f9f3ed5 -> a3e7558ebb)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 778f9f3ed5 Merge branch 'cassandra-4.0' into cassandra-4.1 add 39db44adff Fix dtest-jar add bee215cce6 Merge branch 'cassandra-3.0' into cassandra-3.11 add 31f65c12de Merge branch 'cassandra-3.11' into cassandra-4.0 add a3e7558ebb Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: .circleci/config.yml | 2 +- .circleci/config.yml.FREE | 2 +- .circleci/config.yml.PAID | 2 +- .circleci/config_template.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-3.11 updated (32afc93b0d -> bee215cce6)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 32afc93b0d Moved jflex from runtime to build dependencies add 39db44adff Fix dtest-jar add bee215cce6 Merge branch 'cassandra-3.0' into cassandra-3.11 No new revisions were added by this update. Summary of changes: .circleci/config.yml | 2 +- .circleci/config.yml.FREE | 2 +- .circleci/config.yml.PAID | 2 +- .circleci/config_template.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.0 updated (a0fdda1976 -> 31f65c12de)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from a0fdda1976 Remove AssertJ from the production code add 39db44adff Fix dtest-jar add bee215cce6 Merge branch 'cassandra-3.0' into cassandra-3.11 add 31f65c12de Merge branch 'cassandra-3.11' into cassandra-4.0 No new revisions were added by this update. Summary of changes: .circleci/config.yml | 2 +- .circleci/config.yml.FREE | 2 +- .circleci/config.yml.PAID | 2 +- .circleci/config_template.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-3.0 updated (493d15fffa -> 39db44adff)
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 493d15fffa Upgrade to OWASP 8.3.1 add 39db44adff Fix dtest-jar No new revisions were added by this update. Summary of changes: .circleci/config.yml | 2 +- .circleci/config.yml.FREE | 2 +- .circleci/config.yml.PAID | 2 +- .circleci/config_template.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
