Add logging for parameters

asyncer-io · Dec 15, 2023 · de202a7 · de202a7
1 parent 4517ade
commit de202a7
Show file tree

Hide file tree

Showing 39 changed files with 203 additions and 33 deletions.
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/Binding.java b/src/main/java/io/asyncer/r2dbc/mysql/Binding.java
@@ -51,27 +51,37 @@ void add(int index, MySqlParameter value) {
     }
 
     /**
-     * Converts bindings to a request message. If not need execute immediate, it will return a open cursor
+     * Converts bindings to a request message. If not need execute immediate, it will return an open cursor
      * message.
      *
      * @param statementId prepared statement identifier.
-     * @param immediate   if should be execute immediate, otherwise return a open cursor message
+     * @param immediate   if it should be executed immediate, otherwise return an open cursor message
      * @return an execute message or open cursor message
      */
     PreparedExecuteMessage toExecuteMessage(int statementId, boolean immediate) {
         if (values.length == 0) {
+            QueryLogger.log(statementId, EMPTY_VALUES);
+
             return new PreparedExecuteMessage(statementId, immediate, EMPTY_VALUES);
         }
 
         if (values[0] == null) {
             throw new IllegalStateException("Parameters has been used");
         }
 
-        return new PreparedExecuteMessage(statementId, immediate, drainValues());
+        MySqlParameter[] values = drainValues();
+
+        QueryLogger.log(statementId, values);
+
+        return new PreparedExecuteMessage(statementId, immediate, values);
     }
 
     PreparedTextQueryMessage toTextMessage(Query query) {
-        return new PreparedTextQueryMessage(query, drainValues());
+        MySqlParameter[] values = drainValues();
+
+        QueryLogger.log(query, values);
+
+        return new PreparedTextQueryMessage(query, values);
     }
 
     /**

diff --git a/src/main/java/io/asyncer/r2dbc/mysql/QueryFlow.java b/src/main/java/io/asyncer/r2dbc/mysql/QueryFlow.java
@@ -377,8 +377,6 @@ public boolean isDisposed() {
     @Override
     protected void tryNextOrComplete(@Nullable SynchronousSink<ServerMessage> sink) {
         if (this.bindings.hasNext()) {
-            QueryLogger.log(this.query);
-
             PreparedTextQueryMessage message = this.bindings.next().toTextMessage(this.query);
             Sinks.EmitResult result = this.requests.tryEmitNext(message);
 
@@ -519,6 +517,7 @@ public void subscribe(CoreSubscriber<? super ClientMessage> actual) {
             // Should reset only when it comes from cache.
             this.shouldClose = false;
             this.statementId = statementId;
+            QueryLogger.log(statementId, sql);
             Sinks.EmitResult result = this.requests.tryEmitNext(new PreparedResetMessage(statementId));
 
             if (result != Sinks.EmitResult.OK) {
@@ -553,6 +552,7 @@ public void accept(ServerMessage message, SynchronousSink<ServerMessage> sink) {
                     int parameters = ok.getTotalParameters();
 
                     this.statementId = statementId;
+                    QueryLogger.log(statementId, sql);
 
                     // columns + parameters <= 0, has not metadata follow in,
                     if (columns <= -parameters) {

diff --git a/src/main/java/io/asyncer/r2dbc/mysql/QueryLogger.java b/src/main/java/io/asyncer/r2dbc/mysql/QueryLogger.java
@@ -28,14 +28,22 @@ final class QueryLogger {
     private static final InternalLogger logger = InternalLoggerFactory.getInstance("io.asyncer.r2dbc.mysql.QUERY");
 
     static void log(String query) {
-        logger.debug("Executing direct query: {}", query);
+        logger.debug("Executing statement [{}]", query);
     }
 
-    static void log(Query query) {
+    static void log(int statementId, String query) {
+        logger.debug("Prepared statement {} [{}]", statementId, query);
+    }
+
+    static void log(Query query, MySqlParameter[] values) {
         if (logger.isDebugEnabled()) {
-            logger.debug("Executing format query: {}", query.getFormattedSql());
+            logger.debug("Executing statement [{}] with {}", query.getFormattedSql(), values);
         }
     }
 
+    static void log(int statementId, MySqlParameter[] values) {
+        logger.debug("Executing prepared statement {} with {}", statementId, values);
+    }
+
     private QueryLogger() { }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/AbstractMySqlParameter.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/AbstractMySqlParameter.java
@@ -24,8 +24,5 @@
 abstract class AbstractMySqlParameter implements MySqlParameter {
 
     @Override
-    public final String toString() {
-        // Hide parameter detail even its type.
-        return "Parameter{REDACTED}";
-    }
+    public abstract String toString();
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/BigDecimalCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/BigDecimalCodec.java
@@ -170,5 +170,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/BigIntegerCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/BigIntegerCodec.java
@@ -180,5 +180,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/BitSetCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/BitSetCodec.java
@@ -171,5 +171,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return (int) (value ^ (value >>> 32));
         }
+
+        @Override
+        public String toString() {
+            return Long.toBinaryString(value);
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/BlobCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/BlobCodec.java
@@ -217,5 +217,11 @@ protected Publisher<Void> getDiscard() {
             Blob blob = this.blob.getAndSet(null);
             return blob == null ? null : blob.discard();
         }
+
+        @Override
+        public String toString() {
+            Blob blob = this.blob.get();
+            return blob == null ? "Blob[MOVED]" : blob.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/BooleanCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/BooleanCodec.java
@@ -101,5 +101,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return (value ? 1 : 0);
         }
+
+        @Override
+        public String toString() {
+            return Boolean.toString(value);
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/ByteArrayCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/ByteArrayCodec.java
@@ -127,5 +127,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return Arrays.hashCode(value);
         }
+
+        @Override
+        public String toString() {
+            return Arrays.toString(value);
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/ByteBufferCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/ByteBufferCodec.java
@@ -126,5 +126,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return buffer.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return buffer.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/ByteCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/ByteCodec.java
@@ -98,5 +98,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value;
         }
+
+        @Override
+        public String toString() {
+            return Byte.toString(value);
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/ClobCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/ClobCodec.java
@@ -197,5 +197,11 @@ protected Publisher<Void> getDiscard() {
             Clob clob = this.clob.getAndSet(null);
             return clob == null ? null : clob.discard();
         }
+
+        @Override
+        public String toString() {
+            Clob clob = this.clob.get();
+            return clob == null ? "Clob[MOVED]" : clob.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/DoubleCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/DoubleCodec.java
@@ -161,5 +161,10 @@ public int hashCode() {
             long temp = Double.doubleToLongBits(value);
             return (int) (temp ^ (temp >>> 32));
         }
+
+        @Override
+        public String toString() {
+            return Double.toString(value);
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/DurationCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/DurationCodec.java
@@ -262,5 +262,10 @@ private void encodeTo(ParameterWriter writer) {
 
             encodeTime(writer, isNegative, hours, minutes, seconds, micros);
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/EnumCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/EnumCodec.java
@@ -108,5 +108,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/FloatCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/FloatCodec.java
@@ -160,5 +160,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return (value != 0.0f ? Float.floatToIntBits(value) : 0);
         }
+
+        @Override
+        public String toString() {
+            return Float.toString(value);
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/InstantCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/InstantCodec.java
@@ -114,5 +114,10 @@ public int hashCode() {
         private LocalDateTime serverValue() {
             return LocalDateTime.ofInstant(value, context.getServerZoneId());
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/IntegerCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/IntegerCodec.java
@@ -163,5 +163,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value;
         }
+
+        @Override
+        public String toString() {
+            return Integer.toString(value);
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/LocalDateCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/LocalDateCodec.java
@@ -200,5 +200,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/LocalDateTimeCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/LocalDateTimeCodec.java
@@ -202,5 +202,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/LocalTimeCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/LocalTimeCodec.java
@@ -237,5 +237,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/LongCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/LongCodec.java
@@ -167,5 +167,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return (int) (value ^ (value >>> 32));
         }
+
+        @Override
+        public String toString() {
+            return Long.toString(value);
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/NullMySqlParameter.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/NullMySqlParameter.java
@@ -65,7 +65,7 @@ public void dispose() {
     @Override
     public String toString() {
         // Hide parameter detail even it is null.
-        return "Parameter{REDACTED}";
+        return "null";
     }
 
     private NullMySqlParameter() { }

diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/OffsetDateTimeCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/OffsetDateTimeCodec.java
@@ -123,5 +123,10 @@ private LocalDateTime serverValue() {
                 value.withOffsetSameInstant((ZoneOffset) zone).toLocalDateTime() :
                 value.toZonedDateTime().withZoneSameInstant(zone).toLocalDateTime();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/OffsetTimeCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/OffsetTimeCodec.java
@@ -120,5 +120,10 @@ private LocalTime serverValue() {
             return value.toLocalTime()
                 .plusSeconds(offset.getTotalSeconds() - value.getOffset().getTotalSeconds());
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/SetCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/SetCodec.java
@@ -343,6 +343,11 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 
     private static final class StringArrayMySqlParameter extends AbstractMySqlParameter {
@@ -400,5 +405,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/ShortCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/ShortCodec.java
@@ -105,5 +105,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value;
         }
+
+        @Override
+        public String toString() {
+            return Short.toString(value);
+        }
     }
 }
diff --git a/src/main/java/io/asyncer/r2dbc/mysql/codec/StringCodec.java b/src/main/java/io/asyncer/r2dbc/mysql/codec/StringCodec.java
@@ -129,5 +129,10 @@ public boolean equals(Object o) {
         public int hashCode() {
             return value.hashCode();
         }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
     }
 }