From aac1150fc89953bf37c00f697224c001458d166d Mon Sep 17 00:00:00 2001 From: caiconghui <55968745+caiconghui@users.noreply.github.com> Date: Sun, 18 Feb 2024 16:33:41 +0800 Subject: [PATCH] [fix](repository) fix NullPointerException when execute create repository statement without properties (#30972) Co-authored-by: caiconghui1 --- fe/fe-core/src/main/cup/sql_parser.cup | 4 ++-- .../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 3f279c2d2dd234..7920c962efbef6 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 006eebe44b3912..a2e5930d142ca1 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 void analyze(Analyzer analyzer) throws UserException { } // 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