natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Stefan Miklosovic 2023-05-18 22:36:50 +02:00
parent 1053e3b475 3ca94d65d3
commit ff820290dd
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -8,6 +8,7 @@
* Deadlock updating sstable metadata if disk boundaries need reloading (CASSANDRA-18443)
* Fix nested selection of reversed collections (CASSANDRA-17913)
Merged from 3.11:
* Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202)
* Fix the capital P usage in the CQL parser (CASSANDRA-17919)
Merged from 3.0:
* Validate the existence of a datacenter in nodetool rebuild (CASSANDRA-14319)

3
src/java/org/apache/cassandra/cql3/QueryProcessor.java
View File

@ -653,7 +653,8 @@ public class QueryProcessor implements QueryHandler
return null;
checkTrue(queryString.equals(existing.rawCQLStatement),
String.format("MD5 hash collision: query with the same MD5 hash was already prepared. \n Existing: '%s'", existing.rawCQLStatement));
"MD5 hash collision: query with the same MD5 hash was already prepared. \n Existing: '%s'",
existing.rawCQLStatement);
return createResultMessage(statementId, existing);
}