[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[marcuse]

This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7b55e385159a4dba230887d7de0593fef6930a80
Merge: 3a61006 4b018b5
Author: Marcus Eriksson 
AuthorDate: Fri Apr 30 07:33:02 2021 +0200

Merge branch 'cassandra-3.11' into trunk


-
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-3.11' into trunk

[samt]

This is an automated email from the ASF dual-hosted git repository.

samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 36a0f11221e19b8b21bd57f20e59d6eeb44af36f
Merge: 9cda055 9449cd3
Author: Sam Tunnicliffe 
AuthorDate: Tue Apr 27 12:01:30 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .build/build-rat.xml | 18 +-
 build.xml|  4 +---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --cc .build/build-rat.xml
index 02f8750,54bd153..ce4e6f4
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@@ -81,4 -92,29 +86,15 @@@
  
  
  
+ 
 -
 -  
 -
 -
 -
 -
 -  
 -
 -
 -
 -  
 -
 -
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
diff --cc build.xml
index 566604d,af3256d..347ab6e
--- a/build.xml
+++ b/build.xml
@@@ -2056,9 -1914,7 +2055,8 @@@


  
- 
 -  
 +  
-   
++  
  
  
  

-
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-3.11' into trunk

[samt]

This is an automated email from the ASF dual-hosted git repository.

samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 9cda055faaef6ff2f591ad2815139b9c89882514
Merge: f5a0c4c 87a46c3
Author: Sam Tunnicliffe 
AuthorDate: Tue Apr 27 09:26:45 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .build/build-rat.xml   | 102 +++--
 .build/build-resolver.xml  |  30 +++---
 build.xml  |  32 +++
 doc/source/_templates/indexcontent.html|  16 
 doc/source/_theme/cassandra_theme/defindex.html|  16 
 doc/source/_theme/cassandra_theme/layout.html  |  16 
 doc/source/_theme/cassandra_theme/search.html  |  16 
 .../org/apache/cassandra/stress/graph/graph.html   |  17 +++-
 8 files changed, 163 insertions(+), 82 deletions(-)

diff --cc .build/build-rat.xml
index cf8d6fc,4a6ebfc..02f8750
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@@ -1,34 -1,34 +1,28 @@@
  
  
  
 + xmlns:rat="antlib:org.apache.rat.anttasks">
  
  
  
- 
- 
- 
- 
 -
 -
 -  
 -  
 -  
 -
 +
  
  
  
@@@ -75,4 -87,18 +81,4 @@@
  
  
  
- 
 -
 -
 -  
 -
 -
 -
 -
 -  
 -
 -
 -
 -  
 -
+ 
diff --cc .build/build-resolver.xml
index 793937d,000..888f4b9
mode 100644,00..100644
--- a/.build/build-resolver.xml
+++ b/.build/build-resolver.xml
@@@ -1,264 -1,0 +1,262 @@@
 +
 +
 +
 +
 +
 +
 +
 +https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks;
 />
 +
 +
 +
 +
 +https://files.pythonhosted.org/packages; />
 +https://github.com; />
 +
 +
 +
 +https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}; 
/>
 +
 +
 +
 +
 +
 +
 +
 +Downloading Resolver ANT Tasks...
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +  
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +  
 +  
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
diff --cc build.xml
index 932c18a,a1aa1ea..566604d
--- a/build.xml
+++ b/build.xml
@@@ -1,26 -1,22 +1,24 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[marcuse]

This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f5a0c4c9628f5f2f4841e87100bccb9e23af8aba
Merge: e74d891 a68a7c5
Author: Marcus Eriksson 
AuthorDate: Tue Apr 27 08:35:19 2021 +0200

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|  1 +
 .../cassandra/db/compaction/CompactionManager.java |  6 +++
 .../apache/cassandra/cql3/GcCompactionBench.java   |  4 ++
 .../apache/cassandra/cql3/GcCompactionTest.java| 61 ++
 4 files changed, 72 insertions(+)

diff --cc CHANGES.txt
index f5331f8,bb0309f..21d3efe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,76 -1,13 +1,77 @@@
 -3.11.11
 +4.0-rc2
 + * Test org.apache.cassandra.net.AsyncPromiseTest FAILED (CASSANDRA-16596)
 +Merged from 3.11:
+  * Nodetool garbagecollect should retain SSTableLevel for LCS 
(CASSANDRA-16634)
   * Ignore stale acks received in the shadow round (CASSANDRA-16588)
 +Merged from 3.0:
 + * Fix materialized view builders inserting truncated data (CASSANDRA-16567)
 +
 +4.0-rc1
 + * Allow for setting buffer max capacity to increase it dynamically as needed 
(CASSANDRA-16524)
 + * Harden internode message resource limit accounting against serialization 
failures (CASSANDRA-16616)
 + * Add back the source release of python driver in tree to avoid fetching 
from GitHub APIs (CASSANDRA-16599)
 + * Fix false unavailable for queries due to cluster topology changes 
(CASSANDRA-16545)
 + * Fixed a race condition issue in nodetool repair where we poll for the 
error before seeing the error notification, leading to a less meaningful 
message (CASSANDRA-16585)
 + * Fix mixed cluster GROUP BY queries (CASSANDRA-16582)
 + * Upgrade jflex to 1.8.2 (CASSANDRA-16576)
 + * Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-15561)
 + * Fix Streaming Repair metrics (CASSANDRA-16190)
 + * Scheduled (delayed) schema pull tasks should not run after MIGRATION stage 
shutdown during decommission (CASSANDRA-16495)
 + * When behind a firewall trunk is not buildable, need to allow overriding 
URLs (CASSANDRA-16563)
 + * Make sure sstables with moved starts are removed correctly in 
LeveledGenerations (CASSANDRA-16552)
 + * Fix race between secondary index building and active compactions tracking 
(CASSANDRA-16554)
 + * Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks, 
removing lib/ directory from version control (CASSANDRA-16391)
 + * Fix 4.0 node sending a repair prepare message to a 3.x node breaking the 
connection (CASSANDRA-16542)
 + * Removed synchronized modifier from StreamSession#onChannelClose to prevent 
deadlocking on flush (CASSANDRA-15892)
 + * Throw IOE in AbstractType.writeValue if value has wrong fixed length 
(CASSANDRA-16500)
 + * Execute background refreshing of auth caches on a dedicated executor 
(CASSANDRA-15177)
 + * Update bundled java and python drivers to 3.11.0 and 3.25.0 respectively 
(CASSANDRA-13951)
 + * Add io.netty.tryReflectionSetAccessible=true to j11 server options in 
order to enable netty to use Unsafe direct byte buffer construction 
(CASSANDRA-16493)
 + * Make cassandra-stress -node support host:port notation (CASSANDRA-16529)
 + * Better handle legacy gossip application states during (and after) upgrades 
(CASSANDRA-16525)
 + * Mark StreamingMetrics.ActiveOutboundStreams as deprecated (CASSANDRA-11174)
 + * Increase the cqlsh version number (CASSANDRA-16509)
 + * Fix the CQL generated for the views.where_clause column when some 
identifiers require quoting (CASSANDRA-16479)
 + * Send FAILED_SESSION_MSG on shutdown and on in-progress repairs during 
startup (CASSANDRA-16425)
 + * Reinstate removed ApplicationState padding (CASSANDRA-16484)
 + * Expose data dirs to ColumnFamilyStoreMBean (CASSANDRA-16335)
 + * Add possibility to copy SSTables in SSTableImporter instead of moving them 
(CASSANDRA-16407)
 + * Fix DESCRIBE statement for CUSTOM indices with options (CASSANDRA-16482)
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes 
(CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 71f8fa043f96caf4d15260bcdc6042934e8e9c88
Merge: bd488e4 354b87a
Author: Brandon Williams 
AuthorDate: Mon Apr 26 08:47:11 2021 -0500

Merge branch 'cassandra-3.11' into trunk

 README.asc | 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] 01/01: Merge branch 'cassandra-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 3bcab600edcd8428f19b89f10d48a09f447e6715
Merge: 2c11dfc 9e1b8c0
Author: Brandon Williams 
AuthorDate: Fri Apr 23 15:08:53 2021 -0500

Merge branch 'cassandra-3.11' into trunk

 src/java/org/apache/cassandra/service/StorageService.java | 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-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 2c11dfcb5bc2dc25390a4b312911b8401d4a46e6
Merge: 3b1d7c3 d9cdf2d
Author: Andrés de la Peña 
AuthorDate: Fri Apr 23 19:39:14 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   2 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   5 +
 .../org/apache/cassandra/db/view/TableViews.java   |  11 +-
 src/java/org/apache/cassandra/db/view/View.java|   2 +-
 test/unit/org/apache/cassandra/cql3/ViewTest.java  | 321 -
 5 files changed, 209 insertions(+), 132 deletions(-)

diff --cc CHANGES.txt
index d660200,899cb79..f5331f8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,74 -1,12 +1,76 @@@
 -3.11.11
 +4.0-rc2
 + * Test org.apache.cassandra.net.AsyncPromiseTest FAILED (CASSANDRA-16596)
 +Merged from 3.11:
   * Ignore stale acks received in the shadow round (CASSANDRA-16588)
++Merged from 3.0:
++ * Fix materialized view builders inserting truncated data (CASSANDRA-16567)
 +
 +4.0-rc1
 + * Allow for setting buffer max capacity to increase it dynamically as needed 
(CASSANDRA-16524)
 + * Harden internode message resource limit accounting against serialization 
failures (CASSANDRA-16616)
 + * Add back the source release of python driver in tree to avoid fetching 
from GitHub APIs (CASSANDRA-16599)
 + * Fix false unavailable for queries due to cluster topology changes 
(CASSANDRA-16545)
 + * Fixed a race condition issue in nodetool repair where we poll for the 
error before seeing the error notification, leading to a less meaningful 
message (CASSANDRA-16585)
 + * Fix mixed cluster GROUP BY queries (CASSANDRA-16582)
 + * Upgrade jflex to 1.8.2 (CASSANDRA-16576)
 + * Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-15561)
 + * Fix Streaming Repair metrics (CASSANDRA-16190)
 + * Scheduled (delayed) schema pull tasks should not run after MIGRATION stage 
shutdown during decommission (CASSANDRA-16495)
 + * When behind a firewall trunk is not buildable, need to allow overriding 
URLs (CASSANDRA-16563)
 + * Make sure sstables with moved starts are removed correctly in 
LeveledGenerations (CASSANDRA-16552)
 + * Fix race between secondary index building and active compactions tracking 
(CASSANDRA-16554)
 + * Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks, 
removing lib/ directory from version control (CASSANDRA-16391)
 + * Fix 4.0 node sending a repair prepare message to a 3.x node breaking the 
connection (CASSANDRA-16542)
 + * Removed synchronized modifier from StreamSession#onChannelClose to prevent 
deadlocking on flush (CASSANDRA-15892)
 + * Throw IOE in AbstractType.writeValue if value has wrong fixed length 
(CASSANDRA-16500)
 + * Execute background refreshing of auth caches on a dedicated executor 
(CASSANDRA-15177)
 + * Update bundled java and python drivers to 3.11.0 and 3.25.0 respectively 
(CASSANDRA-13951)
 + * Add io.netty.tryReflectionSetAccessible=true to j11 server options in 
order to enable netty to use Unsafe direct byte buffer construction 
(CASSANDRA-16493)
 + * Make cassandra-stress -node support host:port notation (CASSANDRA-16529)
 + * Better handle legacy gossip application states during (and after) upgrades 
(CASSANDRA-16525)
 + * Mark StreamingMetrics.ActiveOutboundStreams as deprecated (CASSANDRA-11174)
 + * Increase the cqlsh version number (CASSANDRA-16509)
 + * Fix the CQL generated for the views.where_clause column when some 
identifiers require quoting (CASSANDRA-16479)
 + * Send FAILED_SESSION_MSG on shutdown and on in-progress repairs during 
startup (CASSANDRA-16425)
 + * Reinstate removed ApplicationState padding (CASSANDRA-16484)
 + * Expose data dirs to ColumnFamilyStoreMBean (CASSANDRA-16335)
 + * Add possibility to copy SSTables in SSTableImporter instead of moving them 
(CASSANDRA-16407)
 + * Fix DESCRIBE statement for CUSTOM indices with options (CASSANDRA-16482)
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes 
(CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 1ca245f5c8aaee456ee4248743e0cc29e9bd20d5
Merge: 26bf078 618b48d
Author: Mick Semb Wever 
AuthorDate: Fri Apr 23 15:22:59 2021 +0200

Merge branch 'cassandra-3.11' into trunk

 .build/build-rat.xml | 5 -
 .gitignore   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --cc .gitignore
index cd668ae,3bf7478..a634687
--- a/.gitignore
+++ b/.gitignore
@@@ -9,8 -9,7 +9,9 @@@ data
  conf/hotspot_compiler
  doc/cql3/CQL.html
  doc/build/
 +lib/
+ pylib/src/
 +!lib/cassandra-driver-internal-only-*.zip
  
  # C* debs
  build-stamp

-
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-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 31042453a74e2954882a7741d9d7293302c93e7d
Merge: 2bd07ec d1eb6d0
Author: Brandon Williams 
AuthorDate: Thu Apr 22 08:32:58 2021 -0500

Merge branch 'cassandra-3.11' into trunk

 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc CONTRIBUTING.md
index ac12fb3,ccd7c7c..9b33116
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@@ -30,9 -30,8 +30,9 @@@ Use [Cassandra JIRA](https://issues.apa
  # Useful Links
  
  - How you can contribute to Apache Cassandra 
[presentation](http://www.slideshare.net/yukim/cassandrasummit2013) by Yuki 
Morishita
- - Code style [wiki page](https://wiki.apache.org/cassandra/CodeStyle)
- - Running Cassandra in IDEA 
[guide](https://wiki.apache.org/cassandra/RunningCassandraInIDEA)
- - Running Cassandra in Eclipse 
[guide](https://wiki.apache.org/cassandra/RunningCassandraInEclipse)
+ - Code style [wiki 
page](https://cwiki.apache.org/confluence/display/CASSANDRA2/CodeStyle)
+ - Running Cassandra in IDEA 
[guide](https://cwiki.apache.org/confluence/display/CASSANDRA2/RunningCassandraInIDEA)
+ - Running Cassandra in Eclipse 
[guide](https://cwiki.apache.org/confluence/display/CASSANDRA2/RunningCassandraInEclipse)
  - Cassandra Cluster Manager - [CCM](https://github.com/pcmanus/ccm) and a 
guide [blog 
post](http://www.datastax.com/dev/blog/ccm-a-development-tool-for-creating-local-cassandra-clusters)
 -- Cassandra Distributed Tests aka 
[dtests](https://github.com/riptano/cassandra-dtest)
 +- Cassandra Distributed Tests aka 
[dtests](https://github.com/apache/cassandra-dtest)
 +- Cassandra Testing Guidelines - see TESTING.md

-
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-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 6564fe39ac556aef6d6c93e47cc955c75be2df26
Merge: 0fd8f0a f6d1951
Author: Brandon Williams 
AuthorDate: Wed Apr 21 17:27:29 2021 -0500

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|  3 +
 src/java/org/apache/cassandra/gms/Gossiper.java| 15 
 .../apache/cassandra/service/StorageService.java   |  2 +-
 .../org/apache/cassandra/gms/ShadowRoundTest.java  | 97 ++
 4 files changed, 116 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index c8434f7,443c2bf..49c1ce4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,69 -1,11 +1,72 @@@
 -3.11.11
++4.0-rc2
++Merged from 3.11:
+  * Ignore stale acks received in the shadow round (CASSANDRA-16588)
 +4.0-rc1
 + * Allow for setting buffer max capacity to increase it dynamically as needed 
(CASSANDRA-16524)
 + * Harden internode message resource limit accounting against serialization 
failures (CASSANDRA-16616)
 + * Add back the source release of python driver in tree to avoid fetching 
from GitHub APIs (CASSANDRA-16599)
 + * Fix false unavailable for queries due to cluster topology changes 
(CASSANDRA-16545)
 + * Fixed a race condition issue in nodetool repair where we poll for the 
error before seeing the error notification, leading to a less meaningful 
message (CASSANDRA-16585)
 + * Fix mixed cluster GROUP BY queries (CASSANDRA-16582)
 + * Upgrade jflex to 1.8.2 (CASSANDRA-16576)
 + * Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-15561)
 + * Fix Streaming Repair metrics (CASSANDRA-16190)
 + * Scheduled (delayed) schema pull tasks should not run after MIGRATION stage 
shutdown during decommission (CASSANDRA-16495)
 + * When behind a firewall trunk is not buildable, need to allow overriding 
URLs (CASSANDRA-16563)
 + * Make sure sstables with moved starts are removed correctly in 
LeveledGenerations (CASSANDRA-16552)
 + * Fix race between secondary index building and active compactions tracking 
(CASSANDRA-16554)
 + * Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks, 
removing lib/ directory from version control (CASSANDRA-16391)
 + * Fix 4.0 node sending a repair prepare message to a 3.x node breaking the 
connection (CASSANDRA-16542)
 + * Removed synchronized modifier from StreamSession#onChannelClose to prevent 
deadlocking on flush (CASSANDRA-15892)
 + * Throw IOE in AbstractType.writeValue if value has wrong fixed length 
(CASSANDRA-16500)
 + * Execute background refreshing of auth caches on a dedicated executor 
(CASSANDRA-15177)
 + * Update bundled java and python drivers to 3.11.0 and 3.25.0 respectively 
(CASSANDRA-13951)
 + * Add io.netty.tryReflectionSetAccessible=true to j11 server options in 
order to enable netty to use Unsafe direct byte buffer construction 
(CASSANDRA-16493)
 + * Make cassandra-stress -node support host:port notation (CASSANDRA-16529)
 + * Better handle legacy gossip application states during (and after) upgrades 
(CASSANDRA-16525)
 + * Mark StreamingMetrics.ActiveOutboundStreams as deprecated (CASSANDRA-11174)
 + * Increase the cqlsh version number (CASSANDRA-16509)
 + * Fix the CQL generated for the views.where_clause column when some 
identifiers require quoting (CASSANDRA-16479)
 + * Send FAILED_SESSION_MSG on shutdown and on in-progress repairs during 
startup (CASSANDRA-16425)
 + * Reinstate removed ApplicationState padding (CASSANDRA-16484)
 + * Expose data dirs to ColumnFamilyStoreMBean (CASSANDRA-16335)
 + * Add possibility to copy SSTables in SSTableImporter instead of moving them 
(CASSANDRA-16407)
 + * Fix DESCRIBE statement for CUSTOM indices with options (CASSANDRA-16482)
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes 
(CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are 
in use (CASSANDRA-16283)
 + * Upgrade 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 4e5bd273c640eb79c4947b22d56a68784b039c52
Merge: 6fa5300 60cf948
Author: Andrés de la Peña 
AuthorDate: Tue Apr 20 18:53:46 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .../org/apache/cassandra/gms/ShadowRoundTest.java|  6 +++---
 .../cassandra/net/MockMessagingServiceTest.java  |  6 +++---
 .../org/apache/cassandra/net/MockMessagingSpy.java   | 20 +++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --cc test/unit/org/apache/cassandra/gms/ShadowRoundTest.java
index 2bcbc50,bc18813..2198821
--- a/test/unit/org/apache/cassandra/gms/ShadowRoundTest.java
+++ b/test/unit/org/apache/cassandra/gms/ShadowRoundTest.java
@@@ -111,10 -107,10 +111,10 @@@ public class ShadowRoundTes
  }
  
  // we expect one SYN for each seed during shadow round + additional 
SYNs after gossiper has been enabled
- assertTrue(spySyn.messagesIntercepted > noOfSeeds);
+ assertTrue(spySyn.messagesIntercepted() > noOfSeeds);
  
 -// we don't expect to emit any GOSSIP_DIGEST_ACK2 or 
MIGRATION_REQUEST messages
 +// we don't expect to emit any GOSSIP_DIGEST_ACK2 or SCHEMA_PULL 
messages
- assertEquals(0, spyAck2.messagesIntercepted);
- assertEquals(0, spyMigrationReq.messagesIntercepted);
+ assertEquals(0, spyAck2.messagesIntercepted());
+ assertEquals(0, spyMigrationReq.messagesIntercepted());
  }
  }
diff --cc test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java
index e4787f7,ab97aaa..8023162
--- a/test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java
+++ b/test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java
@@@ -24,7 -25,9 +24,8 @@@ import org.junit.BeforeClass
  import org.junit.Test;
  
  import org.apache.cassandra.SchemaLoader;
+ import org.apache.cassandra.Util;
  import org.apache.cassandra.exceptions.ConfigurationException;
 -import org.apache.cassandra.gms.EchoMessage;
  import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.utils.FBUtilities;
  
@@@ -33,8 -35,7 +34,7 @@@ import static org.apache.cassandra.net.
  import static org.apache.cassandra.net.MockMessagingService.to;
  import static org.apache.cassandra.net.MockMessagingService.verb;
  import static org.junit.Assert.assertEquals;
 -import static org.junit.Assert.assertTrue;
 +import static org.junit.Assert.assertSame;
- import static org.junit.Assert.assertTrue;
  
  public class MockMessagingServiceTest
  {
@@@ -73,11 -86,11 +73,11 @@@
  });
  
  // we must have intercepted the outgoing message at this point
 -MessageOut msg = spy.captureMessageOut().get();
 +Message msg = spy.captureMessageOut().get();
- assertEquals(1, spy.messagesIntercepted);
+ assertEquals(1, spy.messagesIntercepted());
 -assertTrue(msg == echoMessageOut);
 +assertSame(echoMessage.payload, msg.payload);
  
  // and return a mocked response
- assertEquals(1, spy.mockedMessageResponses);
+ Util.spinAssertEquals(1, spy::mockedMessageResponses, 60);
  }
  }
diff --cc test/unit/org/apache/cassandra/net/MockMessagingSpy.java
index c61c301,2219c5a..2197787
--- a/test/unit/org/apache/cassandra/net/MockMessagingSpy.java
+++ b/test/unit/org/apache/cassandra/net/MockMessagingSpy.java
@@@ -41,11 -41,11 +42,11 @@@ public class MockMessagingSp
  {
  private static final Logger logger = 
LoggerFactory.getLogger(MockMessagingSpy.class);
  
- public int messagesIntercepted = 0;
- public int mockedMessageResponses = 0;
+ private final AtomicInteger messagesIntercepted = new AtomicInteger();
+ private final AtomicInteger mockedMessageResponses = new AtomicInteger();
  
 -private final BlockingQueue> interceptedMessages = new 
LinkedBlockingQueue<>();
 -private final BlockingQueue> deliveredResponses = new 
LinkedBlockingQueue<>();
 +private final BlockingQueue> interceptedMessages = new 
LinkedBlockingQueue<>();
 +private final BlockingQueue> deliveredResponses = new 
LinkedBlockingQueue<>();
  
  private static final Executor executor = 
Executors.newSingleThreadExecutor();
  
@@@ -131,16 -131,26 +132,26 @@@
  return ret;
  }
  
+ public int messagesIntercepted()
+ {
+ return messagesIntercepted.get();
+ }
+ 
+ public int mockedMessageResponses()
+ {
+ return mockedMessageResponses.get();
+ }
+ 
 -void matchingMessage(MessageOut message)
 +void matchingMessage(Message message)
  {
- messagesIntercepted++;
+ messagesIntercepted.incrementAndGet();
  logger.trace("Received matching message: {}", message);
  interceptedMessages.add(message);
  }
  
 -void matchingResponse(MessageIn response)
 +void 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7337fc0ab42a14623c96f258c1dfd19beaab54b6
Merge: dbedf57 2ec96ae
Author: Mick Semb Wever 
AuthorDate: Mon Apr 19 17:38:42 2021 +0200

Merge branch 'cassandra-3.11' into trunk

 .build/build-rat.xml  | 75 +++
 .circleci/config-2_1.yml  | 18 +++
 .circleci/config.yml  | 18 +++
 .circleci/generate.sh | 17 ++
 .circleci/readme.md   | 20 +++
 .gitignore|  5 ++
 .rat-excludes | 33 
 CONTRIBUTING.md   | 20 +++
 TESTING.md| 20 +++
 build-shaded-dtest-jar.sh | 17 ++
 build.xml | 71 +
 conf/cassandra.yaml   |  1 +
 doc/Dockerfile|  2 +-
 doc/README.md | 20 +++
 doc/SASI.md   | 20 +++
 doc/cql3/CQL.textile  | 19 +++
 doc/docker-compose.yml| 18 +++
 doc/make.bat  | 18 +++
 doc/native_protocol_v3.spec   | 17 ++
 doc/native_protocol_v4.spec   | 17 ++
 doc/native_protocol_v5.spec   | 17 ++
 doc/source/development/index.rst  |  1 +
 doc/source/development/license_compliance.rst | 37 +
 doc/source/tools/stress-example.yaml  | 18 +++
 doc/source/tools/stress-lwt-example.yaml  | 18 +++
 pylib/cqlshlib/test/test_keyspace_init.cql| 18 +++
 redhat/README.md  | 20 +++
 redhat/cassandra.in.sh| 17 ++
 redhat/cassandra.spec | 18 +++
 relocate-dependencies.pom | 20 +++
 test/data/bloom-filter/ka/foo.cql | 18 +++
 test/resources/blogpost.yaml  | 18 +++
 test/resources/byteman/mutation_limiter.btm   | 20 ++-
 test/resources/byteman/stream_failure.btm | 17 ++
 34 files changed, 599 insertions(+), 104 deletions(-)

diff --cc .build/build-rat.xml
index 000,2194686..363f6ec
mode 00,100644..100644
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@@ -1,0 -1,95 +1,75 @@@
+ 
+ 
+ 
++ xmlns:rat="antlib:org.apache.rat.anttasks">
+ 
+ 
+ 
+ 
+ 
+ 
+ 
 -
 -
 -  
 -  
 -  
 -
++
+ 
+ 
+ 
+ 
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
 -
 -
 -  
 -
 -
 -
 -
 -  
 -
 -
 -
 -  
 -
+ 
diff --cc .gitignore
index 8754b17,4353d4f..cd668ae
--- a/.gitignore
+++ b/.gitignore
@@@ -8,8 -8,7 +8,9 @@@ logs
  data/
  conf/hotspot_compiler
  doc/cql3/CQL.html
+ doc/build/
 +lib/
 +!lib/cassandra-driver-internal-only-*.zip
  
  # C* debs
  build-stamp
@@@ -72,3 -80,7 +73,7 @@@ doc/source/tools/nodetoo
  
  # Python virtual environment
  venv/
+ 
 -# build-scripts will put cassandra-builds and cassandra-dtest into the 
directory
++# build-scripts will put cassandra-builds into the directory
+ cassandra-builds/
+ cassandra-dtest/
diff --cc TESTING.md
index b6e27aa,000..0f25743
mode 100644,00..100644
--- a/TESTING.md
+++ b/TESTING.md
@@@ -1,448 -1,0 +1,468 @@@
++
++
 +The goal of this document is to establish guidelines on writing tests that 
drive incremental improvement of the test coverage and testability of 
 +Cassandra, without overly burdening day to day work. While not every point 
here will be immediately practical to implement or relevant for every 
 +contribution, it errs on the side of not making rules out of potential 
exceptions. It provides guidelines on test scope, style, and goals, as
 +well as guidelines for dealing with global state and refactoring untested 
code.
 +
 +## What to Test
 +
 +There are 3 main types of tests 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit dbedf57572fb907ae41b475f6b9b41c50c1bf3ec
Merge: 038271c 2d474c8
Author: Brandon Williams 
AuthorDate: Fri Apr 16 08:23:22 2021 -0500

Merge branch 'cassandra-3.11' into trunk


-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 65b6dfa822b0ea207787790bff5acbb5d4008348
Merge: b915688 cca5ce5
Author: Mick Semb Wever 
AuthorDate: Fri Apr 16 00:43:30 2021 +0200

Merge branch 'cassandra-3.11' into trunk

 build.xml  | 100 
 .../cassandra/OffsetAwareConfigurationLoader.java  | 105 -
 .../config/DatabaseDescriptorRefTest.java  |   1 -
 3 files changed, 61 insertions(+), 145 deletions(-)

diff --cc build.xml
index c9f09f6,b773f0f..31c1fe9
--- a/build.xml
+++ b/build.xml
@@@ -1351,12 -1359,10 +1387,11 @@@
   algorithm to limit the metaspace size and clean up SoftReferences
   more aggressively rather than waiting. See CASSANDRA-14922 for 
more details.
  -->
 -
  
 +
 +
  
  
- 
  
  
  
@@@ -1392,20 -1389,11 +1427,12 @@@
  

  
-   
- 
-   
-   
- 
-   
-   Failed to set File Separator. This shouldn't 
happen.
- 
-   
-   
-   
-   
-   
-   
+   
+   
+   
++  
+   
+   
  

  
@@@ -1427,9 -1416,9 +1454,8 @@@

  
  
 -
  
  
- 
  

  
@@@ -1479,27 -1468,6 +1503,26 @@@
  

  
 +  
 +
 +
 +  
 +  
 +
 +
 +  
 +  
 +
 +
 +
 +
 +
 +
- 
 +  
 +
 +  
 +

@@@ -1563,18 -1516,10 +1586,18 @@@
  

  
- 
- 
+ 
+ 

  
 +  
 +
 +  
 +
- 
- 
++
++
 +  
 +

  
@@@ -1831,44 -1779,25 +1853,44 @@@
  

  
- 
- 
+ 
+ 

 -




-   
-   
+   
+   

 -




-   
-   
+   
+   

 +  
 +  
 +  
 +  
-   
-   
++  
++  
 +  
 +
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
  



-
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-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7f1ef56293db52a8d8f09b52807da4e13b935ebb
Merge: edffdf6 c729318
Author: Brandon Williams 
AuthorDate: Tue Apr 13 12:03:11 2021 -0500

Merge branch 'cassandra-3.11' into trunk


-
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-3.11' into trunk

[marcuse]

This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 1d24c7cf497da3013f71f62b493ed346b8c81388
Merge: d9e5dd2 7152d40
Author: Marcus Eriksson 
AuthorDate: Tue Apr 13 10:52:21 2021 +0200

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|  1 +
 pylib/cqlshlib/cql3handling.py |  4 +++-
 pylib/cqlshlib/test/test_cqlsh_completion.py   |  8 ---
 .../apache/cassandra/schema/CompactionParams.java  | 21 +++--
 .../db/compaction/CompactionsCQLTest.java  | 26 --
 5 files changed, 52 insertions(+), 8 deletions(-)

diff --cc CHANGES.txt
index 9662d90,ca69c82..15b8dfb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,9 +1,63 @@@
 -3.11.11
 +4.0-rc1
 + * Fix mixed cluster GROUP BY queries (CASSANDRA-16582)
 + * Upgrade jflex to 1.8.2 (CASSANDRA-16576)
 + * Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-15561)
 + * Fix Streaming Repair metrics (CASSANDRA-16190)
 + * Scheduled (delayed) schema pull tasks should not run after MIGRATION stage 
shutdown during decommission (CASSANDRA-16495)
 + * When behind a firewall trunk is not buildable, need to allow overriding 
URLs (CASSANDRA-16563)
 + * Make sure sstables with moved starts are removed correctly in 
LeveledGenerations (CASSANDRA-16552)
 + * Fix race between secondary index building and active compactions tracking 
(CASSANDRA-16554)
 + * Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks, 
removing lib/ directory from version control (CASSANDRA-16391)
 + * Fix 4.0 node sending a repair prepare message to a 3.x node breaking the 
connection (CASSANDRA-16542)
 + * Removed synchronized modifier from StreamSession#onChannelClose to prevent 
deadlocking on flush (CASSANDRA-15892)
 + * Throw IOE in AbstractType.writeValue if value has wrong fixed length 
(CASSANDRA-16500)
 + * Execute background refreshing of auth caches on a dedicated executor 
(CASSANDRA-15177)
 + * Update bundled java and python drivers to 3.11.0 and 3.25.0 respectively 
(CASSANDRA-13951)
 + * Add io.netty.tryReflectionSetAccessible=true to j11 server options in 
order to enable netty to use Unsafe direct byte buffer construction 
(CASSANDRA-16493)
 + * Make cassandra-stress -node support host:port notation (CASSANDRA-16529)
 + * Better handle legacy gossip application states during (and after) upgrades 
(CASSANDRA-16525)
 + * Mark StreamingMetrics.ActiveOutboundStreams as deprecated (CASSANDRA-11174)
 + * Increase the cqlsh version number (CASSANDRA-16509)
 + * Fix the CQL generated for the views.where_clause column when some 
identifiers require quoting (CASSANDRA-16479)
 + * Send FAILED_SESSION_MSG on shutdown and on in-progress repairs during 
startup (CASSANDRA-16425)
 + * Reinstate removed ApplicationState padding (CASSANDRA-16484)
 + * Expose data dirs to ColumnFamilyStoreMBean (CASSANDRA-16335)
 + * Add possibility to copy SSTables in SSTableImporter instead of moving them 
(CASSANDRA-16407)
 + * Fix DESCRIBE statement for CUSTOM indices with options (CASSANDRA-16482)
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes 
(CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are 
in use (CASSANDRA-16283)
 + * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
 + * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[edimitrova]

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 4795e23c82b26fddf1dbfb10447aa9f7eeb26d87
Merge: 29e4612 80beb83
Author: Ekaterina Dimitrova 
AuthorDate: Thu Apr 8 18:22:41 2021 -0400

Merge branch 'cassandra-3.11' into trunk

 .circleci/config-2_1.yml | 3 +++
 .circleci/config.yml | 3 +++
 .circleci/config.yml.HIGHRES | 3 +++
 .circleci/config.yml.LOWRES  | 3 +++
 .circleci/config.yml.MIDRES  | 3 +++
 5 files changed, 15 insertions(+)

diff --cc .circleci/config.yml.HIGHRES
index fa2448c,a08f93f..27c67cb
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@@ -2358,6 -778,7 +2358,7 @@@ jobs
  git remote set-branches --add apache '$branch'
  git fetch --depth 1 apache $branch
  git checkout $branch
 -it clean -fd
++git clean -fd
  # Loop to prevent failure due to maven-ant-tasks not downloading 
a jar..
  for x in $(seq 1 3); do
  ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar 
dtest-jar
@@@ -2374,7 -795,9 +2375,9 @@@
  fi
done
# and build the dtest-jar for the branch under test
+   ${ANT_HOME}/bin/ant realclean
git checkout origin/$CIRCLE_BRANCH
 -  it clean -fd
++  git clean -fd
for x in $(seq 1 3); do
${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?"
diff --cc .circleci/config.yml.MIDRES
index fc51b2b,000..258bc3e
mode 100644,00..100644
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@@ -1,2608 -1,0 +1,2611 @@@
 +version: 2
 +jobs:
 +  j8_jvm_upgrade_dtests:
 +docker:
 +- image: 
apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
 +resource_class: large
 +working_directory: ~/
 +shell: /bin/bash -eo pipefail -l
 +parallelism: 4
 +steps:
 +- attach_workspace:
 +at: /home/cassandra
 +- run:
 +name: Determine distributed Tests to Run
 +command: |
 +  # reminder: this code (along with all the steps) is independently 
executed on every circle container
 +  # so the goal here is to get the circleci script to return the 
tests *this* container will run
 +  # which we do via the `circleci` cli tool.
 +
 +  rm -fr ~/cassandra-dtest/upgrade_tests
 +  echo "***java tests***"
 +
 +  # get all of our unit test filenames
 +  set -eo pipefail && circleci tests glob 
"$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
 +
 +  # split up the unit tests into groups based on the number of 
containers we have
 +  set -eo pipefail && circleci tests split --split-by=timings 
--timings-type=filename --index=${CIRCLE_NODE_INDEX} 
--total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > 
/tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
 +  set -eo pipefail && cat /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt | 
sed "s;^/home/cassandra/cassandra/test/distributed/;;g" | grep "Test\.java$" | 
grep upgrade > /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
 +  echo "** /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt"
 +  cat /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
 +no_output_timeout: 15m
 +- run:
 +name: Log Environment Information
 +command: |
 +  echo '*** id ***'
 +  id
 +  echo '*** cat /proc/cpuinfo ***'
 +  cat /proc/cpuinfo
 +  echo '*** free -m ***'
 +  free -m
 +  echo '*** df -m ***'
 +  df -m
 +  echo '*** ifconfig -a ***'
 +  ifconfig -a
 +  echo '*** uname -a ***'
 +  uname -a
 +  echo '*** mount ***'
 +  mount
 +  echo '*** env ***'
 +  env
 +  echo '*** java ***'
 +  which java
 +  java -version
 +- run:
 +name: Run Unit Tests (testclasslist)
 +command: |
 +  set -x
 +  export PATH=$JAVA_HOME/bin:$PATH
 +  time mv ~/cassandra /tmp
 +  cd /tmp/cassandra
 +  if [ -d ~/dtest_jars ]; then
 +cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +  fi
 +  test_timeout=$(grep 'name="test.distributed.timeout"' build.xml | 
awk -F'"' '{print $4}' || true)
 +  if [ -z "$test_timeout" ]; then
 +test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"' 
'{print $4}')
 +  fi
 +  ant testclasslist -Dtest.timeout="$test_timeout" 
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt  
-Dtest.classlistprefix=distributed -Dtest.runners=1
 +no_output_timeout: 15m
 +- store_test_results:
 +path: /tmp/cassandra/build/test/output/
 +- store_artifacts:
 +path: 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7ccb4a0e24ae758dff1174acb8368d66e4e4dc74
Merge: a1210aa 6edd7db
Author: Mick Semb Wever 
AuthorDate: Wed Apr 7 17:53:03 2021 +0200

Merge branch 'cassandra-3.11' into trunk

 doc/source/_templates/indexcontent.html | 11 +--
 doc/source/_util/cql.py |  1 -
 2 files changed, 9 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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 1a92e4a6490c0b38ef681c5a3a24309f1fea91ac
Merge: 9b32b8a 9e51339
Author: Mick Semb Wever 
AuthorDate: Sat Mar 27 00:36:28 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 doc/source/_util/cql.py  | 17 +
 ide/nbproject/update-netbeans-classpaths.sh  | 17 +
 pylib/cassandra-cqlsh-tests.sh   | 17 +
 .../cassandra/stress/report/TimingIntervals.java | 20 ++--
 4 files changed, 69 insertions(+), 2 deletions(-)

diff --cc ide/nbproject/update-netbeans-classpaths.sh
index afef864,000..929798a
mode 100755,00..100755
--- a/ide/nbproject/update-netbeans-classpaths.sh
+++ b/ide/nbproject/update-netbeans-classpaths.sh
@@@ -1,14 -1,0 +1,31 @@@
 +#!/bin/bash
 +#
++# Licensed to the Apache Software Foundation (ASF) under one
++# or more contributor license agreements.  See the NOTICE file
++# distributed with this work for additional information
++# regarding copyright ownership.  The ASF licenses this file
++# to you under the Apache License, Version 2.0 (the
++# "License"); you may not use this file except in compliance
++# with the License.  You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++#
++#
 +# Update the classpaths elements in the project.xml found in the same 
directory
 +#  Works around the lack of wildcarded classpaths in netbeans freeform 
projects
 +#   ref: https://netbeans.org/bugzilla/show_bug.cgi?id=116185
 +#
 +
 +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 +
 +cd $DIR/../..
 +CLASSPATH=`for f in lib/*.jar ; do echo -n '${project.dir}/'$f: ; done ; for 
f in build/lib/jars/*.jar ; do echo -n '${project.dir}/'$f: ; done ;`
 +
 +sed -i '' 
's/cassandra\.classpath\.jars\">.*<\/property>/cassandra\.classpath\.jars\">NEW_CLASSPATH<\/property>/'
 $DIR/project.xml
 +sed -i '' "s@NEW_CLASSPATH@"$CLASSPATH"@" $DIR/project.xml

-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 06ac9157f2c633985707ce3ab6b29607d832ebbf
Merge: dc5337b ec9b7b9
Author: Mick Semb Wever 
AuthorDate: Fri Mar 26 10:08:15 2021 +0100

Merge branch 'cassandra-3.11' into trunk


-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f8b79ce93227b14f7b6c991695f169ca4fcd3f6e
Merge: c591978 e920952
Author: Mick Semb Wever 
AuthorDate: Fri Mar 19 18:10:27 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|  1 +
 build.xml  | 46 --
 .../cassandra/distributed/test/TestLocator.java| 99 --
 3 files changed, 1 insertion(+), 145 deletions(-)

diff --cc CHANGES.txt
index b700547,f7d8209..5cc6693
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -45,13 -5,9 +45,14 @@@ Merged from 3.0
   * Refuse DROP COMPACT STORAGE if some 2.x sstables are in use 
(CASSANDRA-15897)
   * Fix ColumnFilter::toString not returning a valid CQL fragment 
(CASSANDRA-16483)
   * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades 
(CASSANDRA-16415)
 + * Update debian packaging for python3 (CASSANDRA-16396)
   * Avoid pushing schema mutations when setting up distributed system 
keyspaces locally (CASSANDRA-16387)
 + * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
 + * Improve empty hint file handling during startup (CASSANDRA-16162)
 + * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
  Merged from 2.2:
+  * Remove ant targets list-jvm-dtests and ant list-jvm-upgrade-dtests 
(CASSANDRA-16519)
   * Fix centos packaging for arm64, >=4.0 rpm's now require python3 
(CASSANDRA-16477)
   * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
  
diff --cc build.xml
index cad0044,68f7556..44af243
--- a/build.xml
+++ b/build.xml
@@@ -61,15 -64,8 +61,12 @@@
  
  
  
 +
  
  
 +
 +
 +
- 
- 
- 
  
  
  
@@@ -2106,48 -1878,6 +2103,27 @@@



 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +
-   
-   
- 
-   
-   
-   
-   
-   
-   
-   
-   
- 
- 
-   
- 
-   
- 
- 
- 
-   
- 
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
 +  
  



-
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-3.11' into trunk

[marcuse]

This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 1ca27e456d9b4bd51bc7808c162ddba4366b1cfc
Merge: 28e8632 8257868
Author: Marcus Eriksson 
AuthorDate: Thu Mar 18 09:41:29 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 .../org/apache/cassandra/hints/HintsReader.java|  26 +
 .../apache/cassandra/hints/HintsReaderTest.java| 114 ++---
 3 files changed, 124 insertions(+), 17 deletions(-)

diff --cc CHANGES.txt
index ada218a,daa7329..e6f15ff
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,7 +1,46 @@@
 -3.11.11
 +4.0-beta5
 + * Mark StreamingMetrics.ActiveOutboundStreams as deprecated (CASSANDRA-11174)
 + * Increase the cqlsh version number (CASSANDRA-16509)
 + * Fix the CQL generated for the views.where_clause column when some 
identifiers require quoting (CASSANDRA-16479)
 + * Send FAILED_SESSION_MSG on shutdown and on in-progress repairs during 
startup (CASSANDRA-16425)
 + * Reinstate removed ApplicationState padding (CASSANDRA-16484)
 + * Expose data dirs to ColumnFamilyStoreMBean (CASSANDRA-16335)
 + * Add possibility to copy SSTables in SSTableImporter instead of moving them 
(CASSANDRA-16407)
 + * Fix DESCRIBE statement for CUSTOM indices with options (CASSANDRA-16482)
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes 
(CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are 
in use (CASSANDRA-16283)
 + * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
 + * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
   * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462)
 + * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
 + * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
 + * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
  Merged from 3.0:
+  * Ignore trailing zeros in hint files (CASSANDRA-16523)
   * Refuse DROP COMPACT STORAGE if some 2.x sstables are in use 
(CASSANDRA-15897)
   * Fix ColumnFilter::toString not returning a valid CQL fragment 
(CASSANDRA-16483)
   * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades 
(CASSANDRA-16415)
diff --cc test/unit/org/apache/cassandra/hints/HintsReaderTest.java
index 871b796,84b5981..f05d4ce
--- a/test/unit/org/apache/cassandra/hints/HintsReaderTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsReaderTest.java
@@@ -31,16 -33,17 +33,19 @@@ import org.junit.BeforeClass
  import org.junit.Test;
  
  import org.apache.cassandra.SchemaLoader;
 -import org.apache.cassandra.config.CFMetaData;
 -import org.apache.cassandra.config.Schema;
  import org.apache.cassandra.db.Mutation;
  import org.apache.cassandra.db.RowUpdateBuilder;
 -import 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f1df776b764a306a60192ef1b61424d12b4d6259
Merge: d0cfd0d 16b0d1d
Author: Brandon Williams 
AuthorDate: Tue Mar 16 12:19:01 2021 -0500

Merge branch 'cassandra-3.11' into trunk

 .../unit/org/apache/cassandra/db/SSTableAndMemTableDigestMatchTest.java | 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-3.11' into trunk

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 188997026e4a4620538f8c4d519cf38cc160b7b3
Merge: 2ff4569 2a6e4df
Author: Alex Petrov 
AuthorDate: Mon Mar 15 12:45:41 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .../org/apache/cassandra/db/ColumnFamilyStore.java |  4 +-
 .../cassandra/io/sstable/format/SSTableWriter.java |  2 +-
 .../io/sstable/format/big/BigTableWriter.java  |  2 +-
 .../apache/cassandra/schema/TableMetadataRef.java  | 21 
 .../cassandra/distributed/test/AlterTest.java  | 60 ++
 5 files changed, 85 insertions(+), 4 deletions(-)

diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index bcb96a5,f4e3c1c..b9309fd
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -330,21 -378,16 +330,21 @@@ public class ColumnFamilyStore implemen
  
  public Map getCompressionParameters()
  {
- return metadata().params.compression.asMap();
 -return metadata.compressionParams().asMap();
++return metadata.getLocal().params.compression.asMap();
 +}
 +
 +public String getCompressionParametersJson()
 +{
 +return FBUtilities.json(getCompressionParameters());
  }
  
  public void setCompressionParameters(Map opts)
  {
  try
  {
 -CompressionParams newParams = CompressionParams.fromMap(opts);
 -newParams.validate();
 -metadata.setLocalCompressionParams(newParams);
 +CompressionParams params = CompressionParams.fromMap(opts);
 +params.validate();
- throw new UnsupportedOperationException(); // TODO FIXME 
CASSANDRA-12949
++
metadata.setLocalOverrides(metadata().unbuild().compression(params).build());
  }
  catch (ConfigurationException e)
  {
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java
index cce5378,83a07fd..43c50c5
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java
@@@ -84,14 -80,12 +84,14 @@@ public abstract class SSTableWriter ext
  SerializationHeader header,
  Collection observers)
  {
- super(descriptor, components(metadata.get()), metadata, 
DatabaseDescriptor.getDiskOptimizationStrategy());
 -super(descriptor, components(metadata), metadata, 
DatabaseDescriptor.getDiskOptimizationStrategy());
++super(descriptor, components(metadata.getLocal()), metadata, 
DatabaseDescriptor.getDiskOptimizationStrategy());
  this.keyCount = keyCount;
  this.repairedAt = repairedAt;
 +this.pendingRepair = pendingRepair;
 +this.isTransient = isTransient;
  this.metadataCollector = metadataCollector;
 -this.header = header != null ? header : 
SerializationHeader.makeWithoutStats(metadata); //null header indicates 
streaming from pre-3.0 sstable
 -this.rowIndexEntrySerializer = 
descriptor.version.getSSTableFormat().getIndexSerializer(metadata, 
descriptor.version, header);
 +this.header = header;
 +this.rowIndexEntrySerializer = 
descriptor.version.getSSTableFormat().getIndexSerializer(metadata.get(), 
descriptor.version, header);
  this.observers = observers == null ? Collections.emptySet() : 
observers;
  }
  
diff --cc 
src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
index 609ca60,b0d9fb1..eeb9153
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
@@@ -108,45 -104,6 +108,45 @@@ public class BigTableWriter extends SST
  columnIndexWriter = new ColumnIndex(this.header, dataFile, 
descriptor.version, this.observers, 
getRowIndexEntrySerializer().indexInfoSerializer());
  }
  
 +/**
 + * Given an OpType, determine the correct Compression Parameters
 + * @param opType
 + * @return {@link org.apache.cassandra.schema.CompressionParams}
 + */
 +private CompressionParams compressionFor(final OperationType opType)
 +{
- CompressionParams compressionParams = metadata().params.compression;
++CompressionParams compressionParams = 
metadata.getLocal().params.compression;
 +final ICompressor compressor = 
compressionParams.getSstableCompressor();
 +
 +if (null != compressor && opType == OperationType.FLUSH)
 +{
 +// When we are flushing out of the memtable throughput of the 
compressor is critical as flushes,
 +// especially of large tables, can queue up and potentially block 
writes.
 +// This optimization allows us to fall back to a faster 
compressor if 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[edimitrova]

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 c7432e98a381c16cb63692e727c35e2909d7200a
Merge: 0e990d7 b654000
Author: Ekaterina Dimitrova 
AuthorDate: Wed Mar 10 20:54:07 2021 -0500

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 build.xml  |   2 +-
 .../statements/schema/AlterTableStatement.java |  93 ++-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   4 +
 .../db/compaction/CompactionStrategyManager.java   |   5 +-
 .../org/apache/cassandra/db/lifecycle/Tracker.java |  61 +++--
 .../org/apache/cassandra/gms/ApplicationState.java |  17 ++
 .../cassandra/gms/GossipDigestAckVerbHandler.java  |   2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java|  42 ++-
 .../org/apache/cassandra/gms/VersionedValue.java   |  12 +-
 .../apache/cassandra/io/sstable/Descriptor.java|   7 +
 .../cassandra/io/sstable/format/Version.java   |   1 -
 .../io/sstable/format/VersionAndType.java  |  93 +++
 .../InitialSSTableAddedNotification.java}  |  27 +-
 src/java/org/apache/cassandra/schema/Schema.java   |   3 +-
 .../cassandra/schema/SchemaTransformation.java |   4 +-
 .../cassandra/service/SSTablesGlobalTracker.java   | 284 +
 .../SSTablesVersionsInUseChangeNotification.java   |  50 
 .../apache/cassandra/service/StartupChecks.java|   5 +-
 .../apache/cassandra/service/StorageService.java   |  19 ++
 .../upgrade/CompactStorage3to4UpgradeTest.java |   4 +
 .../validation/operations/CompactTableTest.java|   1 -
 .../apache/cassandra/db/lifecycle/TrackerTest.java |  31 ++-
 .../io/sstable/format/VersionAndTypeTest.java  |  51 
 .../service/SSTablesGlobalTrackerTest.java | 158 
 25 files changed, 899 insertions(+), 78 deletions(-)

diff --cc CHANGES.txt
index ffec3cb,1e74bf6..592c9c3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,10 +1,51 @@@
 -3.11.11
 +4.0-beta5
 + * Send FAILED_SESSION_MSG on shutdown and on in-progress repairs during 
startup (CASSANDRA-16425)
 + * Reinstate removed ApplicationState padding (CASSANDRA-16484)
 + * Expose data dirs to ColumnFamilyStoreMBean (CASSANDRA-16335)
 + * Add possibility to copy SSTables in SSTableImporter instead of moving them 
(CASSANDRA-16407)
 + * Fix DESCRIBE statement for CUSTOM indices with options (CASSANDRA-16482)
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes 
(CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are 
in use (CASSANDRA-16283)
 + * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
 + * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
   * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462)
 + * Fix digest computation for queries with fetched but non queried 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 0e990d7231f6152e95d5c21a6660594fc9a507bb
Merge: b70ae0e dc82d48
Author: Andrés de la Peña 
AuthorDate: Wed Mar 10 17:34:20 2021 +

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|  1 +
 .../org/apache/cassandra/db/AbstractReadQuery.java |  2 +-
 src/java/org/apache/cassandra/db/ReadCommand.java  |  2 +-
 .../apache/cassandra/db/filter/ColumnFilter.java   | 38 ---
 .../cassandra/db/filter/ColumnFilterTest.java  | 44 ++
 5 files changed, 72 insertions(+), 15 deletions(-)

diff --cc CHANGES.txt
index a3a03c0,b959a43..ffec3cb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,9 +1,50 @@@
 -3.11.11
 +4.0-beta5
 + * Send FAILED_SESSION_MSG on shutdown and on in-progress repairs during 
startup (CASSANDRA-16425)
 + * Reinstate removed ApplicationState padding (CASSANDRA-16484)
 + * Expose data dirs to ColumnFamilyStoreMBean (CASSANDRA-16335)
 + * Add possibility to copy SSTables in SSTableImporter instead of moving them 
(CASSANDRA-16407)
 + * Fix DESCRIBE statement for CUSTOM indices with options (CASSANDRA-16482)
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes 
(CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are 
in use (CASSANDRA-16283)
 + * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
 + * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
   * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462)
 + * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
 + * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
 + * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
  Merged from 3.0:
+  * Fix ColumnFilter::toString not returning a valid CQL fragment 
(CASSANDRA-16483)
   * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades 
(CASSANDRA-16415)
 + * Update debian packaging for python3 (CASSANDRA-16396)
   * Avoid pushing schema mutations when setting up distributed system 
keyspaces locally (CASSANDRA-16387)
 + * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
 + * Improve empty hint file handling during startup (CASSANDRA-16162)
 + * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
  Merged from 2.2:
   * Fix centos packaging for arm64, >=4.0 rpm's now require python3 
(CASSANDRA-16477)
   * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
diff --cc src/java/org/apache/cassandra/db/AbstractReadQuery.java
index c6ec329,000..ec1a6b1
mode 100644,00..100644
--- 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit b70ae0e6ac41e10b274e2af7afab1ebbdacffa83
Merge: 814af71 4a804eb
Author: Mick Semb Wever 
AuthorDate: Wed Mar 10 11:01:15 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc CHANGES.txt
index 5aa2757,3b4b8fd..a3a03c0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,86 -1,24 +1,86 @@@
 -3.11.11
 +4.0-beta5
 + * Send FAILED_SESSION_MSG on shutdown and on in-progress repairs during 
startup (CASSANDRA-16425)
 + * Reinstate removed ApplicationState padding (CASSANDRA-16484)
 + * Expose data dirs to ColumnFamilyStoreMBean (CASSANDRA-16335)
 + * Add possibility to copy SSTables in SSTableImporter instead of moving them 
(CASSANDRA-16407)
 + * Fix DESCRIBE statement for CUSTOM indices with options (CASSANDRA-16482)
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes 
(CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are 
in use (CASSANDRA-16283)
 + * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
 + * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
   * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462)
 + * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
 + * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
 + * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
  Merged from 3.0:
   * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades 
(CASSANDRA-16415)
 + * Update debian packaging for python3 (CASSANDRA-16396)
   * Avoid pushing schema mutations when setting up distributed system 
keyspaces locally (CASSANDRA-16387)
 + * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
 + * Improve empty hint file handling during startup (CASSANDRA-16162)
 + * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
  Merged from 2.2:
-  * Fix centos packaging for arm64, >=3.0 rpm's now require python3 
(CASSANDRA-16477)
+  * Fix centos packaging for arm64, >=4.0 rpm's now require python3 
(CASSANDRA-16477)
   * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
  
 -3.11.10
 - * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
 - * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
 - * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
 - * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 +4.0-beta4
 + * DROP COMPACT STORAGE should invalidate prepared stateme

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 814af71121acd478f9d2ded6166c3cdbc0cf21df
Merge: 3d539d9 ce075b3
Author: Brandon Williams 
AuthorDate: Tue Mar 9 17:23:08 2021 -0600

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 65653af2ce6a659acce149edc5eb1e1264ad3615
Merge: 9bc8d0b 67b8504
Author: Mick Semb Wever 
AuthorDate: Tue Mar 9 22:35:22 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt   |  1 +
 redhat/cassandra.spec | 10 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 2c834d2,cb66874..5aa2757
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -40,46 -4,22 +40,47 @@@ Merged from 3.0
   * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades 
(CASSANDRA-16415)
   * Update debian packaging for python3 (CASSANDRA-16396)
   * Avoid pushing schema mutations when setting up distributed system 
keyspaces locally (CASSANDRA-16387)
 + * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
 + * Improve empty hint file handling during startup (CASSANDRA-16162)
 + * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
  Merged from 2.2:
+  * Fix centos packaging for arm64, >=3.0 rpm's now require python3 
(CASSANDRA-16477)
   * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
  
 -3.11.10
 - * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
 - * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
 - * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
 - * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 +4.0-beta4
 + * DROP COMPACT STORAGE should invalidate prepared statements still using 
CompactTableMetadata (CASSANDRA-16361)
 + * Update default num_tokens to 16 and 
allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
 + * Remove use of String.intern() (CASSANDRA-15810)
 + * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort 
(CASSANDRA-16249)
 + * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254)
 + * Send back client warnings when creating too many tables/keyspaces 
(CASSANDRA-16309)
 + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
 + * Add generatetokens script for offline token allocation strategy generation 
(CASSANDRA-16205)
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 + * When a table attempts to clean up metrics, it was cleaning up all global 
table metrics (CASSANDRA-16095)
 + * Bring back the accepted encryption protocols list as configurable option 
(CASSANDRA-13325)
 + * DigestResolver.getData throws AssertionError since dataResponse is null 
(CASSANDRA-16097)
 + * Cannot replace_address /X because it doesn't exist in gossip 
(CASSANDRA-16213)
 + * cqlsh row_id resets on page boundaries (CASSANDRA-16160)
 +Merged from 3.11:
   * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
 - * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
 - * Improve empty hint file handling during startup (CASSANDRA-16162)
 - * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
 - * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
   * Extend the exclusion of replica filtering protection to other indices 
instead of just 

[cassandra] 01/01: Merge branch cassandra-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 2aa22ba99dcc1dacb07b7af31b2664e7db839063
Merge: 78b13cd e3902bc
Author: Benjamin Lerer 
AuthorDate: Mon Mar 8 11:31:12 2021 +0100

Merge branch cassandra-3.11 into trunk

 .../apache/cassandra/index/sasi/SASIIndexTest.java | 545 +++--
 1 file changed, 277 insertions(+), 268 deletions(-)

diff --cc test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
index 7619bd2,afc2e7b..3396e3d
--- a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
+++ b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
@@@ -32,19 -32,17 +32,20 @@@ import java.util.concurrent.ThreadLocal
  import java.util.concurrent.TimeUnit;
  import java.util.concurrent.atomic.AtomicInteger;
  import java.util.stream.Collectors;
++import java.util.stream.Stream;
  
  import org.apache.cassandra.SchemaLoader;
 -import org.apache.cassandra.config.CFMetaData;
 -import org.apache.cassandra.config.ColumnDefinition;
 -import org.apache.cassandra.config.Schema;
 +import org.apache.cassandra.cql3.CQLTester;
 +import org.apache.cassandra.cql3.Operator;
 +import org.apache.cassandra.cql3.QueryProcessor;
 +import org.apache.cassandra.cql3.UntypedResultSet;
  import org.apache.cassandra.index.Index;
 +import org.apache.cassandra.schema.ColumnMetadata;
 +import org.apache.cassandra.schema.Schema;
 +import org.apache.cassandra.schema.TableMetadata;
  import org.apache.cassandra.config.DatabaseDescriptor;
 -import org.apache.cassandra.cql3.*;
  import org.apache.cassandra.cql3.Term;
 -import org.apache.cassandra.cql3.statements.IndexTarget;
 -import org.apache.cassandra.cql3.statements.SelectStatement;
 +import org.apache.cassandra.cql3.statements.schema.IndexTarget;
  import org.apache.cassandra.db.*;
  import org.apache.cassandra.db.filter.ColumnFilter;
  import org.apache.cassandra.db.filter.DataLimits;
@@@ -80,16 -87,11 +83,14 @@@ import org.apache.cassandra.utils.ByteB
  import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.Pair;
  
- import com.google.common.collect.Lists;
+ import com.google.common.collect.Iterables;
 +import com.google.common.collect.Sets;
  import com.google.common.util.concurrent.Uninterruptibles;
  
- import org.junit.Assert;
- 
  import org.junit.*;
  
 +import static java.util.concurrent.TimeUnit.MILLISECONDS;
 +
  public class SASIIndexTest
  {
  private static final IPartitioner PARTITIONER;
@@@ -110,13 -114,18 +113,14 @@@
  public static void loadSchema() throws ConfigurationException
  {
  SchemaLoader.loadSchema();
 -MigrationManager.announceNewKeyspace(KeyspaceMetadata.create(KS_NAME,
 - 
KeyspaceParams.simpleTransient(1),
 - 
Tables.of(SchemaLoader.sasiCFMD(KS_NAME, CF_NAME),
 -  
 SchemaLoader.clusteringSASICFMD(KS_NAME, CLUSTERING_CF_NAME_1),
 -  
 SchemaLoader.clusteringSASICFMD(KS_NAME, CLUSTERING_CF_NAME_2, "location"),
 -  
 SchemaLoader.staticSASICFMD(KS_NAME, STATIC_CF_NAME),
 -  
 SchemaLoader.fullTextSearchSASICFMD(KS_NAME, FTS_CF_NAME;
 -Keyspace ks = Keyspace.open(KS_NAME);
 -for (ColumnFamilyStore store : ks.getColumnFamilyStores())
 -{
 -store.disableAutoCompaction();
 -}
 +SchemaLoader.createKeyspace(KS_NAME,
 +KeyspaceParams.simpleTransient(1),
 +SchemaLoader.sasiCFMD(KS_NAME, CF_NAME),
 +SchemaLoader.clusteringSASICFMD(KS_NAME, 
CLUSTERING_CF_NAME_1),
 +SchemaLoader.clusteringSASICFMD(KS_NAME, 
CLUSTERING_CF_NAME_2, "location"),
 +SchemaLoader.staticSASICFMD(KS_NAME, 
STATIC_CF_NAME),
 +
SchemaLoader.fullTextSearchSASICFMD(KS_NAME, FTS_CF_NAME));
++stores().forEach(ColumnFamilyStore::disableAutoCompaction);
  }
  
  @Before
@@@ -778,33 -784,33 +779,33 @@@
  {
  ColumnFamilyStore store = 
Keyspace.open(KS_NAME).getColumnFamilyStore(CF_NAME);
  
 -Mutation rm1 = new Mutation(KS_NAME, 
decoratedKey(AsciiType.instance.decompose("key1")));
 -rm1.add(PartitionUpdate.singleRowUpdate(store.metadata,
 +Mutation.PartitionUpdateCollector rm1 = new 
Mutation.PartitionUpdateCollector(KS_NAME, 
decoratedKey(AsciiType.instance.decompose("key1")));
 +

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 92b48a73bee9c9d52fc77ea41b29372ff35126fc
Merge: 0979bda 034a937
Author: Brandon Williams 
AuthorDate: Fri Mar 5 08:27:43 2021 -0600

Merge branch 'cassandra-3.11' into trunk

 debian/control | 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-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 995ce0ee21df790a62a8e0709c0e39aa375e5201
Merge: 2d9d178 a66246f
Author: Brandon Williams 
AuthorDate: Thu Mar 4 08:14:57 2021 -0600

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 build.xml  |   2 +-
 ...-2.9.10.4.jar => jackson-databind-2.9.10.8.jar} | Bin 1349395 -> 1350092 
bytes
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 5c7da2a,de0b083..69bf45e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -3.11.11
 +4.0-beta5
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes 
(CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are 
in use (CASSANDRA-16283)
 + * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
 + * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
+  * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462)
 + * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
 + * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
 + * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
  Merged from 3.0:
   * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades 
(CASSANDRA-16415)
   * Update debian packaging for python3 (CASSANDRA-16396)
diff --cc build.xml
index fee69a0,959dd32..36db9e5
--- a/build.xml
+++ b/build.xml
@@@ -576,13 -402,13 +576,13 @@@

  

 -  
 -  
 -  
 -  
 -  
 +  
 +  
 +  
 +  
 +  

-   
+   





-
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-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit d29dd643df6cb4bf8c9e84fe2af1ae90bc349e51
Merge: 64f54f9 0f2c9da
Author: Brandon Williams 
AuthorDate: Wed Mar 3 07:39:03 2021 -0600

Merge branch 'cassandra-3.11' into trunk

 debian/control | 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-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit d1f3d40afc5d20bab70c6200508baa3cd9409458
Merge: b063f30 0541c51
Author: Andrés de la Peña 
AuthorDate: Mon Mar 1 12:48:32 2021 +

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 .../cassandra/cql3/statements/CQL3CasRequest.java  |  27 +-
 .../org/apache/cassandra/db/SystemKeyspace.java|   4 +-
 .../apache/cassandra/db/filter/ColumnFilter.java   | 205 ---
 src/java/org/apache/cassandra/gms/Gossiper.java|  70 ++-
 .../repair/SystemDistributedKeyspace.java  |   2 +-
 .../apache/cassandra/tracing/TraceKeyspace.java|   4 +-
 .../apache/cassandra/utils/CassandraVersion.java   |  14 +
 .../cassandra/utils/ExpiringMemoizingSupplier.java |   7 +
 .../test/ReadDigestConsistencyTest.java| 146 +
 .../distributed/upgrade/MixedModeReadTest.java |  72 +--
 test/unit/org/apache/cassandra/Util.java   |  17 +
 .../operations/InsertUpdateIfConditionTest.java|  50 +-
 .../cassandra/db/filter/ColumnFilterTest.java  | 676 +
 .../org/apache/cassandra/gms/GossiperTest.java |  29 +-
 15 files changed, 885 insertions(+), 439 deletions(-)

diff --cc CHANGES.txt
index 4dfa9d9,6bd40ad..95028a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,8 +1,41 @@@
 -3.11.11
 +4.0-beta5
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are 
in use (CASSANDRA-16283)
 + * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
 + * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
 + * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
 + * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
 + * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
  Merged from 3.0:
+  * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades 
(CASSANDRA-16415)
   * Update debian packaging for python3 (CASSANDRA-16396)
   * Avoid pushing schema mutations when setting up distributed system 
keyspaces locally (CASSANDRA-16387)
 + * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
 + * Improve empty hint file handling during startup (CASSANDRA-16162)
 + * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
  Merged from 2.2:
   * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
  
diff --cc src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
index d61381d,47920a4..563a639
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
@@@ -162,26 -161,21 +162,21 @@@ public class CQL3CasRequest implements 
  }
  }
  
 -

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit e2b5c0f7ef507a57af5a4ff5478cc16c07531c88
Merge: 72ca73f a311109
Author: Mick Semb Wever 
AuthorDate: Sat Feb 27 17:07:00 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt| 1 +
 debian/compat  | 2 +-
 debian/control | 4 ++--
 debian/rules   | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --cc CHANGES.txt
index 8be989c,ba1b42c..4dfa9d9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,7 +1,40 @@@
 -3.11.11
 +4.0-beta5
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest 
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning 
(CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness 
(CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in 
gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 
(CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are 
in use (CASSANDRA-16283)
 + * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
 + * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
 + * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
 + * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
 + * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
  Merged from 3.0:
+  * Update debian packaging for python3 (CASSANDRA-16396)
   * Avoid pushing schema mutations when setting up distributed system 
keyspaces locally (CASSANDRA-16387)
 + * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
 + * Improve empty hint file handling during startup (CASSANDRA-16162)
 + * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
  Merged from 2.2:
   * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
  
diff --cc debian/control
index 13f2a45,328502e..720c1de
--- a/debian/control
+++ b/debian/control
@@@ -3,10 -3,10 +3,10 @@@ Section: mis
  Priority: extra
  Maintainer: Eric Evans 
  Uploaders: Sylvain Lebresne 
- Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.9), 
ant-optional (>= 1.9), dh-python, python-dev (>= 2.7), quilt, bash-completion
 -Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk, ant (>= 1.9), 
ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), dpatch, bash-completion
++Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk, ant (>= 1.9), 
ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), quilt, bash-completion
  Homepage: http://cassandra.apache.org
 -Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 -Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
 +Vcs-Git: https://gitbox.apache.org/repos/asf/cassandra.git
 +Vcs-Browser: https://gitbox.apache.org/repos/asf?p=cassandra.git
  Standards-Version: 3.8.3
  
  Package: cassandra


-
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-3.11' into trunk

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 20a315099753ae5220b31f07e74dd3745d02d21b
Merge: 5e2a72d 6dbf34b
Author: Alex Petrov 
AuthorDate: Thu Feb 25 14:09:10 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .../org/apache/cassandra/hints/HintMessage.java|  7 +-
 src/java/org/apache/cassandra/net/Verb.java|  2 +-
 .../cassandra/distributed/impl/Instance.java   |  4 ++
 .../distributed/test/MessageFiltersTest.java   | 57 +++
 .../apache/cassandra/hints/DTestSerializer.java| 84 ++
 5 files changed, 151 insertions(+), 3 deletions(-)

diff --cc src/java/org/apache/cassandra/hints/HintMessage.java
index 333af84,723ab6d..60adb85
--- a/src/java/org/apache/cassandra/hints/HintMessage.java
+++ b/src/java/org/apache/cassandra/hints/HintMessage.java
@@@ -19,12 -19,11 +19,12 @@@
  package org.apache.cassandra.hints;
  
  import java.io.IOException;
 +import java.nio.ByteBuffer;
  import java.util.Objects;
  import java.util.UUID;
--
  import javax.annotation.Nullable;
  
++import com.google.common.annotations.VisibleForTesting;
  import com.google.common.primitives.Ints;
  
  import org.apache.cassandra.db.TypeSizes;
@@@ -62,6 -62,6 +62,7 @@@ public final class HintMessage implemen
  
  HintMessage(UUID hostId, Hint hint)
  {
++assert hint != null;
  this.hostId = hostId;
  this.hint = hint;
  this.unknownTableID = null;
@@@ -74,72 -74,37 +75,74 @@@
  this.unknownTableID = unknownTableID;
  }
  
 -public MessageOut createMessageOut()
 -{
 -return new MessageOut<>(MessagingService.Verb.HINT, this, serializer);
 -}
 -
 -public static class Serializer implements 
IVersionedSerializer
 +public static class Serializer implements 
IVersionedAsymmetricSerializer
  {
 -public long serializedSize(HintMessage message, int version)
 +public long serializedSize(SerializableHintMessage obj, int version)
  {
 -long size = 
UUIDSerializer.serializer.serializedSize(message.hostId, version);
 +if (obj instanceof HintMessage)
 +{
 +HintMessage message = (HintMessage) obj;
- long size = 
UUIDSerializer.serializer.serializedSize(message.hostId, version);
 +
++Objects.requireNonNull(message.hint); // we should never 
*send* a HintMessage with null hint
++
++long size = 
UUIDSerializer.serializer.serializedSize(message.hostId, version);
 +long hintSize = Hint.serializer.serializedSize(message.hint, 
version);
 +size += TypeSizes.sizeofUnsignedVInt(hintSize);
 +size += hintSize;
 +
 +return size;
 +}
 +else if (obj instanceof Encoded)
 +{
 +Encoded message = (Encoded) obj;
  
 -long hintSize = Hint.serializer.serializedSize(message.hint, 
version);
 -size += TypeSizes.sizeofUnsignedVInt(hintSize);
 -size += hintSize;
 +if (version != message.version)
 +throw new IllegalArgumentException("serializedSize() 
called with non-matching version " + version);
  
 -return size;
 +long size = 
UUIDSerializer.serializer.serializedSize(message.hostId, version);
 +size += 
TypeSizes.sizeofUnsignedVInt(message.hint.remaining());
 +size += message.hint.remaining();
 +return size;
 +}
 +else
 +{
 +throw new IllegalStateException("Unexpected type: " + obj);
 +}
  }
  
 -public void serialize(HintMessage message, DataOutputPlus out, int 
version) throws IOException
 +public void serialize(SerializableHintMessage obj, DataOutputPlus 
out, int version) throws IOException
  {
 -Objects.requireNonNull(message.hint); // we should never *send* a 
HintMessage with null hint
 +if (obj instanceof HintMessage)
 +{
 +HintMessage message = (HintMessage) obj;
  
 -UUIDSerializer.serializer.serialize(message.hostId, out, version);
 +Objects.requireNonNull(message.hint); // we should never 
*send* a HintMessage with null hint
  
 -/*
 - * We are serializing the hint size so that the receiver of the 
message could gracefully handle
 - * deserialize failure when a table had been dropped, by simply 
skipping the unread bytes.
 - */
 -
out.writeUnsignedVInt(Hint.serializer.serializedSize(message.hint, version));
 +UUIDSerializer.serializer.serialize(message.hostId, out, 
version);
  
 -Hint.serializer.serialize(message.hint, out, version);
 +  

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 5e2a72d7cca2d0dcf4d415d43a2b2e32ca44c512
Merge: 23512cf 24de8e4
Author: Alex Petrov 
AuthorDate: Thu Feb 25 09:27:32 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .../org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java | 2 +-
 src/java/org/apache/cassandra/cql3/functions/UDFunction.java | 9 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --cc src/java/org/apache/cassandra/cql3/functions/UDFunction.java
index d593a6a,c06980d..b62c18f
--- a/src/java/org/apache/cassandra/cql3/functions/UDFunction.java
+++ b/src/java/org/apache/cassandra/cql3/functions/UDFunction.java
@@@ -729,16 -632,11 +729,16 @@@ public abstract class UDFunction extend
  }
  }
  
 -if (updated)
 -MigrationManager.announceNewFunction(this, true);
 +return typesDifferDeeply ? Optional.of(Difference.DEEP) : 
Optional.empty();
 +}
 +
 +@Override
 +public int hashCode()
 +{
 +return Objects.hashCode(name, Functions.typeHashCode(argTypes), 
Functions.typeHashCode(returnType), returnType, language, body);
  }
  
- static class UDFClassLoader extends ClassLoader
+ private static class UDFClassLoader extends ClassLoader
  {
  // insecureClassLoader is the C* class loader
  static final ClassLoader insecureClassLoader = 
Thread.currentThread().getContextClassLoader();


-
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-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit c8ca54a67e3bbf91d0ee1d4d522f85e17c788075
Merge: 55a651a b07a626
Author: Benjamin Lerer 
AuthorDate: Wed Feb 17 14:12:41 2021 +0100

Merge branch cassandra-3.11 into trunk

 .../apache/cassandra/distributed/test/CASTest.java | 45 ++
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --cc test/distributed/org/apache/cassandra/distributed/test/CASTest.java
index 4cefbf0,2da661d..91d26f8
--- a/test/distributed/org/apache/cassandra/distributed/test/CASTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/CASTest.java
@@@ -56,8 -52,16 +56,18 @@@ import static org.junit.Assert.assertTr
  
  public class CASTest extends TestBaseImpl
  {
 +private static final Logger logger = 
LoggerFactory.getLogger(CASTest.class);
 +
+ /**
+  * The {@code cas_contention_timeout_in_ms} used during the tests
+  */
+ private static final long CONTENTION_TIMEOUT = 1000L;
+ 
+ /**
+  * The {@code write_request_timeout_in_ms} used during the tests
+  */
+ private static final long REQUEST_TIMEOUT = 1000L;
+ 
  @Test
  public void simpleUpdate() throws Throwable
  {


-
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-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 55a651a9371eb1a3eca9f88a61a8ea339c9f7d7b
Merge: 6665fc2 24ebfdf
Author: Andrés de la Peña 
AuthorDate: Tue Feb 16 17:26:34 2021 +

Merge branch 'cassandra-3.11' into trunk

 test/unit/org/apache/cassandra/schema/MigrationCoordinatorTest.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --cc test/unit/org/apache/cassandra/schema/MigrationCoordinatorTest.java
index daba0f1,000..1695563
mode 100644,00..100644
--- a/test/unit/org/apache/cassandra/schema/MigrationCoordinatorTest.java
+++ b/test/unit/org/apache/cassandra/schema/MigrationCoordinatorTest.java
@@@ -1,319 -1,0 +1,318 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +
 +package org.apache.cassandra.schema;
 +
 +import java.net.UnknownHostException;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.HashSet;
 +import java.util.LinkedList;
 +import java.util.List;
 +import java.util.Queue;
 +import java.util.Set;
 +import java.util.UUID;
 +import java.util.concurrent.Future;
 +
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Sets;
 +import com.google.common.util.concurrent.Futures;
 +import org.junit.Assert;
 +import org.junit.Test;
 +
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.db.Mutation;
 +import org.apache.cassandra.locator.InetAddressAndPort;
 +import org.apache.cassandra.utils.concurrent.WaitQueue;
 +
 +import static com.google.common.util.concurrent.Futures.getUnchecked;
 +
 +public class MigrationCoordinatorTest
 +{
 +private static final Logger logger = 
LoggerFactory.getLogger(MigrationCoordinatorTest.class);
 +
 +private static final InetAddressAndPort EP1;
 +private static final InetAddressAndPort EP2;
 +private static final InetAddressAndPort EP3;
 +
 +private static final UUID LOCAL_VERSION = UUID.randomUUID();
 +private static final UUID V1 = UUID.randomUUID();
 +private static final UUID V2 = UUID.randomUUID();
- private static final UUID V3 = UUID.randomUUID();
 +
 +static
 +{
 +try
 +{
 +EP1 = InetAddressAndPort.getByName("10.0.0.1");
 +EP2 = InetAddressAndPort.getByName("10.0.0.2");
 +EP3 = InetAddressAndPort.getByName("10.0.0.3");
 +}
 +catch (UnknownHostException e)
 +{
 +throw new AssertionError(e);
 +}
 +
 +DatabaseDescriptor.daemonInitialization();
 +}
 +
 +private static class InstrumentedCoordinator extends MigrationCoordinator
 +{
 +
 +Queue requests = new LinkedList<>();
 +@Override
 +protected void sendMigrationMessage(MigrationCoordinator.Callback 
callback)
 +{
 +requests.add(callback);
 +}
 +
 +boolean shouldPullSchema = true;
 +@Override
 +protected boolean shouldPullSchema(UUID version)
 +{
 +return shouldPullSchema;
 +}
 +
 +boolean shouldPullFromEndpoint = true;
 +@Override
 +protected boolean shouldPullFromEndpoint(InetAddressAndPort endpoint)
 +{
 +return shouldPullFromEndpoint;
 +}
 +
 +boolean shouldPullImmediately = true;
 +@Override
 +protected boolean shouldPullImmediately(InetAddressAndPort endpoint, 
UUID version)
 +{
 +return shouldPullImmediately;
 +}
 +
 +Set deadNodes = new HashSet<>();
 +protected boolean isAlive(InetAddressAndPort endpoint)
 +{
 +return !deadNodes.contains(endpoint);
 +}
 +
 +UUID localVersion = LOCAL_VERSION;
 +@Override
 +protected boolean isLocalVersion(UUID version)
 +{
 +return localVersion.equals(version);
 +}
 +
 +int maxOutstandingRequests = 3;
 +@Override
 +protected int getMaxOutstandingVersionRequests()
 +{
 +return 

[cassandra] 01/01: Merge branch cassandra-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit e8a9d4203c81e622fc2418d2faf2593e2123161e
Merge: 7cddbd4 db6f6c9
Author: Benjamin Lerer 
AuthorDate: Mon Feb 15 14:35:56 2021 +0100

Merge branch cassandra-3.11 into trunk

 CHANGES.txt|  1 +
 .../apache/cassandra/schema/MigrationManager.java  |  7 ++-
 .../apache/cassandra/service/StorageService.java   | 13 +---
 .../distributed/impl/AbstractCluster.java  |  4 
 .../test/InternodeEncryptionEnforcementTest.java   | 24 ++
 5 files changed, 40 insertions(+), 9 deletions(-)

diff --cc CHANGES.txt
index 7b6a9f1,2387b1d..1f5cb1b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -23,47 -8,14 +23,48 @@@ Merged from 3.11
   * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
   * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
   * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
 - * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 - * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
++ * Avoid pushing schema mutations when setting up distributed system 
keyspaces locally (CASSANDRA-16387)
   * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
   * Improve empty hint file handling during startup (CASSANDRA-16162)
 - * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
   * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
 +Merged from 2.2:
 + * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
 +
 +4.0-beta4
 + * DROP COMPACT STORAGE should invalidate prepared statements still using 
CompactTableMetadata (CASSANDRA-16361)
 + * Update default num_tokens to 16 and 
allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
 + * Remove use of String.intern() (CASSANDRA-15810)
 + * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort 
(CASSANDRA-16249)
 + * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254)
 + * Send back client warnings when creating too many tables/keyspaces 
(CASSANDRA-16309)
 + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
 + * Add generatetokens script for offline token allocation strategy generation 
(CASSANDRA-16205)
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 + * When a table attempts to clean up metrics, it was cleaning up all global 
table metrics (CASSANDRA-16095)
 + * Bring back the accepted encryption protocols list as configurable option 
(CASSANDRA-13325)
 + * DigestResolver.getData throws AssertionError since dataResponse is null 
(CASSANDRA-16097)
 + * Cannot replace_address /X because it doesn't exist in gossip 
(CASSANDRA-16213)
 + * cqlsh row_id resets on page boundaries (CASSANDRA-16160)
 +Merged from 3.11:
 + * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.0:
   * Extend the exclusion of replica filtering protection to other indices 
instead of just SASI (CASSANDRA-16311)
   * Synchronize transaction logs for JBOD (CASSANDRA-16225)
   * Fix the counting of cells 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7cddbd40ce6b326df533fd6d3c4131ef70b3b068
Merge: 2121767 f258ae6
Author: Alex Petrov 
AuthorDate: Mon Feb 15 12:50:38 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .../org/apache/cassandra/db/filter/DataLimits.java | 28 ++--
 .../reads/ShortReadPartitionsProtection.java   |  2 +-
 .../service/reads/ShortReadRowsProtection.java |  2 +-
 .../cassandra/distributed/test/GroupByTest.java| 30 --
 4 files changed, 44 insertions(+), 18 deletions(-)

diff --cc 
src/java/org/apache/cassandra/service/reads/ShortReadPartitionsProtection.java
index 6c4dc68,000..51043c3
mode 100644,00..100644
--- 
a/src/java/org/apache/cassandra/service/reads/ShortReadPartitionsProtection.java
+++ 
b/src/java/org/apache/cassandra/service/reads/ShortReadPartitionsProtection.java
@@@ -1,199 -1,0 +1,199 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +
 +package org.apache.cassandra.service.reads;
 +
 +import org.apache.cassandra.locator.Endpoints;
 +import org.apache.cassandra.locator.ReplicaPlan;
 +import org.apache.cassandra.locator.ReplicaPlans;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.concurrent.Stage;
 +import org.apache.cassandra.db.ColumnFamilyStore;
 +import org.apache.cassandra.db.DataRange;
 +import org.apache.cassandra.db.DecoratedKey;
 +import org.apache.cassandra.db.Keyspace;
 +import org.apache.cassandra.db.PartitionPosition;
 +import org.apache.cassandra.db.PartitionRangeReadCommand;
 +import org.apache.cassandra.db.ReadCommand;
 +import org.apache.cassandra.db.filter.DataLimits;
 +import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator;
 +import org.apache.cassandra.db.rows.UnfilteredRowIterator;
 +import org.apache.cassandra.db.transform.MorePartitions;
 +import org.apache.cassandra.db.transform.MoreRows;
 +import org.apache.cassandra.db.transform.Transformation;
 +import org.apache.cassandra.dht.AbstractBounds;
 +import org.apache.cassandra.dht.ExcludingBounds;
 +import org.apache.cassandra.dht.Range;
 +import org.apache.cassandra.locator.Replica;
 +import org.apache.cassandra.net.MessagingService;
 +import org.apache.cassandra.service.reads.repair.NoopReadRepair;
 +import org.apache.cassandra.service.StorageProxy;
 +import org.apache.cassandra.tracing.Tracing;
 +
 +public class ShortReadPartitionsProtection extends 
Transformation implements 
MorePartitions
 +{
 +private static final Logger logger = 
LoggerFactory.getLogger(ShortReadPartitionsProtection.class);
 +private final ReadCommand command;
 +private final Replica source;
 +
 +private final Runnable preFetchCallback; // called immediately before 
fetching more contents
 +
 +private final DataLimits.Counter singleResultCounter; // unmerged 
per-source counter
 +private final DataLimits.Counter mergedResultCounter; // merged 
end-result counter
 +
 +private DecoratedKey lastPartitionKey; // key of the last observed 
partition
 +
 +private boolean partitionsFetched; // whether we've seen any new 
partitions since iteration start or last moreContents() call
 +
 +private final long queryStartNanoTime;
 +
 +public ShortReadPartitionsProtection(ReadCommand command,
 + Replica source,
 + Runnable preFetchCallback,
 + DataLimits.Counter 
singleResultCounter,
 + DataLimits.Counter 
mergedResultCounter,
 + long queryStartNanoTime)
 +{
 +this.command = command;
 +this.source = source;
 +this.preFetchCallback = preFetchCallback;
 +this.singleResultCounter = singleResultCounter;
 +this.mergedResultCounter = mergedResultCounter;
 +this.queryStartNanoTime = queryStartNanoTime;
 +}
 +
 +@Override
 +public UnfilteredRowIterator applyToPartition(UnfilteredRowIterator 
partition)
 +{
 + 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 902e05603b9658d7c1c3e9f02a39a771fee2708a
Merge: 7cb3adc 9c5b626
Author: Mick Semb Wever 
AuthorDate: Wed Feb 10 12:55:11 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .jenkins/Jenkinsfile | 36 
 1 file changed, 36 insertions(+)



-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7cb3adc3bf38221a0edf597cc7a0f08178347ff4
Merge: 637b242 aa92e88
Author: Mick Semb Wever 
AuthorDate: Mon Feb 8 12:10:01 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .jenkins/Jenkinsfile | 8 
 1 file 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] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 637b24284009c0e6c14c2817a6a673f5046dd763
Merge: b04429b b0a5a7c
Author: Mick Semb Wever 
AuthorDate: Mon Feb 8 11:28:19 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 build.xml | 20 
 doc/source/development/ci.rst | 15 +--
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --cc build.xml
index b2d0919,9e0bb73..c397019
--- a/build.xml
+++ b/build.xml
@@@ -157,105 -150,6 +157,105 @@@
  }
  
  
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +-Djdk.attach.allowAttachSelf=true
 +
 +-XX:+UseConcMarkSweepGC
 +-XX:+CMSParallelRemarkEnabled
 +-XX:SurvivorRatio=8
 +-XX:MaxTenuringThreshold=1
 +-XX:CMSInitiatingOccupancyFraction=75
 +-XX:+UseCMSInitiatingOccupancyOnly
 +-XX:CMSWaitDuration=1
 +-XX:+CMSParallelInitialMarkEnabled
 +-XX:+CMSEdenChunksRecordAlways
 +
 +--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
 +--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
 +--add-exports java.base/sun.nio.ch=ALL-UNNAMED
 +--add-exports 
java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
 +--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
 +--add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
 +--add-exports java.sql/java.sql=ALL-UNNAMED
 +
 +--add-opens java.base/java.lang.module=ALL-UNNAMED
 +--add-opens java.base/java.net=ALL-UNNAMED
 +--add-opens java.base/jdk.internal.loader=ALL-UNNAMED
 +--add-opens java.base/jdk.internal.ref=ALL-UNNAMED
 +--add-opens 
java.base/jdk.internal.reflect=ALL-UNNAMED
 +--add-opens java.base/jdk.internal.math=ALL-UNNAMED
 +--add-opens java.base/jdk.internal.module=ALL-UNNAMED
 +--add-opens 
java.base/jdk.internal.util.jar=ALL-UNNAMED
 +--add-opens 
jdk.management/com.sun.management.internal=ALL-UNNAMED
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +  
 +
 +
 +
 +-XX:-CMSClassUnloadingEnabled
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
  
@@@ -2207,6 -1969,18 +2207,18 @@@



+   
+   
+   
+   
+   
+   
+   
+   
+ 
 -  
 -  
++  
++  
+ 



diff --cc doc/source/development/ci.rst
index d7a1bb6,000..4349259
mode 100644,00..100644
--- a/doc/source/development/ci.rst
+++ b/doc/source/development/ci.rst
@@@ -1,81 -1,0 +1,84 @@@
 +.. Licensed to the Apache Software Foundation (ASF) under one
 +.. or more contributor license agreements.  See the NOTICE file
 +.. distributed with this work for additional information
 +.. regarding copyright ownership.  The ASF licenses this file
 +.. to you under the Apache License, Version 2.0 (the
 +.. "License"); you may not use this file except in compliance
 +.. with the License.  You may obtain a copy of the License at
 +..
 +.. http://www.apache.org/licenses/LICENSE-2.0
 +..
 +.. Unless required by applicable law or agreed to in writing, software
 +.. distributed under the License is distributed on an "AS IS" BASIS,
 +.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +.. See the License for the specific language governing permissions and
 +.. limitations under the License.
 +
 +Jenkins CI Environment
 +**
 +
 +About CI testing and Apache Cassandra
 +=
 +
 +Cassandra can be automatically tested using various test suites, that are 
either implemented based on JUnit or the `dtest 
`_ scripts written in Python. As 
outlined in :doc:`testing`, each kind of test suite addresses a different way 
how to test Cassandra. But in the end, all of them will be executed together on 
our CI platform at `builds.apache.org `_, running 
`Jenkins `_.
 +
 +
 +
 +Setting up your own Jenkins server
 +==
 +
 +Jenkins is an open source solution that can be installed on a large number of 
platforms. Setting up a custom Jenkins instance for Cassandra may be desirable 
for users who have hardware to spare, or organizations that want to run 
Cassandra tests for custom patches before contribution.
 +
 +Please refer to the Jenkins download and documentation pages for details on 
how to get Jenkins 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 0103e5c3a19c2840228a83194209c6ff10d74edb
Merge: 63603ed a249e6c
Author: Andrés de la Peña 
AuthorDate: Mon Feb 1 17:41:37 2021 +

Merge branch 'cassandra-3.11' into trunk

# Conflicts:
#   CHANGES.txt
#   test/unit/org/apache/cassandra/locator/TokenMetadataTest.java

 CHANGES.txt|  4 ++-
 .../apache/cassandra/locator/TokenMetadata.java| 40 ++
 .../cassandra/locator/TokenMetadataTest.java   | 24 +
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --cc CHANGES.txt
index a53af69,4e805ab..92b0e83
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,42 -10,11 +19,44 @@@ Merged from 3.11
  Merged from 3.0:
   * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
   * Improve empty hint file handling during startup (CASSANDRA-16162)
 - * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
   * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
-  * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372
++ * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
++Merged from 2.2:
++ * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
 +
 +4.0-beta4
 + * DROP COMPACT STORAGE should invalidate prepared statements still using 
CompactTableMetadata (CASSANDRA-16361)
 + * Update default num_tokens to 16 and 
allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
 + * Remove use of String.intern() (CASSANDRA-15810)
 + * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort 
(CASSANDRA-16249)
 + * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254)
 + * Send back client warnings when creating too many tables/keyspaces 
(CASSANDRA-16309)
 + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
 + * Add generatetokens script for offline token allocation strategy generation 
(CASSANDRA-16205)
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 + * When a table attempts to clean up metrics, it was cleaning up all global 
table metrics (CASSANDRA-16095)
 + * Bring back the accepted encryption protocols list as configurable option 
(CASSANDRA-13325)
 + * DigestResolver.getData throws AssertionError since dataResponse is null 
(CASSANDRA-16097)
 + * Cannot replace_address /X because it doesn't exist in gossip 
(CASSANDRA-16213)
 + * cqlsh row_id resets on page boundaries (CASSANDRA-16160)
 +Merged from 3.11:
 + * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.0:
   * Extend the exclusion of replica filtering protection to other indices 
instead of just SASI (CASSANDRA-16311)
   * Synchronize transaction logs for JBOD (CASSANDRA-16225)
   * Fix the counting of cells per partition (CASSANDRA-16259)
diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java
index 546f44e,cdd3885..1d2607f
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@@ -24,8 -25,9 +24,10 @@@ import java.util.concurrent.ConcurrentM
  import java.util.concurrent.atomic.AtomicReference;
  import java.util.concurrent.locks.ReadWriteLock;
  import java.util.concurrent.locks.ReentrantReadWriteLock;
 +import java.util.function.Supplier;
  
+ import 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 63603edbb75c2ec2f19c7db2793bfa3e0f5abc18
Merge: 33d9fda ed51d02
Author: Alex Petrov 
AuthorDate: Mon Feb 1 16:02:32 2021 +0100

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 33d9fda461434240402ed93ee5ecc74f833c63c1
Merge: cd20f88 181a496
Author: Alex Petrov 
AuthorDate: Fri Jan 29 13:47:39 2021 +0100

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[aleksey]

This is an automated email from the ASF dual-hosted git repository.

aleksey pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit cd20f882820230980107ce5737c47a78a6fc4901
Merge: 0a9e129 aa317ae
Author: Aleksey Yeshchenko 
AuthorDate: Fri Jan 29 10:55:06 2021 +

Merge branch 'cassandra-3.11' into trunk

 .../apache/cassandra/config/EncryptionOptions.java |  18 +++
 .../cassandra/net/InboundConnectionInitiator.java  |  18 +++
 .../cassandra/net/InboundMessageHandlers.java  |   8 ++
 .../test/InternodeEncryptionEnforcementTest.java   | 134 +
 4 files changed, 178 insertions(+)

diff --cc src/java/org/apache/cassandra/config/EncryptionOptions.java
index a534e36,1b1d8ce..93668d9
--- a/src/java/org/apache/cassandra/config/EncryptionOptions.java
+++ b/src/java/org/apache/cassandra/config/EncryptionOptions.java
@@@ -466,63 -54,13 +466,72 @@@ public class EncryptionOption
  all, none, dc, rack
  }
  
 -public InternodeEncryption internode_encryption = 
InternodeEncryption.none;
 +public final InternodeEncryption internode_encryption;
 +public final boolean enable_legacy_ssl_storage_port;
  
 -public boolean shouldEncrypt(InetAddress endpoint)
 +public ServerEncryptionOptions()
  {
 -IEndpointSnitch snitch = DatabaseDescriptor.getEndpointSnitch();
 -InetAddress local = FBUtilities.getBroadcastAddress();
 +this.internode_encryption = InternodeEncryption.none;
 +this.enable_legacy_ssl_storage_port = false;
 +}
 +
 +public ServerEncryptionOptions(String keystore, String 
keystore_password, String truststore,
 +   String truststore_password, 
List cipher_suites, String protocol,
 +   List accepted_protocols, 
String algorithm, String store_type,
 +   boolean require_client_auth, boolean 
require_endpoint_verification,
 +   Boolean optional, InternodeEncryption 
internode_encryption,
 +   boolean enable_legacy_ssl_storage_port)
 +{
 +super(keystore, keystore_password, truststore, 
truststore_password, cipher_suites, protocol,
 +  accepted_protocols, algorithm, store_type, 
require_client_auth, require_endpoint_verification,
 +  null, optional);
 +this.internode_encryption = internode_encryption;
 +this.enable_legacy_ssl_storage_port = 
enable_legacy_ssl_storage_port;
 +}
 +
 +public ServerEncryptionOptions(ServerEncryptionOptions options)
 +{
 +super(options);
 +this.internode_encryption = options.internode_encryption;
 +this.enable_legacy_ssl_storage_port = 
options.enable_legacy_ssl_storage_port;
 +}
 +
 +@Override
 +public EncryptionOptions applyConfig()
 +{
 +return applyConfigInternal();
 +}
  
 +private ServerEncryptionOptions applyConfigInternal()
 +{
 +super.applyConfig();
 +
 +isEnabled = this.internode_encryption != InternodeEncryption.none;
 +
 +if (this.enabled != null && this.enabled && !isEnabled)
 +{
 +logger.warn("Setting server_encryption_options.enabled has no 
effect, use internode_encryption");
 +}
 +
++if (require_client_auth && (internode_encryption == 
InternodeEncryption.rack || internode_encryption == InternodeEncryption.dc))
++{
++logger.warn("Setting require_client_auth is incompatible with 
'rack' and 'dc' internode_encryption values."
++  + " It is possible for an internode connection to 
pretend to be in the same rack/dc by spoofing"
++  + " its broadcast address in the handshake and 
bypass authentication. To ensure that mutual TLS"
++  + " authentication is not bypassed, please set 
internode_encryption to 'all'. Continuing with"
++  + " insecure configuration.");
++}
++
 +// regardless of the optional flag, if the internode encryption 
is set to rack or dc
 +// it must be optional so that unencrypted connections within the 
rack or dc can be established.
 +isOptional = super.isOptional || internode_encryption == 
InternodeEncryption.rack || internode_encryption == InternodeEncryption.dc;
 +
 +return this;
 +}
 +
 +public boolean shouldEncrypt(InetAddressAndPort endpoint)
 +{
 +IEndpointSnitch snitch = DatabaseDescriptor.getEndpointSnitch();
  switch (internode_encryption)
  {
  case none:
@@@ -543,112 -81,16 +552,121 @@@
  return true;
  }

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit b55d830b093016cf364a6e8999175e1e3665348d
Merge: 91cb934 24d133e
Author: Alex Petrov 
AuthorDate: Thu Jan 28 15:34:02 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 .../distributed/impl/AbstractCluster.java  | 24 +-
 .../cassandra/distributed/impl/Instance.java   |  6 ++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 7c94a21,c28493d..b0a6c3f
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -139,7 -128,7 +139,8 @@@ import static org.apache.cassandra.dist
  public class Instance extends IsolatedExecutor implements IInvokableInstance
  {
  public final IInstanceConfig config;
+ private volatile boolean initialized = false;
 +private final long startedAt = System.nanoTime();
  
  // should never be invoked directly, so that it is instantiated on other 
class loader;
  // only visible for inheritance
@@@ -533,9 -585,10 +534,11 @@@
  throw new RuntimeException(t);
  }
  }).run();
+ 
+ initialized = true;
  }
  
 +
  private void mkdirs()
  {
  new File(config.getString("saved_caches_directory")).mkdirs();
@@@ -694,9 -748,11 +697,12 @@@
  .thenRun(super::shutdown);
  }
  
 +@Override
  public int liveMemberCount()
  {
+ if (!initialized || isShutdown())
+ return 0;
+ 
  return sync(() -> {
  if (!DatabaseDescriptor.isDaemonInitialized() || 
!Gossiper.instance.isEnabled())
  return 0;


-
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-3.11' into trunk

[edimitrova]

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 11789e0f3cbc78d01f8d1819782030f870db5ff4
Merge: 186c731 11b0753
Author: Ekaterina Dimitrova 
AuthorDate: Tue Jan 26 16:55:23 2021 -0500

Merge branch 'cassandra-3.11' into trunk

 .../org/apache/cassandra/utils/memory/MemtableAllocator.java | 12 ++--
 1 file changed, 6 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-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 186c7316648bae39b4271223fcc1cd628669c337
Merge: f87e0ea a9ab7bd
Author: Benjamin Lerer 
AuthorDate: Mon Jan 25 11:42:13 2021 +0100

Merge branch cassandra-3.11 into trunk

 CHANGES.txt|   1 +
 .../org/apache/cassandra/db/rows/ArrayCell.java|  12 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java |  12 +-
 .../org/apache/cassandra/db/rows/BufferCell.java   |   5 +
 src/java/org/apache/cassandra/db/rows/Cell.java|   7 +
 .../cassandra/db/rows/ComplexColumnData.java   |  15 ++-
 .../org/apache/cassandra/db/rows/NativeCell.java   |   6 +
 .../db/SSTableAndMemTableDigestMatchTest.java  | 148 +
 8 files changed, 196 insertions(+), 10 deletions(-)

diff --cc CHANGES.txt
index 7f2410b,0993ba5..6827031
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,10 +1,19 @@@
 -3.11.10
 +4.0-beta5
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
+  * Fix digest computation for queries with fetched but non queried columns 
(CASSANDRA-15962)
   * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
   * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
 - * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 - * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
   * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
   * Improve empty hint file handling during startup (CASSANDRA-16162)
diff --cc src/java/org/apache/cassandra/db/rows/ArrayCell.java
index 5911e42,000..edeb65c
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/rows/ArrayCell.java
+++ b/src/java/org/apache/cassandra/db/rows/ArrayCell.java
@@@ -1,111 -1,0 +1,117 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +
 +package org.apache.cassandra.db.rows;
 +
 +import java.nio.ByteBuffer;
 +
- import org.apache.cassandra.db.ExpirationDateOverflowHandling;
 +import org.apache.cassandra.db.marshal.ByteArrayAccessor;
 +import org.apache.cassandra.db.marshal.ByteType;
 +import org.apache.cassandra.db.marshal.ValueAccessor;
 +import org.apache.cassandra.schema.ColumnMetadata;
- import org.apache.cassandra.utils.ByteArrayUtil;
 +import org.apache.cassandra.utils.ByteBufferUtil;
 +import org.apache.cassandra.utils.ObjectSizes;
 +import org.apache.cassandra.utils.memory.AbstractAllocator;
 +
++import static org.apache.cassandra.utils.ByteArrayUtil.EMPTY_BYTE_ARRAY;
++
 +public class ArrayCell extends AbstractCell
 +{
- private static final long EMPTY_SIZE = ObjectSizes.measure(new 
ArrayCell(ColumnMetadata.regularColumn("", "", "", ByteType.instance), 0L, 0, 
0, ByteArrayUtil.EMPTY_BYTE_ARRAY, null));
++private static final long EMPTY_SIZE = ObjectSizes.measure(new 
ArrayCell(ColumnMetadata.regularColumn("", "", "", ByteType.instance), 0L, 0, 
0, EMPTY_BYTE_ARRAY, null));
 +
 +private final long timestamp;
 +private final 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[marcuse]

This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 8ae2b094654aac6a2f2d8a79a1aa08a7215c8621
Merge: 7f1659c 8333d0b
Author: Marcus Eriksson 
AuthorDate: Fri Jan 22 10:56:20 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 .../PartitionKeySingleRestrictionSet.java  |   7 +-
 .../cql3/restrictions/RestrictionSet.java  |  66 +
 .../cassandra/cql3/statements/BatchStatement.java  |  48 ---
 .../cql3/statements/BatchUpdatesCollector.java |  50 +--
 .../cql3/statements/ModificationStatement.java |  17 ++-
 .../statements/SingleTableUpdatesCollector.java|  26 ++--
 .../cassandra/cql3/statements/UpdateStatement.java |   9 +-
 src/java/org/apache/cassandra/db/Mutation.java |  17 ++-
 .../test/microbench/BatchStatementBench.java   | 149 +
 10 files changed, 302 insertions(+), 88 deletions(-)

diff --cc CHANGES.txt
index cb51088,29d6b9f..a946f1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,9 +1,17 @@@
 -3.11.10
 +4.0-beta5
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native 
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers 
(CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
+  * Reduce amount of allocations during batch statement execution 
(CASSANDRA-16201)
   * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
 - * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 - * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
   * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
   * Improve empty hint file handling during startup (CASSANDRA-16162)
diff --cc src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
index 427c396,2bbda38..7a5d5b9
--- a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
@@@ -51,6 -49,8 +51,8 @@@ final class RestrictionSet implements R
  }
  };
  
 -private static final TreeMap EMPTY = 
new TreeMap<>(COLUMN_DEFINITION_COMPARATOR);
++private static final TreeMap EMPTY = 
new TreeMap<>(COLUMN_DEFINITION_COMPARATOR);
+ 
  /**
   * The restrictions per column.
   */
@@@ -61,13 -61,26 +63,26 @@@
   */
  private final boolean hasMultiColumnRestrictions;
  
+ private final boolean hasIn;
+ private final boolean hasContains;
+ private final boolean hasSlice;
+ private final boolean hasOnlyEqualityRestrictions;
+ 
  public RestrictionSet()
  {
- this(new TreeMap(COLUMN_DEFINITION_COMPARATOR), false);
+ this(EMPTY, false,
+  false,
+  false,
+  false,
+  true);
  }
  
 -private RestrictionSet(TreeMap 
restrictions,
 +private RestrictionSet(TreeMap 
restrictions,
-boolean hasMultiColumnRestrictions)
+boolean hasMultiColumnRestrictions,
+boolean hasIn,
+boolean hasContains,
+boolean hasSlice,
+boolean hasOnlyEqualityRestrictions)
  {
  this.restrictions = restrictions;
  this.hasMultiColumnRestrictions = hasMultiColumnRestrictions;
@@@ -129,14 -146,25 +148,25 @@@
  public RestrictionSet addRestriction(SingleRestriction restriction)
  {
  // RestrictionSet is immutable so we need to clone the restrictions 
map.
- TreeMap newRestrictions = new 
TreeMap<>(this.restrictions);
- return new RestrictionSet(mergeRestrictions(newRestrictions, 
restriction), hasMultiColumnRestrictions || restriction.isMultiColumn());
 -TreeMap newRestricitons = new 
TreeMap<>(this.restrictions);
++TreeMap newRestricitons = new 
TreeMap<>(this.restrictions);
+ 
+ boolean newHasIn = hasIn || 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 53357dadfbb0578f0cb6cea7fd11c88212b07817
Merge: 1b4e1cc ae58620
Author: Mick Semb Wever 
AuthorDate: Wed Jan 20 16:38:53 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt |   1 +
 lib/jflex-1.6.0.jar | Bin 1048690 -> 1048692 bytes
 2 files changed, 1 insertion(+)

diff --cc CHANGES.txt
index 3430527,75c3f73..1c63268
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,8 +1,14 @@@
 -3.11.10
 - * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
 +4.0-beta5
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
   * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 - * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.11:
++ * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
  Merged from 3.0:
   * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
   * Improve empty hint file handling during startup (CASSANDRA-16162)


-
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-3.11' into trunk

[edimitrova]

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 1b4e1cc9303414f91535dab10f6342e1c1c6b8ac
Merge: 7214794 11cb810
Author: Ekaterina Dimitrova 
AuthorDate: Tue Jan 19 17:59:23 2021 -0500

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 .../cassandra/concurrent/InfiniteLoopExecutor.java |   8 +
 .../cassandra/config/DatabaseDescriptor.java   |  14 +-
 .../org/apache/cassandra/db/ColumnFamilyStore.java | 249 -
 src/java/org/apache/cassandra/db/Memtable.java |  13 +-
 src/java/org/apache/cassandra/db/ReadCommand.java  |   2 +-
 .../apache/cassandra/utils/memory/HeapPool.java|   2 +-
 .../cassandra/utils/memory/MemtableAllocator.java  | 121 --
 .../cassandra/utils/memory/MemtableCleaner.java|  40 
 .../utils/memory/MemtableCleanerThread.java|  67 +-
 .../cassandra/utils/memory/MemtablePool.java   |  35 ++-
 .../apache/cassandra/utils/memory/NativePool.java  |   2 +-
 .../apache/cassandra/utils/memory/SlabPool.java|   2 +-
 test/unit/org/apache/cassandra/cql3/CQLTester.java |  14 +-
 .../org/apache/cassandra/db/NativeCellTest.java|  16 +-
 .../utils/memory/MemtableCleanerThreadTest.java| 187 
 .../utils/memory/NativeAllocatorTest.java  | 204 ++---
 17 files changed, 709 insertions(+), 268 deletions(-)

diff --cc CHANGES.txt
index 0d7b92b,29723d4..3430527
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,51 -1,12 +1,52 @@@
 -3.11.10
 +4.0-beta5
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
   * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 - * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.11:
  Merged from 3.0:
+  * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
   * Improve empty hint file handling during startup (CASSANDRA-16162)
 - * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
   * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372
 +
 +4.0-beta4
 + * DROP COMPACT STORAGE should invalidate prepared statements still using 
CompactTableMetadata (CASSANDRA-16361)
 + * Update default num_tokens to 16 and 
allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
 + * Remove use of String.intern() (CASSANDRA-15810)
 + * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort 
(CASSANDRA-16249)
 + * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254)
 + * Send back client warnings when creating too many tables/keyspaces 
(CASSANDRA-16309)
 + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
 + * Add generatetokens script for offline token allocation strategy generation 
(CASSANDRA-16205)
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[edimitrova]

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 9fc0b75a65dd403364c9576ccb763d3056bb8a6c
Merge: c9d2258 c1f60ae
Author: Ekaterina Dimitrova 
AuthorDate: Tue Jan 19 10:26:35 2021 -0500

Merge branch 'cassandra-3.11' into trunk

 build.xml | 1 +
 1 file changed, 1 insertion(+)



-
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-3.11' into trunk

[marcuse]

This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 4d0daf091812a37c7846efe2a1b8031592bd0207
Merge: 2355c37 228e33d
Author: Marcus Eriksson 
AuthorDate: Fri Jan 15 09:28:01 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|  1 +
 .../apache/cassandra/hints/HintsDescriptor.java| 28 +-
 .../cassandra/hints/HintsDescriptorTest.java   | 34 ++
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --cc CHANGES.txt
index a925e06,c732513..fbb1bd1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,11 +1,47 @@@
 -3.11.10
 +4.0-beta5
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
   * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 - * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.11:
  Merged from 3.0:
+  * Improve empty hint file handling during startup (CASSANDRA-16162)
 - * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
   * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372
 +
 +4.0-beta4
 + * DROP COMPACT STORAGE should invalidate prepared statements still using 
CompactTableMetadata (CASSANDRA-16361)
 + * Update default num_tokens to 16 and 
allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
 + * Remove use of String.intern() (CASSANDRA-15810)
 + * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort 
(CASSANDRA-16249)
 + * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254)
 + * Send back client warnings when creating too many tables/keyspaces 
(CASSANDRA-16309)
 + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
 + * Add generatetokens script for offline token allocation strategy generation 
(CASSANDRA-16205)
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 + * When a table attempts to clean up metrics, it was cleaning up all global 
table metrics (CASSANDRA-16095)
 + * Bring back the accepted encryption protocols list as configurable option 
(CASSANDRA-13325)
 + * DigestResolver.getData throws AssertionError since dataResponse is null 
(CASSANDRA-16097)
 + * Cannot replace_address /X because it doesn't exist in gossip 
(CASSANDRA-16213)
 + * cqlsh row_id resets on page boundaries (CASSANDRA-16160)
 +Merged from 3.11:
 + * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.0:
   * Extend the exclusion of replica filtering protection to other indices 
instead of just SASI (CASSANDRA-16311)
   * Synchronize transaction logs for JBOD (CASSANDRA-16225)
   * Fix the counting of cells per partition (CASSANDRA-16259)
diff --cc test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java
index 2d9f972,bab2356..2fad733
--- a/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsDescriptorTest.java
@@@ -24,7 -27,7 +27,6 @@@ import java.util.UUID
  
  imp

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit ff49fd92539780264b15b3e0114679841dfb8138
Merge: d2ce0ab 22a0927
Author: Brandon Williams 
AuthorDate: Tue Jan 12 13:26:35 2021 -0600

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 8 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --cc CHANGES.txt
index 7fef5a3,74eef72..a925e06
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,10 +1,46 @@@
 -3.11.10
 +4.0-beta5
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
   * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 - * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.11:
  Merged from 3.0:
 - * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
   * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
++ * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372
 +
 +4.0-beta4
 + * DROP COMPACT STORAGE should invalidate prepared statements still using 
CompactTableMetadata (CASSANDRA-16361)
 + * Update default num_tokens to 16 and 
allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
 + * Remove use of String.intern() (CASSANDRA-15810)
 + * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort 
(CASSANDRA-16249)
 + * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254)
 + * Send back client warnings when creating too many tables/keyspaces 
(CASSANDRA-16309)
 + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
 + * Add generatetokens script for offline token allocation strategy generation 
(CASSANDRA-16205)
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 + * When a table attempts to clean up metrics, it was cleaning up all global 
table metrics (CASSANDRA-16095)
 + * Bring back the accepted encryption protocols list as configurable option 
(CASSANDRA-13325)
 + * DigestResolver.getData throws AssertionError since dataResponse is null 
(CASSANDRA-16097)
 + * Cannot replace_address /X because it doesn't exist in gossip 
(CASSANDRA-16213)
 + * cqlsh row_id resets on page boundaries (CASSANDRA-16160)
 +Merged from 3.11:
 + * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.0:
   * Extend the exclusion of replica filtering protection to other indices 
instead of just SASI (CASSANDRA-16311)
   * Synchronize transaction logs for JBOD (CASSANDRA-16225)
   * Fix the counting of cells per partition (CASSANDRA-16259)
diff --cc pylib/cqlshlib/copyutil.py
index ce4d35d,e60cd6e..8958164
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -51,7 -45,7 +51,7 @@@ from six.moves.queue import Queu
  
  from cassandra import OperationTimedOut
  from cassandra.cluster import Cluster, DefaultConnection
- from cassandra.cqltypes import ReversedType, UserType, BytesType
 -from cassandra.cqltypes import ReversedType, UserType, VarcharType
++from cassandra.cqltypes import ReversedType, UserType, BytesType, VarcharType
  

[cassandra] 01/01: Merge branch cassandra-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit d2ce0ab4a343cc7cb0eae10e3e2a4f4dc51fe44a
Merge: 023eecb bae7eed
Author: Benjamin Lerer 
AuthorDate: Mon Jan 11 18:07:37 2021 +0100

Merge branch cassandra-3.11 into trunk



-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 1596c37d03d9a6be4b72b1eee357f068ef650159
Merge: 7637acc 3e24c03
Author: Mick Semb Wever 
AuthorDate: Thu Jan 7 23:58:05 2021 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   5 +-
 doc/source/cql/appendices.rst  |   9 +-
 .../cassandra/db/SinglePartitionReadCommand.java   |  35 ++-
 .../miscellaneous/SSTablesIteratedTest.java| 238 -
 .../cql3/validation/operations/UpdateTest.java |  15 +-
 5 files changed, 279 insertions(+), 23 deletions(-)

diff --cc CHANGES.txt
index 10e7a43,35129a2..46c1d13
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,9 +1,44 @@@
 -3.11.10
 +4.0-beta5
++ * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
   * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
-  * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 - * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
++Merged from 3.11:
+ Merged from 3.0:
+  * Fix skipping on pre-3.0 created compact storage sstables due to missing 
primary key liveness (CASSANDRA-16226)
 +
 +4.0-beta4
 + * DROP COMPACT STORAGE should invalidate prepared statements still using 
CompactTableMetadata (CASSANDRA-16361)
 + * Update default num_tokens to 16 and 
allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
 + * Remove use of String.intern() (CASSANDRA-15810)
 + * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort 
(CASSANDRA-16249)
 + * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254)
 + * Send back client warnings when creating too many tables/keyspaces 
(CASSANDRA-16309)
 + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
 + * Add generatetokens script for offline token allocation strategy generation 
(CASSANDRA-16205)
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 + * When a table attempts to clean up metrics, it was cleaning up all global 
table metrics (CASSANDRA-16095)
 + * Bring back the accepted encryption protocols list as configurable option 
(CASSANDRA-13325)
 + * DigestResolver.getData throws AssertionError since dataResponse is null 
(CASSANDRA-16097)
 + * Cannot replace_address /X because it doesn't exist in gossip 
(CASSANDRA-16213)
 + * cqlsh row_id resets on page boundaries (CASSANDRA-16160)
 +Merged from 3.11:
 + * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.0:
   * Extend the exclusion of replica filtering protection to other indices 
instead of just SASI (CASSANDRA-16311)
   * Synchronize transaction logs for JBOD (CASSANDRA-16225)
   * Fix the counting of cells per partition (CASSANDRA-16259)
diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index b7ff1b6,21b77e3..217f4f1
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@@ -937,27 -1043,20 +937,27 @@@ public class SinglePartitionReadComman
  boolean removeStatic = false;
  if (!columns.statics.isEmpty())
  

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[jasonstack]

This is an automated email from the ASF dual-hosted git repository.

jasonstack pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit ea52f1d2fa032dd28bbe69a1914497e48a6eb99a
Merge: b0c50c1 3ec9054
Author: Zhao Yang 
AuthorDate: Sun Dec 20 02:36:02 2020 +0800

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|  1 +
 .../cassandra/serializers/DecimalSerializer.java   |  2 +-
 .../serializers/DecimalSerializerTest.java | 51 ++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 4903e43,c9602f1..1232fe8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,6 +1,35 @@@
 -3.11.10
 +4.0-beta4
+  * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 + * DROP COMPACT STORAGE should invalidate prepared statements still using 
CompactTableMetadata (CASSANDRA-16361)
 + * Update default num_tokens to 16 and 
allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
 + * Remove use of String.intern() (CASSANDRA-15810)
 + * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort 
(CASSANDRA-16249)
 + * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254)
 + * Send back client warnings when creating too many tables/keyspaces 
(CASSANDRA-16309)
 + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
 + * Add generatetokens script for offline token allocation strategy generation 
(CASSANDRA-16205)
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 + * When a table attempts to clean up metrics, it was cleaning up all global 
table metrics (CASSANDRA-16095)
 + * Bring back the accepted encryption protocols list as configurable option 
(CASSANDRA-13325)
 + * DigestResolver.getData throws AssertionError since dataResponse is null 
(CASSANDRA-16097)
 + * Cannot replace_address /X because it doesn't exist in gossip 
(CASSANDRA-16213)
 + * cqlsh row_id resets on page boundaries (CASSANDRA-16160)
 +Merged from 3.11:
   * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
   * Extend the exclusion of replica filtering protection to other indices 
instead of just SASI (CASSANDRA-16311)


-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 6ea11f91b3ff0233f37fd725f1f1347e34a4caa8
Merge: d9859d2 921609e
Author: Mick Semb Wever 
AuthorDate: Fri Dec 18 18:14:38 2020 +0100

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit d41fe2aa8ecd9fe44fdd064f11405e44fed72d3c
Merge: 8e61e21 850157e
Author: Alex Petrov 
AuthorDate: Mon Dec 14 14:34:35 2020 +0100

Merge branch 'cassandra-3.11' into trunk

 build.xml  |   2 +-
 .../distributed/impl/AbstractCluster.java  |   9 +
 .../cassandra/distributed/impl/Instance.java   |   7 +
 .../distributed/impl/InstanceMetrics.java  | 183 +
 .../cassandra/distributed/test/MetricsTest.java|  48 ++
 5 files changed, 248 insertions(+), 1 deletion(-)

diff --cc build.xml
index d8d4bb7,c0bf626..f72f54f
--- a/build.xml
+++ b/build.xml
@@@ -586,13 -412,19 +586,13 @@@



 -  
 -
 -  
 -
 -
 -  
 -  
 -  
 -   
 -  
 -  
 +  
 +  
 +  

 +  
 +  
-   
+   


   
diff --cc 
test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
index 1ae594f,c802a10..0eea077
--- 
a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
@@@ -65,8 -63,10 +65,9 @@@ import org.apache.cassandra.distributed
  import org.apache.cassandra.distributed.api.LogAction;
  import org.apache.cassandra.distributed.api.NodeToolResult;
  import org.apache.cassandra.distributed.api.TokenSupplier;
 -import org.apache.cassandra.distributed.shared.AbstractBuilder;
  import org.apache.cassandra.distributed.shared.InstanceClassLoader;
  import org.apache.cassandra.distributed.shared.MessageFilters;
+ import org.apache.cassandra.distributed.shared.Metrics;
  import org.apache.cassandra.distributed.shared.NetworkTopology;
  import org.apache.cassandra.distributed.shared.Shared;
  import org.apache.cassandra.distributed.shared.ShutdownException;
@@@ -253,9 -225,17 +254,17 @@@ public abstract class AbstractCluster<
  if (!isShutdown && delegate != null)
  return delegate().liveMemberCount();
  
 -throw new IllegalStateException("Cannot get live member count on 
shutdown instance");
 +throw new IllegalStateException("Cannot get live member count on 
shutdown instance: " + config.num());
  }
  
+ public Metrics metrics()
+ {
+ if (isShutdown)
+ throw new IllegalStateException();
+ 
+ return delegate.metrics();
+ }
+ 
  public NodeToolResult nodetoolResult(boolean withNotifications, 
String... commandAndArgs)
  {
  return delegate().nodetoolResult(withNotifications, 
commandAndArgs);
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 8dd13d7,e43fe0c..a4163a1
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -81,6 -79,8 +81,7 @@@ import org.apache.cassandra.distributed
  import org.apache.cassandra.distributed.api.SimpleQueryResult;
  import org.apache.cassandra.distributed.mock.nodetool.InternalNodeProbe;
  import 
org.apache.cassandra.distributed.mock.nodetool.InternalNodeProbeFactory;
 -import org.apache.cassandra.distributed.shared.NetworkTopology;
+ import org.apache.cassandra.distributed.shared.Metrics;
  import org.apache.cassandra.gms.ApplicationState;
  import org.apache.cassandra.gms.Gossiper;
  import org.apache.cassandra.gms.VersionedValue;
@@@ -92,15 -91,12 +93,16 @@@ import org.apache.cassandra.io.sstable.
  import org.apache.cassandra.io.util.DataInputBuffer;
  import org.apache.cassandra.io.util.DataOutputBuffer;
  import org.apache.cassandra.io.util.FileUtils;
 +import org.apache.cassandra.locator.InetAddressAndPort;
+ import org.apache.cassandra.metrics.CassandraMetricsRegistry;
 -import org.apache.cassandra.net.IMessageSink;
 -import org.apache.cassandra.net.MessageIn;
 -import org.apache.cassandra.net.MessageOut;
 +import org.apache.cassandra.net.Message;
  import org.apache.cassandra.net.MessagingService;
 -import org.apache.cassandra.schema.LegacySchemaMigrator;
 +import org.apache.cassandra.net.NoPayload;
 +import org.apache.cassandra.net.Verb;
 +import org.apache.cassandra.schema.MigrationManager;
 +import org.apache.cassandra.schema.Schema;
 +import org.apache.cassandra.schema.SchemaConstants;
 +import org.apache.cassandra.service.ActiveRepairService;
  import org.apache.cassandra.service.CassandraDaemon;
  import org.apache.cassandra.service.ClientState;
  import org.apache.cassandra.service.DefaultFSErrorHandler;


-
To unsubscribe, e-mail: 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 8e61e216a67304482f4373fb8b53012a25404026
Merge: 1193180 ae89812
Author: Andrés de la Peña 
AuthorDate: Fri Dec 11 18:34:25 2020 +

Merge branch 'cassandra-3.11' into trunk

# Conflicts:
#   src/java/org/apache/cassandra/index/sasi/SASIIndex.java
#   src/java/org/apache/cassandra/service/DataResolver.java

 CHANGES.txt|  1 +
 src/java/org/apache/cassandra/index/Index.java | 17 +
 .../org/apache/cassandra/index/sasi/SASIIndex.java |  6 ++
 .../cassandra/service/reads/DataResolver.java  | 22 +++---
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --cc CHANGES.txt
index 520af90,a9a0cee..3b7c96d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,8 +1,29 @@@
 -3.11.10
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 +4.0-beta4
 + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
 + * Add generatetokens script for offline token allocation strategy generation 
(CASSANDRA-16205)
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 + * When a table attempts to clean up metrics, it was cleaning up all global 
table metrics (CASSANDRA-16095)
 + * Bring back the accepted encryption protocols list as configurable option 
(CASSANDRA-13325)
 + * DigestResolver.getData throws AssertionError since dataResponse is null 
(CASSANDRA-16097)
 +Merged from 3.11:
   * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
+  * Extend the exclusion of replica filtering protection to other indices 
instead of just SASI (CASSANDRA-16311)
   * Synchronize transaction logs for JBOD (CASSANDRA-16225)
   * Fix the counting of cells per partition (CASSANDRA-16259)
   * Fix serial read/non-applying CAS linearizability (CASSANDRA-12126)
diff --cc src/java/org/apache/cassandra/index/sasi/SASIIndex.java
index 592499e,5ea7cec..b1998bc
--- a/src/java/org/apache/cassandra/index/sasi/SASIIndex.java
+++ b/src/java/org/apache/cassandra/index/sasi/SASIIndex.java
@@@ -249,7 -244,13 +249,13 @@@ public class SASIIndex implements Index
  public void validate(PartitionUpdate update) throws 
InvalidRequestException
  {}
  
+ @Override
+ public boolean supportsReplicaFilteringProtection(RowFilter rowFilter)
+ {
+ return false;
+ }
+ 
 -public Indexer indexerFor(DecoratedKey key, PartitionColumns columns, int 
nowInSec, OpOrder.Group opGroup, IndexTransaction.Type transactionType)
 +public Indexer indexerFor(DecoratedKey key, RegularAndStaticColumns 
columns, int nowInSec, WriteContext context, IndexTransaction.Type 
transactionType)
  {
  return new Indexer()
  {
diff --cc src/java/org/apache/cassandra/service/reads/DataResolver.java
index eeabb4b,000..7c76336
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/service/reads/DataResolver.java
+++ b/src/java/org/apache/cassandra/service/reads/DataResolver.java
@@@ -1,404 -1,0 +1,412 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[samt]

This is an automated email from the ASF dual-hosted git repository.

samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 1193180e54668fab6729bc2a483aa0e472b77b66
Merge: 19c153a d8a317f
Author: Sam Tunnicliffe 
AuthorDate: Fri Dec 11 17:13:52 2020 +

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 19c153a4e17d57f6da97ffa1cf2021d7b45ec03a
Merge: ab9fcd7 d297c78
Author: Andrés de la Peña 
AuthorDate: Fri Dec 11 15:27:38 2020 +

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7bdecd217606ca258cb77b8231d459b8b8f438f4
Merge: d9e2ed0 80a8deb
Author: Brandon Williams 
AuthorDate: Wed Dec 2 12:15:25 2020 -0600

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java | 5 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index ce649c8,fb9921b..7458801
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,8 +1,24 @@@
 -3.11.10
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 +4.0-beta4
 + * Remove Windows scripts (CASSANDRA-16171)
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 +Merged from 3.11:
   * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
+  * Synchronize transaction logs for JBOD (CASSANDRA-16225)
   * Fix the counting of cells per partition (CASSANDRA-16259)
   * Fix serial read/non-applying CAS linearizability (CASSANDRA-12126)
   * Avoid potential NPE in JVMStabilityInspector (CASSANDRA-16294)


-
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-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 39d297437983003b8886a3b711ed7f25ea6777f4
Merge: 90b2f3e e94459c
Author: Benjamin Lerer 
AuthorDate: Wed Dec 2 14:47:18 2020 +0100

Merge branch cassandra-3.11 into trunk

 CHANGES.txt|   3 +
 .../cassandra/db/transform/BaseIterator.java   |  29 -
 .../org/apache/cassandra/metrics/TableMetrics.java |  50 -
 .../cassandra/db/ColumnFamilyMetricTest.java   | 124 ++---
 4 files changed, 157 insertions(+), 49 deletions(-)

diff --cc CHANGES.txt
index 6e96738,5020f99..a51d471
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,20 +1,61 @@@
 -3.11.10
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 +4.0-beta4
 + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
 + * Optimised repair streaming improvements (CASSANDRA-16274)
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 +Merged from 3.11:
   * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
+  * Fix the counting of cells per partition (CASSANDRA-16259)
   * Fix serial read/non-applying CAS linearizability (CASSANDRA-12126)
   * Avoid potential NPE in JVMStabilityInspector (CASSANDRA-16294)
   * Improved check of num_tokens against the length of initial_token 
(CASSANDRA-14477)
   * Fix a race condition on ColumnFamilyStore and TableMetrics 
(CASSANDRA-16228)
   * Remove the SEPExecutor blocking behavior (CASSANDRA-16186)
 - * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
 + * Wait for schema agreement when bootstrapping (CASSANDRA-15158)
   * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
 + * Raise Dynamic Snitch Default Badness Threshold to 1.0 (CASSANDRA-16285)
+ Merged from 2.2:
+  * Fix the histogram merge of the table metrics (CASSANDRA-16259)
  
 -3.11.9
 - * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
 +4.0-beta3
 + * Segregate Network and Chunk Cache BufferPools and Recirculate Partially 
Freed Chunks (CASSANDRA-15229)
 + * Fail truncation requests when they fail on a replica (CASSANDRA-16208)
 + * Move compact storage validation earlier in startup process 
(CASSANDRA-16063)
 + * Fix ByteBufferAccessor cast exceptions are thrown when trying to query a 
virtual table (CASSANDRA-16155)
 + * Consolidate node liveness check for forced repair (CASSANDRA-16113)
 + * Use unsigned short in ValueAccessor.sliceWithShortLength (CASSANDRA-16147)
 + * Abort repairs when getting a truncation request (CASSANDRA-15854)
 + * Remove bad assert when getting active compactions for an sstable 
(CASSANDRA-15457)
 + * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Prevent NPE in StreamMessage in type lookup (CASSANDRA-16131)
 + * Avoid invalid state transition exception during incremental repair 
(CASSANDRA-16067)
 + * Allow zero padding in timestamp serialization (CASSANDRA-16105)
 + * Add byte array backed cells (CASSANDRA-15393)
 + * Correctly handle pending ranges with adjacent range movements 
(CASSANDRA-14801)
 + * Avoid adding locahost when streaming trivial ranges (CASSANDRA-16099)
 + * Add nodetool getfullquerylog (CASSANDRA-15988)
 + * Fix yaml format and alignment in tpstats (CASSANDRA-11402)
 + * Avoid trying to keep track of RTs for endpoints we won't write to during 
read repair (CASSANDRA-16084)
 + * When compaction gets interrupted, the exception should include the 
compactionId (CASSANDRA-15954)
 + * Make Table/Keyspace Metric Names Consistent With Each Other 
(CASSANDRA-15909)
 + * Mutating 

[cassandra] 01/01: Merge branch cassandra-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 3757a7327bbeb9fb6591532547aeeb4d4c62dcc4
Merge: b470487 a7f50c9
Author: Benjamin Lerer 
AuthorDate: Mon Nov 30 11:57:53 2020 +0100

Merge branch cassandra-3.11 into trunk



-
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-3.11' into trunk

[samt]

This is an automated email from the ASF dual-hosted git repository.

samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit c5021801a6018a7d14f94b6d946ddfaafc2066af
Merge: caeecf6 7ffb2fe
Author: Sam Tunnicliffe 
AuthorDate: Mon Nov 23 15:32:33 2020 +

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/utils/JVMStabilityInspector.java   | 2 +-
 .../org/apache/cassandra/utils/JVMStabilityInspectorTest.java| 9 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 44c9787,dd554c2..92094dc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,8 +1,21 @@@
 -3.11.10
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 +4.0-beta4
 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
 + * 'SSLEngine closed already' exception on failed outbound connection 
(CASSANDRA-16277)
 + * Drain and/or shutdown might throw because of slow messaging service 
shutdown (CASSANDRA-16276)
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
 +Merged from 3.11:
   * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
+  * Avoid potential NPE in JVMStabilityInspector (CASSANDRA-16294)
   * Improved check of num_tokens against the length of initial_token 
(CASSANDRA-14477)
   * Fix a race condition on ColumnFamilyStore and TableMetrics 
(CASSANDRA-16228)
   * Remove the SEPExecutor blocking behavior (CASSANDRA-16186)


-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit fa24ec0f18238c41e0efed50aceece6248ec6e36
Merge: 0bb1c51 fc9a5a7
Author: Mick Semb Wever 
AuthorDate: Fri Nov 20 09:53:08 2020 +0100

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit fcf293a61a642281c8a4efe57ed08a55199fa515
Merge: 872751a ad9b715
Author: Mick Semb Wever 
AuthorDate: Wed Nov 18 13:27:03 2020 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt  |  1 +
 NEWS.txt | 12 
 src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java |  8 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 69ccf55,e16f3e5..29100fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -3.11.10
 +4.0-beta4
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 +Merged from 3.11:
+  * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
  Merged from 3.0:
   * Improved check of num_tokens against the length of initial_token 
(CASSANDRA-14477)
   * Fix a race condition on ColumnFamilyStore and TableMetrics 
(CASSANDRA-16228)
diff --cc NEWS.txt
index 99c8af4,3af2150..498fbbb
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -259,27 -49,29 +259,39 @@@ Upgradin
  - In cassandra.yaml, when using vnodes num_tokens must be defined if 
initial_token is defined.
If it is not defined, or not equal to the numbers of tokens defined in 
initial_tokens,
the node will not start. See CASSANDRA-14477 for details.
 -- SASI's `max_compaction_flush_memory_in_mb` setting was previously 
getting interpreted in bytes. From 3.11.8
 -  it is correctly interpreted in megabytes, but prior to 3.11.10 previous 
configurations of this setting will
 -  lead to nodes OOM during compaction. From 3.11.10 previous 
configurations will be detected as incorrect,
 -  logged, and the setting reverted to the default value of 1GB. It is up 
to the user to correct the setting
 -  after an upgrade, via dropping and recreating the index. See 
CASSANDRA-16071 for details.
  
 -3.11.9
 -==
 -Upgrading
 --
 -   - Custom compaction strategies must handle getting sstables added/removed 
notifications for
 - sstables already added/removed - see CASSANDRA-14103 for details. This 
has been a requirement
 - for correct operation since 3.11.0 due to an issue in 
CompactionStrategyManager.
  
 -3.11.7
 +Deprecation
 +---
 +
 +- The JMX MBean org.apache.cassandra.db:type=BlacklistedDirectories has 
been
 +  deprecated in favor of 
org.apache.cassandra.db:type=DisallowedDirectories
 +  and will be removed in a subsequent major version.
 +
 +
 +Materialized Views
 +---
 +- Following a discussion regarding concerns about the design and safety 
of Materialized Views, the C* development
 +  community no longer recommends them for production use, and considers 
them experimental. Warnings messages will
 +  now be logged when they are created. (See 
https://www.mail-archive.com/dev@cassandra.apache.org/msg11511.html)
 +- An 'enable_materialized_views' flag has been added to cassandra.yaml to 
allow operators to prevent creation of
 +  views
 +- CREATE MATERIALIZED VIEW syntax has become stricter. Partition key 
columns are no longer implicitly considered
 +  to be NOT NULL, and no base primary key columns get automatically 
included in view definition. You have to
 +  specify them explicitly now.
 +
++3.11.10
+ ==
+ 
+ Upgrading
+ -
 -- Nothing specific to this release, but please see previous upgrading 
sections,
 -  especially if you are upgrading from 3.0.
++- SASI's `max_compaction_flush_memory_in_mb` setting was previously 
getting interpreted in bytes. From 3.11.8
++  it is correctly interpreted in megabytes, but prior to 3.11.10 previous 
configurations of this setting will
++  lead to nodes OOM during compaction. From 3.11.10 previous 
configurations will be detected as incorrect,
++  logged, and the setting reverted to the default value of 1GB. It is up 
to the user to 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 8bcd6ab9bb94d150527ff185caa3d7402c4d9159
Merge: 1122fcf e8c1af2
Author: Mick Semb Wever 
AuthorDate: Wed Nov 18 13:02:46 2020 +0100

Merge branch 'cassandra-3.11' into trunk

 NEWS.txt   |  2 +-
 .../cassandra/config/DatabaseDescriptor.java   |  5 -
 .../cassandra/config/DatabaseDescriptorTest.java   | 25 --
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --cc NEWS.txt
index cf33df9,99d589d..99c8af4
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -33,230 -42,11 +33,230 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 -3.11.10
 -=
 +4.0
 +===
 +
 +New features
 +
 +- Nodes will now bootstrap all intra-cluster connections at startup by 
default and wait
 +  10 seconds for the all but one node in the local data center to be 
connected and marked
 +  UP in gossip. This prevents nodes from coordinating requests and 
failing because they
 +  aren't able to connect to the cluster fast enough. 
block_for_peers_timeout_in_secs in
 +  cassandra.yaml can be used to configure how long to wait (or whether to 
wait at all)
 +  and block_for_peers_in_remote_dcs can be used to also block on all but 
one node in
 +  each remote DC as well. See CASSANDRA-14297 and CASSANDRA-13993 for 
more information.
 +- *Experimental* support for Transient Replication and Cheap Quorums 
introduced by CASSANDRA-14404
 +  The intended audience for this functionality is expert users of 
Cassandra who are prepared
 +  to validate every aspect of the database for their application and 
deployment practices. Future
 +  releases of Cassandra will make this feature suitable for a wider 
audience.
 +- *Experimental* support for Java 11 has been added. JVM options that 
differ between or are
 +  specific for Java 8 and 11 have been moved from jvm.options into 
jvm8.options and jvm11.options.
 +  IMPORTANT: Running C* on Java 11 is *experimental* and do it at your 
own risk.
 +- LCS now respects the max_threshold parameter when compacting - this was 
hard coded to 32
 +  before, but now it is possible to do bigger compactions when compacting 
from L0 to L1.
 +  This also applies to STCS-compactions in L0 - if there are more than 32 
sstables in L0
 +  we will compact at most max_threshold sstables in an L0 STCS 
compaction. See CASSANDRA-14388
 +  for more information.
 +- There is now an option to automatically upgrade sstables after 
Cassandra upgrade, enable
 +  either in `cassandra.yaml:automatic_sstable_upgrade` or via JMX during 
runtime. See
 +  CASSANDRA-14197.
 +- `nodetool refresh` has been deprecated in favour of `nodetool import` - 
see CASSANDRA-6719
 +  for details
 +- An experimental option to compare all merkle trees together has been 
added - for example, in
 +  a 3 node cluster with 2 replicas identical and 1 out-of-date, with this 
option enabled, the
 +  out-of-date replica will only stream a single copy from up-to-date 
replica. Enable it by adding
 +  "-os" to nodetool repair. See CASSANDRA-3200.
 +- The currentTimestamp, currentDate, currentTime and currentTimeUUID 
functions have been added.
 +  See CASSANDRA-13132
 +- Support for arithmetic operations between `timestamp`/`date` and 
`duration` has been added.
 +  See CASSANDRA-11936
 +- Support for arithmetic operations on number has been added. See 
CASSANDRA-11935
 +- Preview expected streaming required for a repair (nodetool repair 
--preview), and validate the
 +  consistency of repaired data between nodes (nodetool repair 
--validate). See CASSANDRA-13257
 +- Support for selecting Map values and Set elements has been added for 
SELECT queries. See CASSANDRA-7396
 +- Change-Data-Capture has been modified to make CommitLogSegments 
available
 +  immediately upon creation via hard-linking the files. This means that 
incomplete
 +  segments will be available in cdc_raw rather than fully flushed. See 
documentation
 +  and CASSANDRA-12148 for more detail.
 +- The initial build of materialized views can be parallelized. The number 
of concurrent builder
 +  threads is specified by the property 
`cassandra.yaml:concurrent_materialized_view_builders`.
 +  This property can be modified at runtime through both JMX and the new 
`setconcurrentviewbuilders`
 +  and `getconcurrentviewbuilders` nodetool commands. See CASSANDRA-12245 
for more details.
 +- There is now a binary full query log based on Chronicle Queue that can 
be controlled using
 +  nodetool enablefullquerylog, disablefullquerylog, and 
resetfullquerylog. The log
 + 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 1122fcfeaa127de40a3ff4dbfd0e74a4e8783d52
Merge: a04ccf3 d9e1af8
Author: Mick Semb Wever 
AuthorDate: Tue Nov 17 22:46:04 2020 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|  1 +
 NEWS.txt   |  3 +
 src/java/org/apache/cassandra/config/Config.java   |  2 +-
 .../cassandra/config/DatabaseDescriptor.java   | 27 ++--
 .../config/DatabaseDescriptorRefTest.java  |  2 +-
 .../cassandra/config/DatabaseDescriptorTest.java   | 78 ++
 6 files changed, 107 insertions(+), 6 deletions(-)

diff --cc CHANGES.txt
index 83b8a61,80b1532..69ccf55
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,47 -1,13 +1,48 @@@
 -3.11.10
 +4.0-beta4
 + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems 
(CASSANDRA-16212)
 + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 +Merged from 3.11:
  Merged from 3.0:
+  * Improved check of num_tokens against the length of initial_token 
(CASSANDRA-14477)
   * Fix a race condition on ColumnFamilyStore and TableMetrics 
(CASSANDRA-16228)
   * Remove the SEPExecutor blocking behavior (CASSANDRA-16186)
 - * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
 + * Wait for schema agreement when bootstrapping (CASSANDRA-15158)
   * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
  
 -3.11.9
 - * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
 +4.0-beta3
 + * Segregate Network and Chunk Cache BufferPools and Recirculate Partially 
Freed Chunks (CASSANDRA-15229)
 + * Fail truncation requests when they fail on a replica (CASSANDRA-16208)
 + * Move compact storage validation earlier in startup process 
(CASSANDRA-16063)
 + * Fix ByteBufferAccessor cast exceptions are thrown when trying to query a 
virtual table (CASSANDRA-16155)
 + * Consolidate node liveness check for forced repair (CASSANDRA-16113)
 + * Use unsigned short in ValueAccessor.sliceWithShortLength (CASSANDRA-16147)
 + * Abort repairs when getting a truncation request (CASSANDRA-15854)
 + * Remove bad assert when getting active compactions for an sstable 
(CASSANDRA-15457)
 + * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Prevent NPE in StreamMessage in type lookup (CASSANDRA-16131)
 + * Avoid invalid state transition exception during incremental repair 
(CASSANDRA-16067)
 + * Allow zero padding in timestamp serialization (CASSANDRA-16105)
 + * Add byte array backed cells (CASSANDRA-15393)
 + * Correctly handle pending ranges with adjacent range movements 
(CASSANDRA-14801)
 + * Avoid adding locahost when streaming trivial ranges (CASSANDRA-16099)
 + * Add nodetool getfullquerylog (CASSANDRA-15988)
 + * Fix yaml format and alignment in tpstats (CASSANDRA-11402)
 + * Avoid trying to keep track of RTs for endpoints we won't write to during 
read repair (CASSANDRA-16084)
 + * When compaction gets interrupted, the exception should include the 
compactionId (CASSANDRA-15954)
 + * Make Table/Keyspace Metric Names Consistent With Each Other 
(CASSANDRA-15909)
 + * Mutating sstable component may race with entire-sstable-streaming(ZCS) 
causing checksum validation failure (CASSANDRA-15861)
 + * NPE thrown while updating speculative execution time if keyspace is 
removed during task execution (CASSANDRA-15949)
 + * Show the progress of data streaming and index build (CASSANDRA-15406)
 + * Add flag to disable chunk cache and disable by default (CASSANDRA-16036)
 + * Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix 
(CASSANDRA-16150)
 +Merged from 3.11:
   * Fix ColumnFilter to avoid querying cells of unselected complex columns 
(CASSANDRA-15977)
   * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
   * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
diff --cc NEWS.txt
index de472c4,d16bcce..cf33df9
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -33,249 -42,29 +33,252 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[dcapwell]

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit e4fac3582e0a9dda182313a3aa784be35d965f4e
Merge: 94663c3 50d8245
Author: David Capwell 
AuthorDate: Fri Nov 13 12:37:46 2020 -0800

Merge branch 'cassandra-3.11' into trunk

 .../apache/cassandra/config/CassandraRelevantProperties.java | 11 +++
 src/java/org/apache/cassandra/service/StorageService.java| 12 +++-
 .../apache/cassandra/distributed/action/GossipHelper.java|  7 ++-
 .../cassandra/distributed/test/ring/BootstrapTest.java   |  6 --
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --cc src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index 881b7d9,000..7402aa1
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@@ -1,240 -1,0 +1,251 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +
 +package org.apache.cassandra.config;
 +
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +
 +/** A class that extracts system properties for the cassandra node it runs 
within. */
 +public enum CassandraRelevantProperties
 +{
 +//base JVM properties
 +JAVA_HOME("java.home"),
 +CASSANDRA_PID_FILE ("cassandra-pidfile"),
 +
 +/**
 + * Indicates the temporary directory used by the Java Virtual Machine 
(JVM)
 + * to create and store temporary files.
 + */
 +JAVA_IO_TMPDIR ("java.io.tmpdir"),
 +
 +/**
 + * Path from which to load native libraries.
 + * Default is absolute path to lib directory.
 + */
 +JAVA_LIBRARY_PATH ("java.library.path"),
 +
 +JAVA_SECURITY_EGD ("java.security.egd"),
 +
 +/** Java Runtime Environment version */
 +JAVA_VERSION ("java.version"),
 +
 +/** Java Virtual Machine implementation name */
 +JAVA_VM_NAME ("java.vm.name"),
 +
 +/** Line separator ("\n" on UNIX). */
 +LINE_SEPARATOR ("line.separator"),
 +
 +/** Java class path. */
 +JAVA_CLASS_PATH ("java.class.path"),
 +
 +/** Operating system architecture. */
 +OS_ARCH ("os.arch"),
 +
 +/** Operating system name. */
 +OS_NAME ("os.name"),
 +
 +/** User's home directory. */
 +USER_HOME ("user.home"),
 +
 +/** Platform word size sun.arch.data.model. Examples: "32", "64", 
"unknown"*/
 +SUN_ARCH_DATA_MODEL ("sun.arch.data.model"),
 +
 +//JMX properties
 +/**
 + * The value of this property represents the host name string
 + * that should be associated with remote stubs for locally created remote 
objects,
 + * in order to allow clients to invoke methods on the remote object.
 + */
 +JAVA_RMI_SERVER_HOSTNAME ("java.rmi.server.hostname"),
 +
 +/**
 + * If this value is true, object identifiers for remote objects exported 
by this VM will be generated by using
 + * a cryptographically secure random number generator. The default value 
is false.
 + */
 +JAVA_RMI_SERVER_RANDOM_ID ("java.rmi.server.randomIDs"),
 +
 +/**
 + * This property indicates whether password authentication for remote 
monitoring is
 + * enabled. By default it is disabled - 
com.sun.management.jmxremote.authenticate
 + */
 +COM_SUN_MANAGEMENT_JMXREMOTE_AUTHENTICATE 
("com.sun.management.jmxremote.authenticate"),
 +
 +/**
 + * The port number to which the RMI connector will be bound - 
com.sun.management.jmxremote.rmi.port.
 + * An Integer object that represents the value of the second argument is 
returned
 + * if there is no port specified, if the port does not have the correct 
numeric format,
 + * or if the specified name is empty or null.
 + */
 +COM_SUN_MANAGEMENT_JMXREMOTE_RMI_PORT 
("com.sun.management.jmxremote.rmi.port", "0"),
 +
 +/** Cassandra jmx remote port */
 +CASSANDRA_JMX_REMOTE_PORT("cassandra.jmx.remote.port"),
 +
 +/** This property  indicates whether SSL is enabled for monitoring 
remotely. Default is set to false. */
 +COM_SUN_MANAGEMENT_JMXREMOTE_SSL 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[dcapwell]

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 5373bd911bbf6128c5c985b52f432536fd7dcb0f
Merge: 9660499 8ffa79f
Author: David Capwell 
AuthorDate: Tue Nov 10 10:48:53 2020 -0800

Merge branch 'cassandra-3.11' into trunk

 .../cassandra/config/YamlConfigurationLoader.java  | 10 +--
 .../apache/cassandra/distributed/Constants.java| 34 ++
 .../cassandra/distributed/UpgradeableCluster.java  |  1 +
 .../distributed/impl/AbstractCluster.java  |  4 +--
 .../cassandra/distributed/impl/Instance.java   | 10 ---
 5 files changed, 51 insertions(+), 8 deletions(-)

diff --cc 
test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
index 36bcb44,f104e00..228385e
--- 
a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
@@@ -36,10 -35,8 +36,9 @@@ import java.util.concurrent.atomic.Atom
  import java.util.function.BiConsumer;
  import java.util.function.BiPredicate;
  import java.util.function.Consumer;
- import java.util.function.Function;
  import java.util.function.Predicate;
  import java.util.stream.Collectors;
 +import java.util.stream.IntStream;
  import java.util.stream.Stream;
  
  import com.google.common.collect.Sets;
@@@ -354,13 -324,18 +354,13 @@@ public abstract class AbstractCluster<
  
  private InstanceConfig createInstanceConfig(int nodeNum)
  {
 -String ipPrefix = "127.0." + subnet + ".";
 -String seedIp = ipPrefix + "1";
 -String ipAddress = ipPrefix + nodeNum;
 +INodeProvisionStrategy provisionStrategy = 
nodeProvisionStrategy.create(subnet);
  long token = tokenSupplier.token(nodeNum);
 -
 -NetworkTopology topology = NetworkTopology.build(ipPrefix, 
broadcastPort, nodeIdTopology);
 -
 -InstanceConfig config = InstanceConfig.generate(nodeNum, ipAddress, 
topology, root, String.valueOf(token), seedIp, datadirCount);
 +NetworkTopology topology = buildNetworkTopology(provisionStrategy, 
nodeIdTopology);
 +InstanceConfig config = InstanceConfig.generate(nodeNum, 
provisionStrategy, topology, root, Long.toString(token), datadirCount);
- config.set("dtest.api.cluster_id", clusterId.toString());
+ config.set(Constants.KEY_DTEST_API_CLUSTER_ID, clusterId.toString());
  if (configUpdater != null)
  configUpdater.accept(config);
 -
  return config;
  }
  
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 2fc7044,8a7b5a2..f4063a6
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -18,15 -18,17 +18,14 @@@
  
  package org.apache.cassandra.distributed.impl;
  
 -import java.io.File;
 -import java.io.IOException;
 -import java.net.InetAddress;
  import java.io.ByteArrayOutputStream;
  import java.io.Closeable;
 +import java.io.File;
 +import java.io.IOException;
  import java.io.PrintStream;
  import java.net.InetSocketAddress;
 -import java.nio.ByteBuffer;
  import java.util.ArrayList;
  import java.util.Collections;
--import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  import java.util.Objects;
@@@ -35,9 -37,9 +34,8 @@@ import java.util.concurrent.Completable
  import java.util.concurrent.CopyOnWriteArrayList;
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Future;
 +import java.util.concurrent.TimeUnit;
  import java.util.concurrent.TimeoutException;
 -import java.util.function.BiConsumer;
--import java.util.function.Function;
  import javax.management.ListenerNotFoundException;
  import javax.management.Notification;
  import javax.management.NotificationListener;
@@@ -60,13 -59,14 +58,14 @@@ import org.apache.cassandra.cql3.QueryP
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.Keyspace;
  import org.apache.cassandra.db.Memtable;
 +import org.apache.cassandra.db.ReadResponse;
  import org.apache.cassandra.db.SystemKeyspace;
 +import org.apache.cassandra.db.SystemKeyspaceMigrator40;
  import org.apache.cassandra.db.commitlog.CommitLog;
  import org.apache.cassandra.db.compaction.CompactionManager;
 -import org.apache.cassandra.db.monitoring.ApproximateTime;
 -import org.apache.cassandra.dht.IPartitioner;
 -import org.apache.cassandra.dht.Token;
 +import org.apache.cassandra.distributed.Cluster;
+ import org.apache.cassandra.distributed.Constants;
 +import org.apache.cassandra.distributed.action.GossipHelper;
  import org.apache.cassandra.distributed.api.ICluster;
  import org.apache.cassandra.distributed.api.ICoordinator;
  import org.apache.cassandra.distributed.api.IInstance;
@@@ -142,11 -133,10 +141,11 @@@ public class Instance extends IsolatedE
  {

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 9660499acc4ceceb748715ddbd8b81e02916fb53
Merge: 63e8e7d ffd3d41
Author: Brandon Williams 
AuthorDate: Tue Nov 10 11:28:20 2020 -0600

Merge branch 'cassandra-3.11' into trunk

 .../cassandra/db/lifecycle/LogTransaction.java | 174 +
 1 file changed, 111 insertions(+), 63 deletions(-)

diff --cc src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
index 4039322,a28384f..ae12142
--- a/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
@@@ -47,7 -48,7 +47,7 @@@ import org.apache.cassandra.io.sstable.
  import org.apache.cassandra.io.sstable.SnapshotDeletingTask;
  import org.apache.cassandra.io.sstable.format.SSTableReader;
  import org.apache.cassandra.io.util.FileUtils;
--import org.apache.cassandra.tools.StandaloneSSTableUtil;
++import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.utils.*;
  import org.apache.cassandra.utils.concurrent.Ref;
  import org.apache.cassandra.utils.concurrent.RefCounted;
@@@ -269,34 -288,35 +289,36 @@@ class LogTransaction extends Transactio
  
  public void run()
  {
- if (logger.isTraceEnabled())
- logger.trace("Removing files for transaction log {}", data);
- 
- // this happens if we forget to close a txn and the garbage 
collector closes it for us
- // or if the transaction journal was never properly created in 
the first place
- if (!data.completed())
+ synchronized (lock)
  {
- logger.error("Transaction log {} indicates txn was not 
completed, trying to abort it now", data);
- Throwable err = Throwables.perform((Throwable)null, 
data::abort);
- if (err != null)
- logger.error("Failed to abort transaction log {}", data, 
err);
- }
+ if (logger.isTraceEnabled())
+ logger.trace("Removing files for transaction {}", name());
  
- Throwable err = data.removeUnfinishedLeftovers(null);
+ // this happens if we forget to close a txn and the garbage 
collector closes it for us
+ // or if the transaction journal was never properly created 
in the first place
+ if (!data.completed())
+ {
+ logger.error("{} was not completed, trying to abort it 
now", data);
 +
- if (err != null)
- {
- logger.info("Failed deleting files for transaction log {}, 
we'll retry after GC and on on server restart",
- data,
- err);
- failedDeletions.add(this);
- }
- else
- {
- if (logger.isTraceEnabled())
- logger.trace("Closing transaction log {}", data);
+ Throwable err = Throwables.perform((Throwable) null, 
data::abort);
+ if (err != null)
+ logger.error("Failed to abort {}", data, err);
+ }
  
- data.close();
+ Throwable err = data.removeUnfinishedLeftovers(null);
+ 
+ if (err != null)
+ {
+ logger.info("Failed deleting files for transaction {}, 
we'll retry after GC and on on server restart", name(), err);
+ failedDeletions.add(this);
+ }
+ else
+ {
+ if (logger.isTraceEnabled())
+ logger.trace("Closing file transaction {}", name());
+ 
+ data.close();
+ }
  }
  }
  }
@@@ -342,31 -369,37 +371,37 @@@
  if (tracker != null && !tracker.isDummy())
  SystemKeyspace.clearSSTableReadMeter(desc.ksname, 
desc.cfname, desc.generation);
  
- try
+ synchronized (lock)
  {
- // If we can't successfully delete the DATA component, set 
the task to be retried later: see TransactionTidier
- File datafile = new File(desc.filenameFor(Component.DATA));
 -if (logger.isTraceEnabled())
 -logger.trace("Tidier running for old sstable {}", 
desc.baseFilename());
 -
+ try
+ {
+ // If we can't successfully delete the DATA component, 
set the task to be retried later: see TransactionTidier
+ File datafile = new 
File(desc.filenameFor(Component.DATA));
  
- if (datafile.exists())
- delete(datafile);
- else if (!wasNew)
-  

[cassandra] 01/01: Merge branch cassandra-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 23a9301f85e95c2e784e637f0b8b482f6052a179
Merge: 32874dd 3106607
Author: Benjamin Lerer 
AuthorDate: Tue Nov 10 12:51:44 2020 +0100

Merge branch cassandra-3.11 into trunk

 CHANGES.txt|   1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |  14 ++-
 .../org/apache/cassandra/db/lifecycle/Tracker.java |  13 ++-
 .../cassandra/db/ColumnFamilyMetricTest.java   | 102 -
 4 files changed, 121 insertions(+), 9 deletions(-)

diff --cc CHANGES.txt
index 384ab79,1083096..5e3f8c6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,12 +1,45 @@@
 -3.11.10
 +4.0-beta4
 + * Ensure that CacheMetrics.requests is picked up by the metric reporter 
(CASSANDRA-16228)
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 +Merged from 3.11:
  Merged from 3.0:
+  * Fix a race condition on ColumnFamilyStore and TableMetrics 
(CASSANDRA-16228)
   * Remove the SEPExecutor blocking behavior (CASSANDRA-16186)
 - * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
 + * Wait for schema agreement when bootstrapping (CASSANDRA-15158)
   * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
  
 -3.11.9
 - * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
 +4.0-beta3
 + * Segregate Network and Chunk Cache BufferPools and Recirculate Partially 
Freed Chunks (CASSANDRA-15229)
 + * Fail truncation requests when they fail on a replica (CASSANDRA-16208)
 + * Move compact storage validation earlier in startup process 
(CASSANDRA-16063)
 + * Fix ByteBufferAccessor cast exceptions are thrown when trying to query a 
virtual table (CASSANDRA-16155)
 + * Consolidate node liveness check for forced repair (CASSANDRA-16113)
 + * Use unsigned short in ValueAccessor.sliceWithShortLength (CASSANDRA-16147)
 + * Abort repairs when getting a truncation request (CASSANDRA-15854)
 + * Remove bad assert when getting active compactions for an sstable 
(CASSANDRA-15457)
 + * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Prevent NPE in StreamMessage in type lookup (CASSANDRA-16131)
 + * Avoid invalid state transition exception during incremental repair 
(CASSANDRA-16067)
 + * Allow zero padding in timestamp serialization (CASSANDRA-16105)
 + * Add byte array backed cells (CASSANDRA-15393)
 + * Correctly handle pending ranges with adjacent range movements 
(CASSANDRA-14801)
 + * Avoid adding locahost when streaming trivial ranges (CASSANDRA-16099)
 + * Add nodetool getfullquerylog (CASSANDRA-15988)
 + * Fix yaml format and alignment in tpstats (CASSANDRA-11402)
 + * Avoid trying to keep track of RTs for endpoints we won't write to during 
read repair (CASSANDRA-16084)
 + * When compaction gets interrupted, the exception should include the 
compactionId (CASSANDRA-15954)
 + * Make Table/Keyspace Metric Names Consistent With Each Other 
(CASSANDRA-15909)
 + * Mutating sstable component may race with entire-sstable-streaming(ZCS) 
causing checksum validation failure (CASSANDRA-15861)
 + * NPE thrown while updating speculative execution time if keyspace is 
removed during task execution (CASSANDRA-15949)
 + * Show the progress of data streaming and index build (CASSANDRA-15406)
 + * Add flag to disable chunk cache and disable by default (CASSANDRA-16036)
 + * Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix 
(CASSANDRA-16150)
 +Merged from 3.11:
   * Fix ColumnFilter to avoid querying cells of unselected complex columns 
(CASSANDRA-15977)
   * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
   * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index d0d6ed1,abdc3f8..f712d1b
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -90,7 -83,6 +90,8 @@@ import org.apache.cassandra.utils.memor
  import org.json.simple.JSONArray;
  import org.json.simple.JSONObject;
  
 +import static java.util.concurrent.TimeUnit.NANOSECONDS;
++
  import static org.apache.cassandra.utils.Throwables.maybeFail;
  import static org.apache.cassandra.utils.Throwables.merge;
  
@@@ -385,16 

[cassandra] 01/01: Merge branch cassandra-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 43929a5db51d766155185d63b318641ef640b397
Merge: 4dc1b5c 4e24afa
Author: Benjamin Lerer 
AuthorDate: Tue Nov 10 10:08:35 2020 +0100

Merge branch cassandra-3.11 into trunk

 CHANGES.txt|   1 +
 .../apache/cassandra/concurrent/SEPExecutor.java   |  41 +--
 .../cassandra/concurrent/SharedExecutorPool.java   |   8 +-
 .../org/apache/cassandra/concurrent/Stage.java |   2 +-
 .../org/apache/cassandra/transport/Message.java|   1 -
 .../concurrent/LongSharedExecutorPoolTest.java |   8 +-
 .../cassandra/concurrent/SEPExecutorTest.java  |   4 +-
 .../cassandra/metrics/ThreadPoolMetricsTest.java   | 311 +
 8 files changed, 329 insertions(+), 47 deletions(-)

diff --cc CHANGES.txt
index 1b08837,0cef27a..13bb0bf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,42 -1,11 +1,43 @@@
 -3.11.10
 +4.0-beta4
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 +Merged from 3.11:
  Merged from 3.0:
+  * Remove the SEPExecutor blocking behavior (CASSANDRA-16186)
 - * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
 + * Wait for schema agreement when bootstrapping (CASSANDRA-15158)
   * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
  
 -3.11.9
 - * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
 +4.0-beta3
 + * Segregate Network and Chunk Cache BufferPools and Recirculate Partially 
Freed Chunks (CASSANDRA-15229)
 + * Fail truncation requests when they fail on a replica (CASSANDRA-16208)
 + * Move compact storage validation earlier in startup process 
(CASSANDRA-16063)
 + * Fix ByteBufferAccessor cast exceptions are thrown when trying to query a 
virtual table (CASSANDRA-16155)
 + * Consolidate node liveness check for forced repair (CASSANDRA-16113)
 + * Use unsigned short in ValueAccessor.sliceWithShortLength (CASSANDRA-16147)
 + * Abort repairs when getting a truncation request (CASSANDRA-15854)
 + * Remove bad assert when getting active compactions for an sstable 
(CASSANDRA-15457)
 + * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Prevent NPE in StreamMessage in type lookup (CASSANDRA-16131)
 + * Avoid invalid state transition exception during incremental repair 
(CASSANDRA-16067)
 + * Allow zero padding in timestamp serialization (CASSANDRA-16105)
 + * Add byte array backed cells (CASSANDRA-15393)
 + * Correctly handle pending ranges with adjacent range movements 
(CASSANDRA-14801)
 + * Avoid adding locahost when streaming trivial ranges (CASSANDRA-16099)
 + * Add nodetool getfullquerylog (CASSANDRA-15988)
 + * Fix yaml format and alignment in tpstats (CASSANDRA-11402)
 + * Avoid trying to keep track of RTs for endpoints we won't write to during 
read repair (CASSANDRA-16084)
 + * When compaction gets interrupted, the exception should include the 
compactionId (CASSANDRA-15954)
 + * Make Table/Keyspace Metric Names Consistent With Each Other 
(CASSANDRA-15909)
 + * Mutating sstable component may race with entire-sstable-streaming(ZCS) 
causing checksum validation failure (CASSANDRA-15861)
 + * NPE thrown while updating speculative execution time if keyspace is 
removed during task execution (CASSANDRA-15949)
 + * Show the progress of data streaming and index build (CASSANDRA-15406)
 + * Add flag to disable chunk cache and disable by default (CASSANDRA-16036)
 + * Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix 
(CASSANDRA-16150)
 +Merged from 3.11:
   * Fix ColumnFilter to avoid querying cells of unselected complex columns 
(CASSANDRA-15977)
   * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
   * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
diff --cc src/java/org/apache/cassandra/concurrent/SEPExecutor.java
index ee939a2,4641a19..58878b2
--- a/src/java/org/apache/cassandra/concurrent/SEPExecutor.java
+++ b/src/java/org/apache/cassandra/concurrent/SEPExecutor.java
@@@ -21,38 -21,26 +21,37 @@@ import java.util.ArrayList
  import java.util.List;
  import java.util.concurrent.ConcurrentLinkedQueue;
  import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.atomic.AtomicInteger;
  import java.util.concurrent.atomic.AtomicLong;

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 4dc1b5c3119affd22e40f5fbe8661b9da052aa2b
Merge: 159e021 73a90b9
Author: Mick Semb Wever 
AuthorDate: Mon Nov 9 21:34:47 2020 +0100

Merge branch 'cassandra-3.11' into trunk

 doc/source/architecture/storage_engine.rst | 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-3.11' into trunk

[bdeggleston]

This is an automated email from the ASF dual-hosted git repository.

bdeggleston pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 159e021aa36a44cdc7674dd234d4a6e189478280
Merge: 85f69cf fe70155
Author: Blake Eggleston 
AuthorDate: Mon Nov 9 12:22:43 2020 -0800

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 .../cassandra/schema/MigrationCoordinator.java | 516 +
 .../apache/cassandra/schema/MigrationManager.java  | 149 +-
 .../org/apache/cassandra/schema/MigrationTask.java | 111 -
 src/java/org/apache/cassandra/schema/Schema.java   |   2 +-
 .../cassandra/schema/SchemaMigrationEvent.java |   7 +-
 .../apache/cassandra/service/StorageService.java   |  63 ++-
 .../cassandra/service/StorageServiceMBean.java |   7 +
 .../cassandra/distributed/action/GossipHelper.java |  10 +-
 .../cassandra/schema/MigrationCoordinatorTest.java | 319 +
 10 files changed, 908 insertions(+), 277 deletions(-)

diff --cc CHANGES.txt
index f90ffd4,b81b0c8..1b08837
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,10 +1,42 @@@
 -3.11.10
 +4.0-beta4
 + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
 + * TLS connections to the storage port on a node without server encryption 
configured causes java.io.IOException accessing missing keystore 
(CASSANDRA-16144)
 +Merged from 3.11:
  Merged from 3.0:
 - * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
++ * Wait for schema agreement when bootstrapping (CASSANDRA-15158)
   * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
  
 -3.11.9
 - * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
 +4.0-beta3
 + * Segregate Network and Chunk Cache BufferPools and Recirculate Partially 
Freed Chunks (CASSANDRA-15229)
 + * Fail truncation requests when they fail on a replica (CASSANDRA-16208)
 + * Move compact storage validation earlier in startup process 
(CASSANDRA-16063)
 + * Fix ByteBufferAccessor cast exceptions are thrown when trying to query a 
virtual table (CASSANDRA-16155)
 + * Consolidate node liveness check for forced repair (CASSANDRA-16113)
 + * Use unsigned short in ValueAccessor.sliceWithShortLength (CASSANDRA-16147)
 + * Abort repairs when getting a truncation request (CASSANDRA-15854)
 + * Remove bad assert when getting active compactions for an sstable 
(CASSANDRA-15457)
 + * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Prevent NPE in StreamMessage in type lookup (CASSANDRA-16131)
 + * Avoid invalid state transition exception during incremental repair 
(CASSANDRA-16067)
 + * Allow zero padding in timestamp serialization (CASSANDRA-16105)
 + * Add byte array backed cells (CASSANDRA-15393)
 + * Correctly handle pending ranges with adjacent range movements 
(CASSANDRA-14801)
 + * Avoid adding locahost when streaming trivial ranges (CASSANDRA-16099)
 + * Add nodetool getfullquerylog (CASSANDRA-15988)
 + * Fix yaml format and alignment in tpstats (CASSANDRA-11402)
 + * Avoid trying to keep track of RTs for endpoints we won't write to during 
read repair (CASSANDRA-16084)
 + * When compaction gets interrupted, the exception should include the 
compactionId (CASSANDRA-15954)
 + * Make Table/Keyspace Metric Names Consistent With Each Other 
(CASSANDRA-15909)
 + * Mutating sstable component may race with entire-sstable-streaming(ZCS) 
causing checksum validation failure (CASSANDRA-15861)
 + * NPE thrown while updating speculative execution time if keyspace is 
removed during task execution (CASSANDRA-15949)
 + * Show the progress of data streaming and index build (CASSANDRA-15406)
 + * Add flag to disable chunk cache and disable by default (CASSANDRA-16036)
 + * Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix 
(CASSANDRA-16150)
 +Merged from 3.11:
   * Fix ColumnFilter to avoid querying cells of unselected complex columns 
(CASSANDRA-15977)
   * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
   * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
diff --cc src/java/org/apache/cassandra/schema/MigrationCoordinator.java
index 000,000..9fb348e
new file mode 100644
--- /dev/null
+++ b/src/java/org/apache/cassandra/schema/MigrationCoordinator.java
@@@ -1,0 -1,0 +1,516 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one
++ * or more contributor license agreements.  See the NOTICE file
++ * distributed with this work for additional 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 9ac9a9343540e67f4609f75dd5199b2a66624488
Merge: 0700d79 94f940c
Author: Brandon Williams 
AuthorDate: Fri Nov 6 11:43:23 2020 -0600

Merge branch 'cassandra-3.11' into trunk

 src/java/org/apache/cassandra/service/StorageService.java   | 13 -
 .../org/apache/cassandra/distributed/impl/Instance.java |  1 +
 .../org/apache/cassandra/distributed/test/GossipTest.java   | 12 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --cc src/java/org/apache/cassandra/service/StorageService.java
index d7d3ebe,7dea7a0..47f82b8
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1464,6 -1488,16 +1465,16 @@@ public class StorageService extends Not
  setMode(Mode.MOVING, true);
  }
  
+ /**
+  * Only used in jvm dtest when not using GOSSIP.
 - * See 
org.apache.cassandra.distributed.impl.Instance#initializeRing(org.apache.cassandra.distributed.api.ICluster)
++ * See 
org.apache.cassandra.distributed.impl.Instance#startup(org.apache.cassandra.distributed.api.ICluster)
+  */
+ @VisibleForTesting
+ public void setNormalModeUnsafe()
+ {
+ setMode(Mode.NORMAL, true);
+ }
+ 
  private void setMode(Mode m, boolean log)
  {
  setMode(m, null, log);
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 4c778f1,50aea0b..2fc7044
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -481,13 -554,7 +481,14 @@@ public class Instance extends IsolatedE
  }
  else
  {
 -initializeRing(cluster);
 +cluster.stream().forEach(peer -> {
 +if (cluster instanceof Cluster)
 +GossipHelper.statusToNormal((IInvokableInstance) 
peer).accept(this);
 +else
 +GossipHelper.unsafeStatusToNormal(this, 
(IInstance) peer);
 +});
 +
++StorageService.instance.setNormalModeUnsafe();
  }
  
  StorageService.instance.ensureTraceKeyspace();
diff --cc test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
index a162ebf,32ecb95..1b6a004
--- a/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
@@@ -19,17 -19,17 +19,13 @@@
  package org.apache.cassandra.distributed.test;
  
  import java.io.Closeable;
--import java.net.InetAddress;
  import java.util.Collection;
  import java.util.concurrent.CountDownLatch;
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Executors;
  import java.util.concurrent.Future;
  import java.util.concurrent.TimeUnit;
--import java.util.concurrent.locks.LockSupport;
--import java.util.stream.Collectors;
  
--import com.google.common.collect.Iterables;
  import com.google.common.util.concurrent.Uninterruptibles;
  import org.junit.Assert;
  import org.junit.Test;
@@@ -39,11 -39,11 +35,7 @@@ import net.bytebuddy.dynamic.loading.Cl
  import net.bytebuddy.implementation.MethodDelegation;
  import org.apache.cassandra.dht.Token;
  import org.apache.cassandra.distributed.Cluster;
--import org.apache.cassandra.gms.ApplicationState;
--import org.apache.cassandra.gms.EndpointState;
--import org.apache.cassandra.gms.Gossiper;
  import org.apache.cassandra.service.StorageService;
--import org.apache.cassandra.utils.FBUtilities;
  
  import static net.bytebuddy.matcher.ElementMatchers.named;
  import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@@ -61,13 -132,13 +53,13 @@@ public class GossipTest extends TestBas
  if (nodeNumber != 2)
  return;
  new ByteBuddy().rebase(StorageService.class)
--   .method(named("bootstrap").and(takesArguments(1)))
++   .method(named("bootstrap").and(takesArguments(2)))
 
.intercept(MethodDelegation.to(BBBootstrapInterceptor.class))
 .make()
 .load(cl, ClassLoadingStrategy.Default.INJECTION);
  }
  
--public static boolean bootstrap(Collection tokens) throws 
Exception
++public static boolean bootstrap(Collection tokens, long 
bootstrapTimeoutMillis)
  {
  bootstrapStart.countDown();
  Uninterruptibles.awaitUninterruptibly(bootstrapReady);


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[marcuse]

This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit d68c45eb2a4d6bcea0bac78c1797496988e23ee0
Merge: 7e0c0e5 9960cf1
Author: Marcus Eriksson 
AuthorDate: Thu Nov 5 08:26:31 2020 +0100

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f45b1edc918877aa285c42d86a23911656c014aa
Merge: 93c2d76 3854348
Author: Mick Semb Wever 
AuthorDate: Wed Nov 4 12:49:22 2020 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt  | 5 -
 build.xml| 2 +-
 debian/changelog | 6 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index 3586d95,e46731b..bf626ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,19 +1,46 @@@
 -3.11.10
 +4.0-beta4
 + * Produce consistent tombstone for reads to avoid digest mistmatch 
(CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups 
(CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility 
(CASSANDRA-16214)
++Merged from 3.11:
+ Merged from 3.0:
 - * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
+  * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
+ 
 -3.11.9
 - * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
 +4.0-beta3
 + * Segregate Network and Chunk Cache BufferPools and Recirculate Partially 
Freed Chunks (CASSANDRA-15229)
 + * Fail truncation requests when they fail on a replica (CASSANDRA-16208)
 + * Move compact storage validation earlier in startup process 
(CASSANDRA-16063)
 + * Fix ByteBufferAccessor cast exceptions are thrown when trying to query a 
virtual table (CASSANDRA-16155)
 + * Consolidate node liveness check for forced repair (CASSANDRA-16113)
 + * Use unsigned short in ValueAccessor.sliceWithShortLength (CASSANDRA-16147)
 + * Abort repairs when getting a truncation request (CASSANDRA-15854)
 + * Remove bad assert when getting active compactions for an sstable 
(CASSANDRA-15457)
 + * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Prevent NPE in StreamMessage in type lookup (CASSANDRA-16131)
 + * Avoid invalid state transition exception during incremental repair 
(CASSANDRA-16067)
 + * Allow zero padding in timestamp serialization (CASSANDRA-16105)
 + * Add byte array backed cells (CASSANDRA-15393)
 + * Correctly handle pending ranges with adjacent range movements 
(CASSANDRA-14801)
 + * Avoid adding locahost when streaming trivial ranges (CASSANDRA-16099)
 + * Add nodetool getfullquerylog (CASSANDRA-15988)
 + * Fix yaml format and alignment in tpstats (CASSANDRA-11402)
 + * Avoid trying to keep track of RTs for endpoints we won't write to during 
read repair (CASSANDRA-16084)
 + * When compaction gets interrupted, the exception should include the 
compactionId (CASSANDRA-15954)
 + * Make Table/Keyspace Metric Names Consistent With Each Other 
(CASSANDRA-15909)
 + * Mutating sstable component may race with entire-sstable-streaming(ZCS) 
causing checksum validation failure (CASSANDRA-15861)
 + * NPE thrown while updating speculative execution time if keyspace is 
removed during task execution (CASSANDRA-15949)
 + * Show the progress of data streaming and index build (CASSANDRA-15406)
 + * Add flag to disable chunk cache and disable by default (CASSANDRA-16036)
 + * Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix 
(CASSANDRA-16150)
 +Merged from 3.11:
   * Fix ColumnFilter to avoid querying cells of unselected complex columns 
(CASSANDRA-15977)
   * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
   * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
 - * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Use IF NOT EXISTS for index and UDT create statements in snapshot schema 
files (CASSANDRA-13935)
   * Make sure LCS handles duplicate sstable added/removed notifications 
correctly (CASSANDRA-14103)
  Merged from 3.0:
-  * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
 - * Fix OOM when terminating repair session (CASSANDRA-15902)
   * Avoid marking shutting down nodes as up after receiving gossip shutdown 
message (CASSANDRA-16094)
 - * Check SSTables for latest version before dropping compact storage 
(CASSANDRA-16063)
   * Handle unexpected columns due to schema races (CASSANDRA-15899)
   * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
  Merged from 2.2:
diff --cc build.xml
index 564c967,5a8040e..a02c566
--- a/build.xml
+++ b/build.xml
@@@ -27,7 -25,7 +27,7 @@@
  
  
  
- 
 -
++
  https://gitbox.apache.org/repos/asf/cassandra.git"/>
  https://gitbox.apache.org/repos/asf/cassandra.git"/>
  https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --cc debian/changelog
index dbbde83,3dae39e..a366395
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
 -cassandra (3.11.10) 

[cassandra] 01/01: Merge branch cassandra-3.11 into trunk

[blerer]

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 980c6ea6abe2f5138aa3bd2666344e86bde4b141
Merge: 56e697d ec5e242
Author: Benjamin Lerer 
AuthorDate: Tue Nov 3 14:36:12 2020 +0100

Merge branch cassandra-3.11 into trunk

 test/unit/org/apache/cassandra/cql3/CQLTester.java |  58 +++
 .../cassandra/cql3/validation/entities/UFTest.java | 104 ++--
 .../cql3/validation/entities/UFTypesTest.java  |  21 ++--
 .../validation/operations/AggregationTest.java | 109 ++---
 4 files changed, 159 insertions(+), 133 deletions(-)

diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java
index 04ac289,4e320ef..d205c10
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@@ -713,9 -588,20 +711,19 @@@ public abstract class CQLTeste
  return typeName;
  }
  
+ protected String createFunctionName(String keyspace)
+ {
+ return String.format("%s.function_%02d", keyspace, 
seqNumber.getAndIncrement());
+ }
+ 
+ protected void registerFunction(String functionName, String argTypes)
+ {
+ functions.add(functionName + '(' + argTypes + ')');
+ }
+ 
  protected String createFunction(String keyspace, String argTypes, String 
query) throws Throwable
  {
- String functionName = String.format("%s.function_%02d", keyspace, 
seqNumber.getAndIncrement());
+ String functionName = createFunctionName(keyspace);
 -
  createFunctionOverload(functionName, argTypes, query);
  return functionName;
  }
@@@ -728,9 -614,20 +736,19 @@@
  schemaChange(fullQuery);
  }
  
+ protected String createAggregateName(String keyspace)
+ {
+ return String.format("%s.aggregate_%02d", keyspace, 
seqNumber.getAndIncrement());
+ }
+ 
+ protected void registerAggregate(String aggregateName, String argTypes)
+ {
+ aggregates.add(aggregateName + '(' + argTypes + ')');
+ }
+ 
  protected String createAggregate(String keyspace, String argTypes, String 
query) throws Throwable
  {
- String aggregateName = String.format("%s.aggregate_%02d", keyspace, 
seqNumber.getAndIncrement());
+ String aggregateName = createAggregateName(keyspace);
 -
  createAggregateOverload(aggregateName, argTypes, query);
  return aggregateName;
  }
@@@ -970,7 -795,7 +992,7 @@@
  
  QueryOptions options = 
QueryOptions.forInternalCalls(Collections.emptyList());
  
- lastSchemaChangeResult = statement.executeLocally(queryState, 
options);
 -return prepared.statement.executeInternal(queryState, options);
++return statement.executeLocally(queryState, options);
  }
  catch (Exception e)
  {
diff --cc test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
index d691374,cac0fd3..76ba6c1
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
@@@ -36,13 -36,13 +36,14 @@@ import org.apache.cassandra.cql3.functi
  import org.apache.cassandra.cql3.functions.UDFunction;
  import org.apache.cassandra.db.marshal.CollectionType;
  import org.apache.cassandra.exceptions.InvalidRequestException;
 -import org.apache.cassandra.exceptions.SyntaxException;
  import org.apache.cassandra.schema.KeyspaceMetadata;
 +import org.apache.cassandra.schema.Schema;
  import org.apache.cassandra.service.ClientState;
- import org.apache.cassandra.transport.*;
+ import org.apache.cassandra.transport.Event.SchemaChange.Change;
+ import org.apache.cassandra.transport.Event.SchemaChange.Target;
  import org.apache.cassandra.transport.ProtocolVersion;
  import org.apache.cassandra.transport.messages.ResultMessage;
 +import org.apache.cassandra.utils.ByteBufferUtil;
  
  public class UFTest extends CQLTester
  {
@@@ -83,58 -72,59 +84,59 @@@
  @Test
  public void testSchemaChange() throws Throwable
  {
- String f = createFunction(KEYSPACE,
-   "double, double",
-   "CREATE OR REPLACE FUNCTION %s(state 
double, val double) " +
-   "RETURNS NULL ON NULL INPUT " +
-   "RETURNS double " +
-   "LANGUAGE javascript " +
-   "AS '\"string\";';");
- 
- assertLastSchemaChange(Event.SchemaChange.Change.CREATED, 
Event.SchemaChange.Target.FUNCTION,
-KEYSPACE, parseFunctionName(f).name,
-"double", "double");
- 
- createFunctionOverload(f,
-"double, double",
-"CREATE OR REPLACE FUNCTION %s(state int, 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[bdeggleston]

This is an automated email from the ASF dual-hosted git repository.

bdeggleston pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 17cf2e7edfc0e185fc7c73b1debf1d0850a90286
Merge: 57346fe a32881e
Author: Blake Eggleston 
AuthorDate: Fri Oct 30 12:37:52 2020 -0700

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 .../apache/cassandra/service/StorageService.java   |  16 +++
 .../cassandra/distributed/test/GossipTest.java | 156 +
 3 files changed, 173 insertions(+)

diff --cc CHANGES.txt
index 341ba48,b4caada..cdc7114
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -32,10 -3,13 +32,11 @@@ Merged from 3.11
   * Fix ColumnFilter to avoid querying cells of unselected complex columns 
(CASSANDRA-15977)
   * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
   * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
 - * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Use IF NOT EXISTS for index and UDT create statements in snapshot schema 
files (CASSANDRA-13935)
   * Make sure LCS handles duplicate sstable added/removed notifications 
correctly (CASSANDRA-14103)
  Merged from 3.0:
+  * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
 - * Fix OOM when terminating repair session (CASSANDRA-15902)
   * Avoid marking shutting down nodes as up after receiving gossip shutdown 
message (CASSANDRA-16094)
 - * Check SSTables for latest version before dropping compact storage 
(CASSANDRA-16063)
   * Handle unexpected columns due to schema races (CASSANDRA-15899)
   * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
  Merged from 2.2:
diff --cc test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
index 000,32ecb95..a162ebf
mode 00,100644..100644
--- a/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
@@@ -1,0 -1,227 +1,156 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ package org.apache.cassandra.distributed.test;
+ 
+ import java.io.Closeable;
+ import java.net.InetAddress;
+ import java.util.Collection;
+ import java.util.concurrent.CountDownLatch;
+ import java.util.concurrent.ExecutorService;
+ import java.util.concurrent.Executors;
+ import java.util.concurrent.Future;
+ import java.util.concurrent.TimeUnit;
+ import java.util.concurrent.locks.LockSupport;
+ import java.util.stream.Collectors;
+ 
+ import com.google.common.collect.Iterables;
+ import com.google.common.util.concurrent.Uninterruptibles;
+ import org.junit.Assert;
+ import org.junit.Test;
+ 
+ import net.bytebuddy.ByteBuddy;
+ import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
+ import net.bytebuddy.implementation.MethodDelegation;
+ import org.apache.cassandra.dht.Token;
+ import org.apache.cassandra.distributed.Cluster;
+ import org.apache.cassandra.gms.ApplicationState;
+ import org.apache.cassandra.gms.EndpointState;
+ import org.apache.cassandra.gms.Gossiper;
+ import org.apache.cassandra.service.StorageService;
+ import org.apache.cassandra.utils.FBUtilities;
+ 
+ import static net.bytebuddy.matcher.ElementMatchers.named;
+ import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+ import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
+ import static org.apache.cassandra.distributed.api.Feature.NETWORK;
+ 
+ public class GossipTest extends TestBaseImpl
+ {
 -
 -@Test
 -public void nodeDownDuringMove() throws Throwable
 -{
 -int liveCount = 1;
 -System.setProperty("cassandra.ring_delay_ms", "5000"); // down from 
30s default
 -System.setProperty("cassandra.consistent.rangemovement", "false");
 -System.setProperty("cassandra.consistent.simultaneousmoves.allow", 
"true");
 -try (Cluster cluster = Cluster.build(2 + liveCount)
 -  .withConfig(config -> 
config.with(NETWORK).with(GOSSIP))
 -  .createWithoutStarting())
 -{
 -int fail = 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 2089b9991a72aefccd66a66d106be0b7f8abd697
Merge: 90e4e61 5ef75dd
Author: Mick Semb Wever 
AuthorDate: Thu Oct 29 12:54:51 2020 +0100

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 90e4e61c5430cd117ab9d1805bf55cf9b34237db
Merge: a04a285 98487fe
Author: Mick Semb Wever 
AuthorDate: Thu Oct 29 12:29:00 2020 +0100

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit a04a28523f4e0dd38904126b60c090e7723e0d23
Merge: 509e5b2 7d448ff
Author: Mick Semb Wever 
AuthorDate: Thu Oct 29 11:58:57 2020 +0100

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[brandonwilliams]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 509e5b20d4b6c65dea90b33a72fa2b12792e7624
Merge: 6ca34f8 aaabf0f
Author: Brandon Williams 
AuthorDate: Wed Oct 28 08:56:10 2020 -0500

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[dcapwell]

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit dfd9c74c67f6450fc32ea827b7a4d73af4d0e605
Merge: 418e8f1 65a7997
Author: David Capwell 
AuthorDate: Fri Oct 23 09:39:21 2020 -0700

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[marcuse]

This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 418e8f12268cd2fa754ce5e50712e26fe916309d
Merge: 9179796 06ecdfa
Author: Marcus Eriksson 
AuthorDate: Fri Oct 23 10:23:19 2020 +0200

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   1 +
 .../apache/cassandra/service/EchoVerbHandler.java  |  13 +-
 .../apache/cassandra/service/StorageService.java   |   9 ++
 .../distributed/test/GossipShutdownTest.java   | 136 +
 4 files changed, 157 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index 97762c1,d04a1e5..01e0ad7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -28,9 -3,11 +28,10 @@@ Merged from 3.11
   * Fix ColumnFilter to avoid querying cells of unselected complex columns 
(CASSANDRA-15977)
   * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
   * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
 - * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Use IF NOT EXISTS for index and UDT create statements in snapshot schema 
files (CASSANDRA-13935)
   * Make sure LCS handles duplicate sstable added/removed notifications 
correctly (CASSANDRA-14103)
  Merged from 3.0:
+  * Avoid marking shutting down nodes as up after receiving gossip shutdown 
message (CASSANDRA-16094)
 - * Check SSTables for latest version before dropping compact storage 
(CASSANDRA-16063)
   * Handle unexpected columns due to schema races (CASSANDRA-15899)
   * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
  Merged from 2.2:
diff --cc src/java/org/apache/cassandra/service/EchoVerbHandler.java
index 76f23d4,5410837..77fe4ab
--- a/src/java/org/apache/cassandra/service/EchoVerbHandler.java
+++ b/src/java/org/apache/cassandra/service/EchoVerbHandler.java
@@@ -19,23 -19,30 +19,32 @@@ package org.apache.cassandra.service
   * under the License.
   *
   */
 -
 -import org.apache.cassandra.gms.EchoMessage;
++import org.apache.cassandra.exceptions.RequestFailureReason;
  import org.apache.cassandra.net.IVerbHandler;
 -import org.apache.cassandra.net.MessageIn;
 -import org.apache.cassandra.net.MessageOut;
 +import org.apache.cassandra.net.Message;
  import org.apache.cassandra.net.MessagingService;
 +import org.apache.cassandra.net.NoPayload;
 +
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
 -public class EchoVerbHandler implements IVerbHandler
 +public class EchoVerbHandler implements IVerbHandler
  {
 +public static final EchoVerbHandler instance = new EchoVerbHandler();
 +
  private static final Logger logger = 
LoggerFactory.getLogger(EchoVerbHandler.class);
  
 -public void doVerb(MessageIn message, int id)
 +public void doVerb(Message message)
  {
- logger.trace("Sending ECHO_RSP to {}", message.from());
- MessagingService.instance().send(message.emptyResponse(), 
message.from());
++// only respond if we are not shutdown
+ if (!StorageService.instance.isShutdown())
+ {
 -logger.trace("Sending a EchoMessage reply {}", message.from);
 -MessageOut echoMessage = new 
MessageOut(MessagingService.Verb.REQUEST_RESPONSE, 
EchoMessage.instance, EchoMessage.serializer);
 -MessagingService.instance().sendReply(echoMessage, id, 
message.from);
++logger.trace("Sending ECHO_RSP to {}", message.from());
++MessagingService.instance().send(message.emptyResponse(), 
message.from());
+ }
+ else
+ {
 -logger.trace("Not sending EchoMessage reply to {} - we are 
shutdown", message.from);
++logger.trace("Not sending ECHO_RSP to {} - we are shutting down", 
message.from());
+ }
  }
  }
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 4140680,3fbeba0..d7d99d6
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -177,22 -163,18 +177,31 @@@ public class StorageService extends Not
  return isShutdown;
  }
  
+ /**
+  * for in-jvm dtest use - forces isShutdown to be set to whatever passed 
in.
+  */
+ @VisibleForTesting
+ public void setIsShutdownUnsafeForTests(boolean isShutdown)
+ {
+ this.isShutdown = isShutdown;
+ }
+ 
 -public Collection> getLocalRanges(String keyspaceName)
 +public RangesAtEndpoint getLocalReplicas(String keyspaceName)
 +{
 +return Keyspace.open(keyspaceName).getReplicationStrategy()
 +.getAddressReplicas(FBUtilities.getBroadcastAddressAndPort());
 +}
 +
 +public List> getLocalAndPendingRanges(String ks)
  {
 -return getRangesForEndpoint(keyspaceName, 
FBUtilities.getBroadcastAddress());
 +InetAddressAndPort broadcastAddress = 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[dcapwell]

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 9179796dfadbbf5a60cc7490a9bc6b260b9993b0
Merge: 4fb255d efd6b60
Author: David Capwell 
AuthorDate: Thu Oct 22 13:24:57 2020 -0700

Merge branch 'cassandra-3.11' into trunk

 .../cassandra/config/ParameterizedClass.java   |  5 ++
 .../cassandra/config/YamlConfigurationLoader.java  | 21 ++
 .../distributed/impl/AbstractCluster.java  | 44 +--
 .../cassandra/distributed/impl/Instance.java   | 17 ++---
 .../cassandra/distributed/impl/InstanceConfig.java | 49 +++-
 .../cassandra/distributed/test/JVMDTestTest.java   | 88 ++
 .../config/YamlConfigurationLoaderTest.java| 52 +
 7 files changed, 220 insertions(+), 56 deletions(-)

diff --cc 
test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
index 44c9744,d053075..36bcb44
--- 
a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
@@@ -354,13 -323,18 +354,13 @@@ public abstract class AbstractCluster<
  
  private InstanceConfig createInstanceConfig(int nodeNum)
  {
 -String ipPrefix = "127.0." + subnet + ".";
 -String seedIp = ipPrefix + "1";
 -String ipAddress = ipPrefix + nodeNum;
 +INodeProvisionStrategy provisionStrategy = 
nodeProvisionStrategy.create(subnet);
  long token = tokenSupplier.token(nodeNum);
 -
 -NetworkTopology topology = NetworkTopology.build(ipPrefix, 
broadcastPort, nodeIdTopology);
 -
 -InstanceConfig config = InstanceConfig.generate(nodeNum, ipAddress, 
topology, root, String.valueOf(token), seedIp, datadirCount);
 +NetworkTopology topology = buildNetworkTopology(provisionStrategy, 
nodeIdTopology);
 +InstanceConfig config = InstanceConfig.generate(nodeNum, 
provisionStrategy, topology, root, Long.toString(token), datadirCount);
- config.set("dtest.api.cluster_id", clusterId);
+ config.set("dtest.api.cluster_id", clusterId.toString());
  if (configUpdater != null)
  configUpdater.accept(config);
 -
  return config;
  }
  
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 04646c1,6ea2c9c..4c778f1
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -42,20 -44,19 +42,21 @@@ import javax.management.ListenerNotFoun
  import javax.management.Notification;
  import javax.management.NotificationListener;
  
 +import com.google.common.annotations.VisibleForTesting;
 +
 +import io.netty.util.concurrent.GlobalEventExecutor;
  import org.apache.cassandra.batchlog.BatchlogManager;
 +import org.apache.cassandra.concurrent.ExecutorLocals;
  import org.apache.cassandra.concurrent.ScheduledExecutors;
  import org.apache.cassandra.concurrent.SharedExecutorPool;
 -import org.apache.cassandra.concurrent.StageManager;
 +import org.apache.cassandra.concurrent.Stage;
  import org.apache.cassandra.config.Config;
  import org.apache.cassandra.config.DatabaseDescriptor;
 -import org.apache.cassandra.config.Schema;
 -import org.apache.cassandra.config.SchemaConstants;
+ import org.apache.cassandra.config.YamlConfigurationLoader;
  import org.apache.cassandra.cql3.CQLStatement;
 +import org.apache.cassandra.cql3.QueryHandler;
  import org.apache.cassandra.cql3.QueryOptions;
  import org.apache.cassandra.cql3.QueryProcessor;
 -import org.apache.cassandra.cql3.statements.ParsedStatement;
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.Keyspace;
  import org.apache.cassandra.db.Memtable;
@@@ -132,15 -124,7 +133,8 @@@ import static org.apache.cassandra.dist
  
  public class Instance extends IsolatedExecutor implements IInvokableInstance
  {
- private static final Map, Function> mapper = new 
HashMap, Function>() {{
- this.put(IInstanceConfig.ParameterizedClass.class, (obj) -> {
- IInstanceConfig.ParameterizedClass pc = 
(IInstanceConfig.ParameterizedClass) obj;
- return new 
org.apache.cassandra.config.ParameterizedClass(pc.class_name, pc.parameters);
- });
- }};
- 
  public final IInstanceConfig config;
 +private final long startedAt = System.nanoTime();
  
  // should never be invoked directly, so that it is instantiated on other 
class loader;
  // only visible for inheritance
@@@ -254,70 -235,171 +248,74 @@@
  }).run();
  }
  
 -private void registerMockMessaging(ICluster cluster)
 +private void registerMockMessaging(ICluster cluster)
  {
 -BiConsumer deliverToInstance = (to, 
message) -> cluster.get(to).receiveMessage(message);
 -BiConsumer 
deliverToInstanceIfNotFiltered = (to, 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit bf1ea945b6fb1efb1730a3b8973325a26d51be39
Merge: 095540d 56f6cd9
Author: Alex Petrov 
AuthorDate: Thu Oct 22 09:50:14 2020 +0200

Merge branch 'cassandra-3.11' into trunk

 src/java/org/apache/cassandra/gms/Gossiper.java| 14 +-
 src/java/org/apache/cassandra/service/LoadBroadcaster.java |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 8f8d535,0e46767..316a3cd
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -32,8 -31,7 +32,9 @@@ import com.google.common.annotations.Vi
  import com.google.common.base.Throwables;
  import com.google.common.collect.ImmutableList;
  import com.google.common.collect.ImmutableMap;
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.ImmutableSet;
+ import com.google.common.collect.Sets;
  import com.google.common.util.concurrent.ListenableFutureTask;
  import com.google.common.util.concurrent.Uninterruptibles;
  
@@@ -757,9 -692,6 +758,8 @@@ public class Gossiper implements IFailu
  tokens = 
Collections.singletonList(StorageService.instance.getTokenMetadata().partitioner.getRandomToken());
  }
  
- // do not pass go, do not collect 200 dollars, just gtfo
 +long expireTime = computeExpireTime();
 +epState.addApplicationState(ApplicationState.STATUS_WITH_PORT, 
StorageService.instance.valueFactory.left(tokens, expireTime));
  epState.addApplicationState(ApplicationState.STATUS, 
StorageService.instance.valueFactory.left(tokens, computeExpireTime()));
  handleMajorStateChange(endpoint, epState);
  Uninterruptibles.sleepUninterruptibly(intervalInMillis * 4, 
TimeUnit.MILLISECONDS);
@@@ -784,16 -716,16 +784,16 @@@
   * @param epSet   a set of endpoint from which a random endpoint is 
chosen.
   * @return true if the chosen endpoint is also a seed.
   */
 -private boolean sendGossip(MessageOut message, 
Set epSet)
 +private boolean sendGossip(Message message, 
Set epSet)
  {
- List liveEndpoints = ImmutableList.copyOf(epSet);
 -List endpoints = ImmutableList.copyOf(epSet);
++List endpoints = ImmutableList.copyOf(epSet);
  
- int size = liveEndpoints.size();
+ int size = endpoints.size();
  if (size < 1)
  return false;
  /* Generate a random number from 0 -> size */
  int index = (size == 1) ? 0 : random.nextInt(size);
- InetAddressAndPort to = liveEndpoints.get(index);
 -InetAddress to = endpoints.get(index);
++InetAddressAndPort to = endpoints.get(index);
  if (logger.isTraceEnabled())
  logger.trace("Sending a GossipDigestSyn to {} ...", to);
  if (firstSynSendAt == 0)
@@@ -825,7 -754,8 +825,10 @@@
  double prob = unreachableEndpointCount / (liveEndpointCount + 1);
  double randDbl = random.nextDouble();
  if (randDbl < prob)
- sendGossip(message, unreachableEndpoints.keySet());
++{
+ sendGossip(message, Sets.filter(unreachableEndpoints.keySet(),
 -ep -> 
!isDeadState(endpointStateMap.get(ep;
++ep -> 
!isDeadState(getEndpointStateMap().get(ep;
++}
  }
  }
  


-
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-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 095540d54a07d2c35bd9260e065fcf346ad36164
Merge: 2edc5bb a2f59be
Author: Andrés de la Peña 
AuthorDate: Wed Oct 21 13:24:18 2020 +0100

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt |  1 +
 build.xml   | 14 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 04af373,af44f96..97762c1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,36 -9,16 +34,37 @@@ Merged from 3.0
   * Handle unexpected columns due to schema races (CASSANDRA-15899)
   * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
  Merged from 2.2:
+  * Package tools/bin scripts as executable (CASSANDRA-16151)
   * Fixed a NullPointerException when calling nodetool enablethrift 
(CASSANDRA-16127)
 + * Automatically drop compact storage on tables for which it is safe 
(CASSANDRA-16048)
  
 -3.11.8
 +4.0-beta2
 + * Add addition incremental repair visibility to nodetool repair_admin 
(CASSANDRA-14939)
 + * Always access system properties and environment variables via the new 
CassandraRelevantProperties and CassandraRelevantEnv classes (CASSANDRA-15876)
 + * Remove deprecated HintedHandOffManager (CASSANDRA-15939)
 + * Prevent repair from overrunning compaction (CASSANDRA-15817)
 + * fix cqlsh COPY functions in Python 3.8 on Mac (CASSANDRA-16053)
 + * Strip comment blocks from cqlsh input before processing statements 
(CASSANDRA-15802)
 + * Fix unicode chars error input (CASSANDRA-15990)
 + * Improved testability for CacheMetrics and ChunkCacheMetrics 
(CASSANDRA-15788)
 + * Handle errors in StreamSession#prepare (CASSANDRA-15852)
 + * FQL replay should have options to ignore DDL statements (CASSANDRA-16039)
 + * Remove COMPACT STORAGE internals (CASSANDRA-13994)
 + * Make TimestampSerializer accept fractional seconds of varying precision 
(CASSANDRA-15976)
 + * Improve cassandra-stress logging when using a profile file that doesn't 
exist (CASSANDRA-14425)
 + * Improve logging for socket connection/disconnection (CASSANDRA-15980)
 + * Throw FSWriteError upon write failures in order to apply DiskFailurePolicy 
(CASSANDRA-15928)
 + * Forbid altering UDTs used in partition keys (CASSANDRA-15933)
 + * Fix version parsing logic when upgrading from 3.0 (CASSANDRA-15973)
 + * Optimize NoSpamLogger use in hot paths (CASSANDRA-15766)
 + * Verify sstable components on startup (CASSANDRA-15945)
 + * Resolve JMX output inconsistencies from CASSANDRA-7544 
storage-port-configurable-per-node (CASSANDRA-15937)
 +Merged from 3.11:
   * Correctly interpret SASI's `max_compaction_flush_memory_in_mb` setting in 
megabytes not bytes (CASSANDRA-16071)
   * Fix short read protection for GROUP BY queries (CASSANDRA-15459)
 + * stop_paranoid disk failure policy is ignored on CorruptSSTableException 
after node is up (CASSANDRA-15191)
   * Frozen RawTuple is not annotated with frozen in the toString method 
(CASSANDRA-15857)
  Merged from 3.0:
 - * Use IF NOT EXISTS for index and UDT create statements in snapshot schema 
files (CASSANDRA-13935)
   * Fix gossip shutdown order (CASSANDRA-15816)
   * Remove broken 'defrag-on-read' optimization (CASSANDRA-15432)
   * Check for endpoint collision with hibernating nodes (CASSANDRA-14599)


-
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-3.11' into trunk

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit fec0fbe2915a544bb1660092d934a356cd46c0fa
Merge: 95d60a0 bca91ca
Author: Mick Semb Wever 
AuthorDate: Tue Oct 20 09:24:09 2020 +0200

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[dcapwell]

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 95d60a06f298cf3187c1f6cd7aa5cdb344f4f08c
Merge: 92f7c8d 7c407c4
Author: David Capwell 
AuthorDate: Mon Oct 19 12:32:29 2020 -0700

Merge branch 'cassandra-3.11' into trunk



-
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-3.11' into trunk

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit d890b7a5f14108bf60fbd52f94eefb53aaab1e18
Merge: 2ae1ec5 45982f5
Author: Andrés de la Peña 
AuthorDate: Tue Oct 13 16:19:51 2020 +0100

Merge branch 'cassandra-3.11' into trunk

# Conflicts:
#   src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java

 CHANGES.txt|  1 +
 .../cassandra/exceptions/StartupException.java |  1 +
 .../apache/cassandra/schema/SchemaKeyspace.java| 32 ++
 .../org/apache/cassandra/schema/TableMetadata.java | 12 
 .../apache/cassandra/service/StartupChecks.java|  4 +++
 5 files changed, 38 insertions(+), 12 deletions(-)

diff --cc CHANGES.txt
index 6829dac,98c23c5..a7701c7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,10 +1,33 @@@
 -3.11.9
 +4.0-beta3
++ * Move compact storage validation earlier in startup process 
(CASSANDRA-16063)
 + * Fix ByteBufferAccessor cast exceptions are thrown when trying to query a 
virtual table (CASSANDRA-16155)
 + * Consolidate node liveness check for forced repair (CASSANDRA-16113)
 + * Use unsigned short in ValueAccessor.sliceWithShortLength (CASSANDRA-16147)
 + * Abort repairs when getting a truncation request (CASSANDRA-15854)
 + * Remove bad assert when getting active compactions for an sstable 
(CASSANDRA-15457)
 + * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Prevent NPE in StreamMessage in type lookup (CASSANDRA-16131)
 + * Avoid invalid state transition exception during incremental repair 
(CASSANDRA-16067)
 + * Allow zero padding in timestamp serialization (CASSANDRA-16105)
 + * Add byte array backed cells (CASSANDRA-15393)
 + * Correctly handle pending ranges with adjacent range movements 
(CASSANDRA-14801)
 + * Avoid adding locahost when streaming trivial ranges (CASSANDRA-16099)
 + * Add nodetool getfullquerylog (CASSANDRA-15988)
 + * Fix yaml format and alignment in tpstats (CASSANDRA-11402)
 + * Avoid trying to keep track of RTs for endpoints we won't write to during 
read repair (CASSANDRA-16084)
 + * When compaction gets interrupted, the exception should include the 
compactionId (CASSANDRA-15954)
 + * Make Table/Keyspace Metric Names Consistent With Each Other 
(CASSANDRA-15909)
 + * Mutating sstable component may race with entire-sstable-streaming(ZCS) 
causing checksum validation failure (CASSANDRA-15861)
 + * NPE thrown while updating speculative execution time if keyspace is 
removed during task execution (CASSANDRA-15949)
 + * Show the progress of data streaming and index build (CASSANDRA-15406)
 + * Add flag to disable chunk cache and disable by default (CASSANDRA-16036)
 + * Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix 
(CASSANDRA-16150)
 +Merged from 3.11:
   * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
   * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
 - * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Use IF NOT EXISTS for index and UDT create statements in snapshot schema 
files (CASSANDRA-13935)
   * Make sure LCS handles duplicate sstable added/removed notifications 
correctly (CASSANDRA-14103)
  Merged from 3.0:
 - * Check SSTables for latest version before dropping compact storage 
(CASSANDRA-16063)
   * Handle unexpected columns due to schema races (CASSANDRA-15899)
   * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
  Merged from 2.2:
diff --cc src/java/org/apache/cassandra/exceptions/StartupException.java
index 1513cf9,1513cf9..85fd64e
--- a/src/java/org/apache/cassandra/exceptions/StartupException.java
+++ b/src/java/org/apache/cassandra/exceptions/StartupException.java
@@@ -26,6 -26,6 +26,7 @@@ public class StartupException extends E
  public final static int ERR_WRONG_MACHINE_STATE = 1;
  public final static int ERR_WRONG_DISK_STATE = 3;
  public final static int ERR_WRONG_CONFIG = 100;
++public final static int ERR_OUTDATED_SCHEMA = 101;
  
  public final int returnCode;
  
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index c404403,8b7ac84..0333ee6
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -39,11 -41,10 +39,12 @@@ import org.apache.cassandra.db.filter.C
  import org.apache.cassandra.db.marshal.*;
  import org.apache.cassandra.db.partitions.*;
  import org.apache.cassandra.db.rows.*;
 -import org.apache.cassandra.db.filter.ColumnFilter;
 -import org.apache.cassandra.db.view.View;
 -import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.exceptions.InvalidRequestException;
++import org.apache.cassandra.exceptions.StartupException;
 +import org.apache.cassandra.service.reads.SpeculativeRetryPolicy;
 +import 

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[dcapwell]

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 2ae1ec5dd2d98178f3ab4b3ed64a87147e713560
Merge: 0e0056c 34dde96
Author: David Capwell 
AuthorDate: Mon Oct 12 11:06:42 2020 -0700

Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt|   2 +
 build.xml  |   3 +
 .../apache/cassandra/service/CassandraDaemon.java  | 108 +--
 .../apache/cassandra/service/StorageService.java   |   2 +-
 .../distributed/impl/AbstractCluster.java  |  18 +-
 .../cassandra/distributed/impl/Instance.java   |  41 +++-
 .../cassandra/distributed/shared/Byteman.java  | 207 +
 .../cassandra/distributed/shared/Shared.java   |  37 
 .../test/BootstrapBinaryDisabledTest.java  | 165 
 .../test/ClientNetworkStopStartTest.java   |  79 
 .../distributed/test/TopologyChangeTest.java   |  45 +++--
 test/resources/byteman/stream_failure.btm  |  14 ++
 12 files changed, 633 insertions(+), 88 deletions(-)

diff --cc CHANGES.txt
index bf80c8c,ee70af5..6829dac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -29,34 -6,15 +29,36 @@@ Merged from 3.11
  Merged from 3.0:
   * Handle unexpected columns due to schema races (CASSANDRA-15899)
   * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
+ Merged from 2.2:
+  * Fixed a NullPointerException when calling nodetool enablethrift 
(CASSANDRA-16127)
  
 -3.11.8
 +4.0-beta2
 + * Add addition incremental repair visibility to nodetool repair_admin 
(CASSANDRA-14939)
 + * Always access system properties and environment variables via the new 
CassandraRelevantProperties and CassandraRelevantEnv classes (CASSANDRA-15876)
 + * Remove deprecated HintedHandOffManager (CASSANDRA-15939)
 + * Prevent repair from overrunning compaction (CASSANDRA-15817)
 + * fix cqlsh COPY functions in Python 3.8 on Mac (CASSANDRA-16053)
 + * Strip comment blocks from cqlsh input before processing statements 
(CASSANDRA-15802)
 + * Fix unicode chars error input (CASSANDRA-15990)
 + * Improved testability for CacheMetrics and ChunkCacheMetrics 
(CASSANDRA-15788)
 + * Handle errors in StreamSession#prepare (CASSANDRA-15852)
 + * FQL replay should have options to ignore DDL statements (CASSANDRA-16039)
 + * Remove COMPACT STORAGE internals (CASSANDRA-13994)
 + * Make TimestampSerializer accept fractional seconds of varying precision 
(CASSANDRA-15976)
 + * Improve cassandra-stress logging when using a profile file that doesn't 
exist (CASSANDRA-14425)
 + * Improve logging for socket connection/disconnection (CASSANDRA-15980)
 + * Throw FSWriteError upon write failures in order to apply DiskFailurePolicy 
(CASSANDRA-15928)
 + * Forbid altering UDTs used in partition keys (CASSANDRA-15933)
 + * Fix version parsing logic when upgrading from 3.0 (CASSANDRA-15973)
 + * Optimize NoSpamLogger use in hot paths (CASSANDRA-15766)
 + * Verify sstable components on startup (CASSANDRA-15945)
 + * Resolve JMX output inconsistencies from CASSANDRA-7544 
storage-port-configurable-per-node (CASSANDRA-15937)
 +Merged from 3.11:
   * Correctly interpret SASI's `max_compaction_flush_memory_in_mb` setting in 
megabytes not bytes (CASSANDRA-16071)
   * Fix short read protection for GROUP BY queries (CASSANDRA-15459)
 + * stop_paranoid disk failure policy is ignored on CorruptSSTableException 
after node is up (CASSANDRA-15191)
   * Frozen RawTuple is not annotated with frozen in the toString method 
(CASSANDRA-15857)
  Merged from 3.0:
 - * Use IF NOT EXISTS for index and UDT create statements in snapshot schema 
files (CASSANDRA-13935)
   * Fix gossip shutdown order (CASSANDRA-15816)
   * Remove broken 'defrag-on-read' optimization (CASSANDRA-15432)
   * Check for endpoint collision with hibernating nodes (CASSANDRA-14599)
diff --cc build.xml
index e026630,191c1c8..5c9ac2f
--- a/build.xml
+++ b/build.xml
@@@ -582,13 -412,20 +582,14 @@@



 -  
 -
 -  
 -
 -
 -  
 -  
 -  
 -   
 -  
 -  
 +  
 +  
 +  

 +  
 +  

+   

   

@@@ -731,19 -542,22 +732,20 @@@
  version="${version}"/>
  
  
 -
 +
+ 
 +
 +
 +
  
  
 -  
 -  
 +
 +
  
 -
 -  
 -  
 -  
 -  
 -
 +
  
 -
 -
 +
 +
  
  
  
@@@ -770,7 -572,14 +772,8 @@@
  version="${version}"/>
  
  
 -
+ 
 -
 -  
 -  
 -  

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[dcapwell]

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f6f46fe1a2f432ef2fc00af47855e16e149cab07
Merge: 16da961 925ad35
Author: David Capwell 
AuthorDate: Wed Oct 7 17:06:30 2020 -0700

Merge branch 'cassandra-3.11' into trunk

 .../org/apache/cassandra/distributed/impl/AbstractCluster.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc 
test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
index bd3f338,6fae4f0..3fee754
--- 
a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
@@@ -186,11 -163,11 +186,11 @@@ public abstract class AbstractCluster<
  
  private IInvokableInstance newInstance(int generation)
  {
- InstanceClassLoader classLoader = new 
InstanceClassLoader(generation, config.num(), version.classpath, 
sharedClassLoader);
+ ClassLoader classLoader = new InstanceClassLoader(generation, 
config.num(), version.classpath, sharedClassLoader);
  if (instanceInitializer != null)
  instanceInitializer.accept(classLoader, config.num());
 -return 
Instance.transferAdhoc((SerializableBiFunction)Instance::new, classLoader)
 -.apply(config, classLoader);
 +return 
Instance.transferAdhoc((SerializableBiFunction)Instance::new, classLoader)
 +
.apply(config.forVersion(version.major), classLoader);
  }
  
  public IInstanceConfig config()


-
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-3.11' into trunk

[dcapwell]

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 16da961f2bbe9a63d97844ecbc54c55838a5964a
Merge: 83e1e9e 6c8c791
Author: David Capwell 
AuthorDate: Wed Oct 7 14:34:11 2020 -0700

Merge branch 'cassandra-3.11' into trunk

 build.xml  | 22 +-
 .../diag/LastEventIdBroadcasterMBean.java  | 18 ++
 .../cassandra/hadoop/cql3/CqlClientHelper.java | 18 ++
 .../org/apache/cassandra/hints/InputPosition.java  | 18 ++
 .../apache/cassandra/schema/SchemaProvider.java| 18 ++
 src/java/org/apache/cassandra/tools/JMXTool.java   | 18 ++
 .../utils/logging/LogbackLoggingSupport.java   | 18 ++
 .../cassandra/utils/logging/LoggingSupport.java| 18 ++
 .../utils/logging/LoggingSupportFactory.java   | 18 ++
 .../utils/logging/NoOpFallbackLoggingSupport.java  | 18 ++
 .../cassandra/distributed/impl/FileLogAction.java  | 18 ++
 .../test/FullRepairCoordinatorTimeoutTest.java | 18 ++
 .../IncrementalRepairCoordinatorTimeoutTest.java   | 18 ++
 .../test/PreviewRepairCoordinatorTimeoutTest.java  | 18 ++
 .../distributed/test/RepairCoordinatorTimeout.java | 18 ++
 .../distributed/test/TableEstimatesTest.java   | 18 ++
 .../org/apache/cassandra/cql3/ViewComplexTest.java | 18 ++
 .../cql3/validation/operations/TTLTest.java| 18 ++
 .../apache/cassandra/db/marshal/EmptyTypeTest.java | 18 ++
 .../apache/cassandra/io/DiskSpaceMetricsTest.java  | 18 ++
 .../reads/repair/AbstractReadRepairTest.java   | 18 ++
 .../cassandra/tools/JMXCompatabilityTest.java  | 18 ++
 .../org/apache/cassandra/tools/JMXToolTest.java| 18 ++
 .../apache/cassandra/tools/TopPartitionsTest.java  | 18 ++
 .../org/apache/cassandra/utils/AssertUtil.java | 18 ++
 .../apache/cassandra/utils/ByteArrayUtilTest.java  | 18 ++
 .../org/apache/cassandra/utils/GeneratorsTest.java | 18 ++
 27 files changed, 489 insertions(+), 1 deletion(-)

diff --cc build.xml
index 6961cf9,f078d34..6a3eb1e
--- a/build.xml
+++ b/build.xml
@@@ -999,18 -861,9 +999,18 @@@
  
  
  
 -
 -
 +
 +
 +
 +
  
 +
 +
- 
 +
 +
 +
  
  
  
@@@ -1345,7 -1199,25 +1345,25 @@@

  
  
+ 
+   
+ 
+ 
+ 
+   
+   
+ 
+   
+ 
+   
+ 
+   
+ 
+   
+ 
+ 
 -  
 +  



diff --cc src/java/org/apache/cassandra/diag/LastEventIdBroadcasterMBean.java
index 03f05dc,000..01c7bbf
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/diag/LastEventIdBroadcasterMBean.java
+++ b/src/java/org/apache/cassandra/diag/LastEventIdBroadcasterMBean.java
@@@ -1,41 -1,0 +1,59 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one
++ * or more contributor license agreements.  See the NOTICE file
++ * distributed with this work for additional information
++ * regarding copyright ownership.  The ASF licenses this file
++ * to you under the Apache License, Version 2.0 (the
++ * "License"); you may not use this file except in compliance
++ * with the License.  You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
 +package org.apache.cassandra.diag;
 +
 +import java.util.Map;
 +
 +/**
 + * Provides a list of event types and the corresponding highest event IDs. 
Consumers may these IDs to determine
 + * if new data is available.
 + *
 + * Example result
 + *
 + * 
 + * 
 + * Event
 + * Last ID
 + * 
 + * 
 + * BootstrapEvent
 + * 312
 + * 
 + * 
 + * CompactionEvent
 + * a53f9338-5f24-11e8-9c2d-fa7ae01bbebc
 + * 
 + * 
 + *
 + * Clients may either retrieve the current list of all events IDs, or make 
conditional requests for event IDs
 + * based on the timestamp of the last update (much in the sense of e.g. 
HTTP's If-Modified-Since semantics).
 + */
 +public interface