JAVA-1235: Move the query to the end of "re-preparing .." log message as a key value.

vkasar · vkasar · commit eb19c802dfc1 · 2016-07-06T15:10:37.000-07:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -2,6 +2,7 @@
 
 ### 3.0.3 (in progress)
 
+- [improvement] JAVA-1235: Move the query to the end of "re-preparing .." log message as a key value.
 - [improvement] JAVA-1147: Upgrade Netty to 4.0.37.
 - [bug] JAVA-1213: Allow updates and inserts to BLOB column using read-only ByteBuffer.
 - [bug] JAVA-1209: ProtocolOptions.getProtocolVersion() should return null instead of throwing NPE if Cluster has not
diff --git a/driver-core/src/main/java/com/datastax/driver/core/Cluster.java b/driver-core/src/main/java/com/datastax/driver/core/Cluster.java
@@ -2128,8 +2128,8 @@ public void ensurePoolsSizing() {
         public PreparedStatement addPrepared(PreparedStatement stmt) {
             PreparedStatement previous = preparedQueries.putIfAbsent(stmt.getPreparedId().id, stmt);
             if (previous != null) {
-                logger.warn("Re-preparing already prepared query {}. Please note that preparing the same query more than once is "
-                        + "generally an anti-pattern and will likely affect performance. Consider preparing the statement only once.", stmt.getQueryString());
+                logger.warn("Re-preparing already prepared query is generally an anti-pattern and will likely affect performance. "
+                        + "Consider preparing the statement only once. Query='{}'", stmt.getQueryString());
 
                 // The one object in the cache will get GCed once it's not referenced by the client anymore since we use a weak reference.
                 // So we need to make sure that the instance we do return to the user is the one that is in the cache.
