[shardingsphere] branch master updated: Revise #16336, change MDCConstants to LogMDCConstants. (#16347)

[yx9o]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0590586  Revise #16336, change MDCConstants to LogMDCConstants. 
(#16347)
0590586 is described below

commit 0590586192da9728e82de120ee5edd5d177a0042
Author: Raigor <raigor.ji...@gmail.com>
AuthorDate: Fri Mar 25 09:58:50 2022 +0800

    Revise #16336, change MDCConstants to LogMDCConstants. (#16347)
---
 .../proxy/frontend/command/CommandExecutorTask.java        | 14 +++++++-------
 .../constant/{MDCConstants.java => LogMDCConstants.java}   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
index a3a6185..7e52110 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
@@ -31,7 +31,7 @@ import 
org.apache.shardingsphere.proxy.backend.exception.BackendConnectionExcept
 import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
 import 
org.apache.shardingsphere.proxy.frontend.command.executor.CommandExecutor;
 import 
org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
-import org.apache.shardingsphere.proxy.frontend.constant.MDCConstants;
+import org.apache.shardingsphere.proxy.frontend.constant.LogMDCConstants;
 import org.apache.shardingsphere.proxy.frontend.exception.ExpectedExceptions;
 import 
org.apache.shardingsphere.proxy.frontend.spi.DatabaseProtocolFrontendEngine;
 import org.slf4j.MDC;
@@ -67,7 +67,7 @@ public final class CommandExecutorTask implements Runnable {
     public void run() {
         boolean isNeedFlush = false;
         try (PacketPayload payload = 
databaseProtocolFrontendEngine.getCodecEngine().createPacketPayload((ByteBuf) 
message, context.channel().attr(CommonConstants.CHARSET_ATTRIBUTE_KEY).get())) {
-            fillMDC();
+            fillLogMDC();
             connectionSession.getBackendConnection().prepareForTaskExecution();
             isNeedFlush = executeCommand(context, payload);
             // CHECKSTYLE:OFF
@@ -87,7 +87,7 @@ public final class CommandExecutorTask implements Runnable {
                 context.flush();
             }
             processClosedExceptions(exceptions);
-            clearMDC();
+            clearLogMDC();
         }
     }
     
@@ -135,12 +135,12 @@ public final class CommandExecutorTask implements 
Runnable {
         processException(ex);
     }
     
-    private void fillMDC() {
-        MDC.put(MDCConstants.SCHEMA_KEY, connectionSession.getSchemaName());
-        MDC.put(MDCConstants.USER_KEY, 
connectionSession.getGrantee().toString());
+    private void fillLogMDC() {
+        MDC.put(LogMDCConstants.SCHEMA_KEY, connectionSession.getSchemaName());
+        MDC.put(LogMDCConstants.USER_KEY, 
connectionSession.getGrantee().toString());
     }
     
-    private void clearMDC() {
+    private void clearLogMDC() {
         MDC.clear();
     }
 }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/constant/MDCConstants.java
 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/constant/LogMDCConstants.java
similarity index 94%
rename from 
shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/constant/MDCConstants.java
rename to 
shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/constant/LogMDCConstants.java
index 7229428..9d8d164 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/constant/MDCConstants.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/constant/LogMDCConstants.java
@@ -21,10 +21,10 @@ import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
 /**
- * MDC constants.
+ * MDC constants of log.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class MDCConstants {
+public final class LogMDCConstants {
     
     public static final String SCHEMA_KEY = "schema";