fix checkstyle

924060929 · Jul 16, 2024 · e1b824a · e1b824a
1 parent 8cce207
commit e1b824a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/NereidsSqlCacheManager.java b/fe/fe-core/src/main/java/org/apache/doris/common/NereidsSqlCacheManager.java
@@ -127,7 +127,7 @@ public void tryAddFeSqlCache(ConnectContext connectContext, String sql) {
 
         SqlCacheContext sqlCacheContext = sqlCacheContextOpt.get();
         UserIdentity currentUserIdentity = connectContext.getCurrentUserIdentity();
-        String key = sqlCacheContext.cacheKeyType == CacheKeyType.SQL
+        String key = sqlCacheContext.getCacheKeyType() == CacheKeyType.SQL
                 ? currentUserIdentity.toString() + ":" + sql.trim()
                 : currentUserIdentity.toString() + ":" + DebugUtil.printId(sqlCacheContext.getOrComputeCacheKeyMd5());
         if (sqlCaches.getIfPresent(key) == null && sqlCacheContext.getOrComputeCacheKeyMd5() != null
@@ -147,7 +147,7 @@ public void tryAddBeCache(ConnectContext connectContext, String sql, CacheAnalyz
         }
         SqlCacheContext sqlCacheContext = sqlCacheContextOpt.get();
         UserIdentity currentUserIdentity = connectContext.getCurrentUserIdentity();
-        String key = sqlCacheContext.cacheKeyType == CacheKeyType.SQL
+        String key = sqlCacheContext.getCacheKeyType() == CacheKeyType.SQL
                 ? currentUserIdentity.toString() + ":" + sql.trim()
                 : currentUserIdentity.toString() + ":" + DebugUtil.printId(sqlCacheContext.getOrComputeCacheKeyMd5());
         if (sqlCaches.getIfPresent(key) == null && sqlCacheContext.getOrComputeCacheKeyMd5() != null) {
@@ -188,7 +188,7 @@ public Optional<LogicalSqlCache> tryParseSql(ConnectContext connectContext, Stri
             // already exist cache in the fe, but the variable is different to this query,
             // we should create another cache context in fe, use another cache key
             connectContext.getStatementContext()
-                    .getSqlCacheContext().ifPresent(ctx -> ctx.cacheKeyType = CacheKeyType.MD5);
+                    .getSqlCacheContext().ifPresent(ctx -> ctx.setCacheKeyType(CacheKeyType.MD5));
 
             if (sqlCacheContextWithVariable != null) {
                 return tryParseSqlWithoutCheckVariable(

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/SqlCacheContext.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/SqlCacheContext.java
@@ -86,7 +86,7 @@ public class SqlCacheContext {
     private volatile PUniqueId cacheKeyMd5;
     private volatile ResultSet resultSetInFe;
 
-    public volatile CacheKeyType cacheKeyType = CacheKeyType.SQL;
+    private volatile CacheKeyType cacheKeyType = CacheKeyType.SQL;
 
     public SqlCacheContext(UserIdentity userIdentity, TUniqueId queryId) {
         this.userIdentity = Objects.requireNonNull(userIdentity, "userIdentity cannot be null");
@@ -394,6 +394,14 @@ public void setResultSetInFe(ResultSet resultSetInFe) {
         this.resultSetInFe = resultSetInFe;
     }
 
+    public CacheKeyType getCacheKeyType() {
+        return cacheKeyType;
+    }
+
+    public void setCacheKeyType(CacheKeyType cacheKeyType) {
+        this.cacheKeyType = cacheKeyType;
+    }
+
     /** FullTableName */
     @lombok.Data
     @lombok.AllArgsConstructor

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
@@ -271,7 +271,7 @@ public void executeQuery(MysqlCommand mysqlCommand, String originStmt) throws Ex
                 Optional<SqlCacheContext> sqlCacheContext = ConnectContext.get()
                         .getStatementContext().getSqlCacheContext();
                 if (sqlCacheContext.isPresent()) {
-                    cacheKeyType = sqlCacheContext.get().cacheKeyType;
+                    cacheKeyType = sqlCacheContext.get().getCacheKeyType();
                 }
                 if (cachedStmts != null) {
                     stmts = cachedStmts;
@@ -378,7 +378,7 @@ public void executeQuery(MysqlCommand mysqlCommand, String originStmt) throws Ex
                 if (cacheKeyType != null) {
                     SqlCacheContext sqlCacheContext =
                             executor.getContext().getStatementContext().getSqlCacheContext().get();
-                    sqlCacheContext.cacheKeyType = cacheKeyType;
+                    sqlCacheContext.setCacheKeyType(cacheKeyType);
                 }
 
                 try {