(asterixdb) branch master updated: [NO ISSUE][OTH] Log upsert/insert statements at debug level

[peeyush]

This is an automated email from the ASF dual-hosted git repository.

peeyush pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 51d848ca75 [NO ISSUE][OTH] Log upsert/insert statements at debug level
51d848ca75 is described below

commit 51d848ca75059bfb3ad165eb0accc9db3d7f8701
Author: Peeyush Gupta <peeyush.gu...@couchbase.com>
AuthorDate: Fri Nov 10 16:06:01 2023 -0800

    [NO ISSUE][OTH] Log upsert/insert statements at debug level
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Change-Id: I5e5d9680ef7d263e67ce9d3d3b8c1321a93e3761
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17949
    Reviewed-by: Murtadha Hubail <mhub...@apache.org>
    Tested-by: Murtadha Hubail <mhub...@apache.org>
    Integration-Tests: Murtadha Hubail <mhub...@apache.org>
---
 .../apache/asterix/api/http/server/QueryServiceServlet.java  | 12 ++++++++----
 .../asterix/app/message/ExecuteStatementRequestMessage.java  | 12 +++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
index a33102cc0c..8f68861783 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
@@ -278,7 +278,14 @@ public class QueryServiceServlet extends 
AbstractQueryApiServlet {
             if (forceReadOnly) {
                 param.setReadOnly(true);
             }
-            if (LOGGER.isInfoEnabled()) {
+            String statement = param.getStatement();
+            statement = statement == null || (!statement.isEmpty() && 
statement.charAt(statement.length() - 1) == ';')
+                    ? statement : (statement + ";");
+            if (statement != null && (statement.startsWith("UPSERT") || 
statement.startsWith("INSERT"))
+                    && LOGGER.isDebugEnabled()) {
+                LOGGER.debug("handleRequest: uuid={}, clientContextID={}, {}", 
requestRef.getUuid(),
+                        param.getClientContextID(), 
LogRedactionUtil.statement(param.toString()));
+            } else if (LOGGER.isInfoEnabled()) {
                 LOGGER.info("handleRequest: uuid={}, clientContextID={}, {}", 
requestRef.getUuid(),
                         param.getClientContextID(), 
LogRedactionUtil.statement(param.toString()));
             }
@@ -287,9 +294,6 @@ public class QueryServiceServlet extends 
AbstractQueryApiServlet {
             final ResultProperties resultProperties = new 
ResultProperties(delivery, param.getMaxResultReads());
             buildResponseHeaders(requestRef, sessionOutput, param, 
responsePrinter, delivery);
             responsePrinter.printHeaders();
-            String statement = param.getStatement();
-            statement = statement == null || (!statement.isEmpty() && 
statement.charAt(statement.length() - 1) == ';')
-                    ? statement : (statement + ";");
             validateStatement(statement);
             if (param.isParseOnly()) {
                 ResultUtil.ParseOnlyResult parseOnlyResult = 
parseStatement(statement);
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
index e31417798b..ed81dd8f6b 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
@@ -243,8 +243,14 @@ public class ExecuteStatementRequestMessage implements 
ICcAddressedMessage {
 
     @Override
     public String toString() {
-        return String.format("%s(id=%s, from=%s, uuid=%s, clientContextID=%s): 
%s", getClass().getSimpleName(),
-                requestMessageId, requestNodeId, requestReference.getUuid(), 
clientContextID,
-                LogRedactionUtil.statement(statementsText));
+        if (statementsText != null && (statementsText.startsWith("UPSERT") || 
statementsText.startsWith("INSERT"))) {
+            return String.format("%s(id=%s, from=%s, uuid=%s, 
clientContextID=%s): %s", getClass().getSimpleName(),
+                    requestMessageId, requestNodeId, 
requestReference.getUuid(), clientContextID,
+                    "UPSERT/INSERT statement");
+        } else {
+            return String.format("%s(id=%s, from=%s, uuid=%s, 
clientContextID=%s): %s", getClass().getSimpleName(),
+                    requestMessageId, requestNodeId, 
requestReference.getUuid(), clientContextID,
+                    LogRedactionUtil.statement(statementsText));
+        }
     }
 }