Merge pull request #3811 from actiontech/inner-2347

[inner-2347] fix npe
actiontech · Sep 6, 2023 · 341fdcd · 341fdcd
2 parents dd30300 + 1755e6c
commit 341fdcd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/actiontech/dble/services/manager/response/ShowHelp.java b/src/main/java/com/actiontech/dble/services/manager/response/ShowHelp.java
@@ -237,9 +237,9 @@ private static RowDataPacket getRow(String stmt, String desc, String charset) {
 
         HELPS.put("show @@statistic", "Turn off statistic information");
         HELPS.put("enable @@statistic", "Turn on statistic sql");
-        HELPS.put("enable @@enableStatisticAnalysis", "Turn on statistic analysis sql('show @@sql.sum.user/table' or 'show @@sql.condition')");
+        HELPS.put("enable @@statisticAnalysis", "Turn on statistic analysis sql('show @@sql.sum.user/table' or 'show @@sql.condition')");
         HELPS.put("disable @@statistic", "Turn off statistic sql");
-        HELPS.put("disable @@enableStatisticAnalysis", "Turn off statistic analysis sql('show @@sql.sum.user/table' or 'show @@sql.condition')");
+        HELPS.put("disable @@statisticAnalysis", "Turn off statistic analysis sql('show @@sql.sum.user/table' or 'show @@sql.condition')");
         HELPS.put("reload @@statistic_table_size = ? [where table='?' | where table in (dble_information.tableA,...)]", "Statistic table size");
         HELPS.put("reload @@samplingRate=?", "Reset the samplingRate size");
         HELPS.put("show @@statistic_queue.usage", "Show the queue usage");

diff --git a/src/main/java/com/actiontech/dble/statistic/sql/handler/SqlStatisticHandler.java b/src/main/java/com/actiontech/dble/statistic/sql/handler/SqlStatisticHandler.java
@@ -229,7 +229,7 @@ public long getExaminedRows() {
         }
 
         public String getSqlDigest() {
-            if (init.compareAndSet(false, true)) {
+            if (init.compareAndSet(false, true) || this.sqlDigest == null) {
                 try {
                     if (stmt.equalsIgnoreCase("begin")) {
                         this.sqlDigest = "begin";