From 3ca94d65d3fd8f3f010f91e196b37608b08e0828 Mon Sep 17 00:00:00 2001 From: Ivan Senic Date: Wed, 15 Dec 2021 15:31:49 +0100 Subject: [PATCH] Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache patch by Ivan Senic; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-17202 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 4a7492079f21..1262f95db51b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.16 + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) Merged from 3.0: * Validate the existence of a datacenter in nodetool rebuild (CASSANDRA-14319) * Suppress CVE-2023-2251 (CASSANDRA-18497) diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java index 7de33a78b9dc..80f8286df1f8 100644 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@ -564,7 +564,8 @@ public static ResultMessage.Prepared getStoredPreparedStatement(String queryStri 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 ResultMessage.Prepared.forThrift(thriftStatementId, existing.boundNames); } else @@ -575,7 +576,8 @@ public static ResultMessage.Prepared getStoredPreparedStatement(String queryStri 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 new ResultMessage.Prepared(statementId, existing); } }