fix show storage policy null pointer and redundant log (apache#10906)

* fix show storage policy null pointer and redundant log
924060929 · Jul 18, 2022 · 8c544b6 · 8c544b6
1 parent 77ef19d
commit 8c544b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/be/src/agent/task_worker_pool.cpp b/be/src/agent/task_worker_pool.cpp
@@ -1734,11 +1734,7 @@ void TaskWorkerPool::_storage_refresh_storage_policy_worker_thread_callback() {
 
         TGetStoragePolicyResult result;
         Status status = _master_client->refresh_storage_policy(&result);
-        if (!status.ok()) {
-            LOG(WARNING) << "refresh storage policy status not ok";
-        } else if (result.status.status_code != TStatusCode::OK) {
-            // LOG(WARNING) << "refresh storage policy result status status_code not ok";
-        } else {
+        if (status.ok() && result.status.status_code == TStatusCode::OK) {
             // update storage policy mgr.
             StoragePolicyMgr* spm = ExecEnv::GetInstance()->storage_policy_mgr();
             for (const auto& iter : result.result_entrys) {

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
@@ -2869,7 +2869,7 @@ public static void getDdlStmt(DdlStmt ddlStmt, String dbName, TableIf table, Lis
             }
 
             // storage policy
-            if (!olapTable.getStoragePolicy().equals("")) {
+            if (olapTable.getStoragePolicy() != null && !olapTable.getStoragePolicy().equals("")) {
                 sb.append(",\n\"").append(PropertyAnalyzer.PROPERTIES_STORAGE_POLICY).append("\" = \"");
                 sb.append(olapTable.getStoragePolicy()).append("\"");
             }