This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 8c544b6e13 fix show storage policy null pointer and redundant log
(#10906)
8c544b6e13 is described below
commit 8c544b6e13dc2a666b4a910db304d1a08896a55b
Author: deardeng <[email protected]>
AuthorDate: Mon Jul 18 14:08:54 2022 +0800
fix show storage policy null pointer and redundant log (#10906)
* fix show storage policy null pointer and redundant log
---
be/src/agent/task_worker_pool.cpp | 6 +-----
fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/be/src/agent/task_worker_pool.cpp
b/be/src/agent/task_worker_pool.cpp
index 57bda418a3..e3c101b11f 100644
--- 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
index d30df42217..d578582feb 100755
--- 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 class Catalog {
}
// 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("\"");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
