(doris) 01/01: [fix](repository) fix NullPointerException when execute create repository statement without properties (#30972)

[caiconghui]

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

caiconghui pushed a commit to branch cherry-pick-null
in repository https://gitbox.apache.org/repos/asf/doris.git

commit aac1150fc89953bf37c00f697224c001458d166d
Author: caiconghui <55968745+caicong...@users.noreply.github.com>
AuthorDate: Sun Feb 18 16:33:41 2024 +0800

    [fix](repository) fix NullPointerException when execute create repository 
statement without properties (#30972)
    
    Co-authored-by: caiconghui1 <caicongh...@jd.com>
---
 fe/fe-core/src/main/cup/sql_parser.cup                                | 4 ++--
 .../src/main/java/org/apache/doris/analysis/RefreshCatalogStmt.java   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fe/fe-core/src/main/cup/sql_parser.cup 
b/fe/fe-core/src/main/cup/sql_parser.cup
index 3f279c2d2dd..7920c962efb 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -3486,7 +3486,7 @@ key_value_map ::=
 
 opt_properties ::=
     {:
-    RESULT = null;
+    RESULT = Maps.newHashMap();
     :}
     | properties:properties
     {:
@@ -3496,7 +3496,7 @@ opt_properties ::=
 
 opt_ext_properties ::=
     {:
-    RESULT = null;
+    RESULT = Maps.newHashMap();
     :}
     | KW_BROKER properties:properties
     {:
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/RefreshCatalogStmt.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/RefreshCatalogStmt.java
index 006eebe44b3..a2e5930d142 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/RefreshCatalogStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/RefreshCatalogStmt.java
@@ -73,7 +73,8 @@ public class RefreshCatalogStmt extends DdlStmt {
         }
 
         // Set to false only if user set the property "invalid_cache"="false"
-        invalidCache = !(properties != null && 
properties.get(INVALID_CACHE).equalsIgnoreCase("false"));
+        invalidCache = !(properties.get(INVALID_CACHE) != null && 
properties.get(INVALID_CACHE)
+                .equalsIgnoreCase("false"));
     }
 
     @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org