From 99ad37985a74aab4900c225eb418b8a7498e76b2 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 25 Oct 2021 09:08:52 +0200 Subject: [PATCH] =?UTF-8?q?Use=20string=20concatenation=20in=20QueryExtrac?= =?UTF-8?q?torDelegate=20instead=20of=20String.format(=E2=80=A6).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now use string concatenation during query extraction to avoid String.format(…) overhead for unknown queries. Closes #1186 --- .../cassandra/core/cql/QueryExtractorDelegate.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryExtractorDelegate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryExtractorDelegate.java index 29ccfc799..70053f1ae 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryExtractorDelegate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryExtractorDelegate.java @@ -15,8 +15,6 @@ */ package org.springframework.data.cassandra.core.cql; -import org.springframework.lang.Nullable; - import com.datastax.oss.driver.api.core.cql.BatchStatement; import com.datastax.oss.driver.api.core.cql.BatchableStatement; import com.datastax.oss.driver.api.core.cql.BoundStatement; @@ -24,6 +22,9 @@ import com.datastax.oss.driver.api.core.cql.PreparedStatement; import com.datastax.oss.driver.api.core.cql.SimpleStatement; import com.datastax.oss.driver.api.core.cql.Statement; +import org.springframework.lang.Nullable; +import org.springframework.util.ObjectUtils; + /** * Utility to extract CQL queries from a {@link Statement}. * @@ -68,12 +69,16 @@ public class QueryExtractorDelegate { for (BatchableStatement batchableStatement : ((BatchStatement) statement)) { String query = getCql(batchableStatement); - builder.append(query).append(query.endsWith(";") ? "" : ";"); + builder.append(query); + + if (!ObjectUtils.isEmpty(query)) { + builder.append(query.endsWith(";") ? "" : ";"); + } } return builder.toString(); } - return String.format("Unknown: %s", statement); + return "Unknown: " + statement; } }