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 4cabe486e193aa5b9ce26239b3bc01d5b520b25d
Merge: d6159cfe15 256e39fc62
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Mon Oct 30 14:28:19 2023 -0500
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
ClientRequestSize metrics should not treat CONTAINS restrictions as being
equality-based
CHANGES.txt | 1 +
.../cql3/restrictions/SingleRestriction.java | 2 +-
.../ClientRequestRowAndColumnMetricsTest.java | 57 +++++++++++-----------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --cc CHANGES.txt
index 5e3057f3eb,e87484c643..f7708acdd8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-5.0-alpha2
+5.1
+ * Add ELAPSED command to cqlsh (CASSANDRA-18861)
+ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
+ * Clean up obsolete functions and simplify cql_version handling in cqlsh
(CASSANDRA-18787)
+Merged from 5.0:
+ * ClientRequestSize metrics should not treat CONTAINS restrictions as being
equality-based (CASSANDRA-18896)
* Add support for vector search in SAI (CASSANDRA-18715)
* Remove crc_check_chance from CompressionParams (CASSANDRA-18872)
* Fix schema loading of UDTs inside vectors inside UDTs (CASSANDRA-18964)
diff --cc
test/unit/org/apache/cassandra/metrics/ClientRequestRowAndColumnMetricsTest.java
index cb4b38897f,c0f659361e..80a3d3e0ce
---
a/test/unit/org/apache/cassandra/metrics/ClientRequestRowAndColumnMetricsTest.java
+++
b/test/unit/org/apache/cassandra/metrics/ClientRequestRowAndColumnMetricsTest.java
@@@ -619,7 -619,7 +619,6 @@@ public class ClientRequestRowAndColumnM
executeNet(CURRENT, "SELECT * FROM %s WHERE v CONTAINS 1 ALLOW
FILTERING");
assertEquals(1, ClientRequestSizeMetrics.totalRowsRead.getCount());
-- // The filtering term is provided by the client in the request, so we
don't consider that column read.
- assertEquals(2, ClientRequestSizeMetrics.totalColumnsRead.getCount());
+ assertEquals(3, ClientRequestSizeMetrics.totalColumnsRead.getCount());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
