This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bbcf92b2c45e04e06554fb634166c0e37af38891
Merge: 20b4ca44d8 a9da19c311
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Wed May 1 14:42:22 2024 -0500
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Make queries visible to the "system_views.queries" virtual table at the
coordinator level
CHANGES.txt | 1 +
.../apache/cassandra/concurrent/TaskFactory.java | 20 +-
.../apache/cassandra/db/virtual/QueriesTable.java | 2 +-
.../distributed/test/QueriesTableTest.java | 221 ++++++++++++++++-----
4 files changed, 192 insertions(+), 52 deletions(-)
diff --cc CHANGES.txt
index 02509ad4dd,7e18e40c97..54f370529b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -70,6 -33,8 +70,7 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
+ * Make queries visible to the "system_views.queries" virtual table at the
coordinator level (CASSANDRA-19577)
- * Concurrent equivalent schema updates lead to unresolved disagreement
(CASSANDRA-19578)
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
