This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 14439d265b3 [feature](Vault) Support unset default storage vault
(#33679)
14439d265b3 is described below
commit 14439d265b33a959480f26175af5c93dab7de894
Author: AlexYue <[email protected]>
AuthorDate: Wed Apr 17 21:04:52 2024 +0800
[feature](Vault) Support unset default storage vault (#33679)
---
cloud/src/meta-service/meta_service_resource.cpp | 10 ++++++++
fe/fe-core/src/main/cup/sql_parser.cup | 10 +++++++-
.../analysis/UnsetDefaultStorageVaultStmt.java | 29 ++++++++++++++++++++++
.../org/apache/doris/catalog/StorageVaultMgr.java | 17 +++++++++++++
.../main/java/org/apache/doris/qe/DdlExecutor.java | 3 +++
gensrc/proto/cloud.proto | 1 +
6 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/cloud/src/meta-service/meta_service_resource.cpp
b/cloud/src/meta-service/meta_service_resource.cpp
index 6afff87d76b..b4ea3a75d94 100644
--- a/cloud/src/meta-service/meta_service_resource.cpp
+++ b/cloud/src/meta-service/meta_service_resource.cpp
@@ -593,6 +593,8 @@ void
MetaServiceImpl::alter_obj_store_info(google::protobuf::RpcController* cont
msg = "Unknown alter info " + proto_to_json(*request);
return;
} break;
+ case AlterObjStoreInfoRequest::UNSET_DEFAULT_VAULT:
+ break;
}
// TODO(dx): check s3 info right
@@ -798,6 +800,14 @@ void
MetaServiceImpl::alter_obj_store_info(google::protobuf::RpcController* cont
response->set_storage_vault_id(*id_itr);
break;
}
+ case AlterObjStoreInfoRequest::UNSET_DEFAULT_VAULT: {
+ LOG_INFO("unset instance's default vault, instance id {}, previoud
default vault {}, id {}",
+ instance.instance_id(), instance.default_storage_vault_name(),
+ instance.default_storage_vault_id());
+ instance.clear_default_storage_vault_id();
+ instance.clear_default_storage_vault_name();
+ break;
+ }
default: {
code = MetaServiceCode::INVALID_ARGUMENT;
ss << "invalid request op, op=" << request->op();
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup
b/fe/fe-core/src/main/cup/sql_parser.cup
index bbb54aa8cf2..85e13af50dd 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -705,7 +705,7 @@ nonterminal List<StatementBase> stmts;
nonterminal StatementBase stmt, show_stmt, show_param, help_stmt, load_stmt,
create_routine_load_stmt, pause_routine_load_stmt,
resume_routine_load_stmt, stop_routine_load_stmt,
show_routine_load_stmt, show_routine_load_task_stmt,
show_create_routine_load_stmt, show_create_load_stmt,
show_create_reporitory_stmt,
- describe_stmt, alter_stmt, unset_var_stmt,
+ describe_stmt, alter_stmt, unset_var_stmt,
unset_default_storage_vault_stmt,
create_job_stmt, pause_job_stmt, resume_job_stmt,stop_job_stmt,
cancel_job_task_stmt,
use_stmt, use_cloud_cluster_stmt, kill_stmt, drop_stmt, recover_stmt,
grant_stmt, revoke_stmt, create_stmt, set_stmt, sync_stmt, cancel_stmt,
cancel_param, delete_stmt,
switch_stmt, transaction_stmt, unsupported_stmt, export_stmt, admin_stmt,
truncate_stmt,
@@ -1151,6 +1151,8 @@ stmt ::=
{: RESULT = set; :}
| unset_var_stmt:stmt
{: RESULT = stmt; :}
+ | unset_default_storage_vault_stmt:stmt
+ {: RESULT = stmt; :}
| kill_stmt:kill
{: RESULT = kill; :}
| kill_analysis_job_stmt: k
@@ -5281,6 +5283,12 @@ unset_var_stmt ::=
:}
;
+unset_default_storage_vault_stmt ::=
+ KW_UNSET KW_DEFAULT KW_STORAGE KW_VAULT
+ {:
+ RESULT = new UnsetDefaultStorageVaultStmt();
+ :};
+
user_property_list ::=
user_property:property
{:
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/UnsetDefaultStorageVaultStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/UnsetDefaultStorageVaultStmt.java
new file mode 100644
index 00000000000..fad2f008355
--- /dev/null
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/UnsetDefaultStorageVaultStmt.java
@@ -0,0 +1,29 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.analysis;
+
+public class UnsetDefaultStorageVaultStmt extends DdlStmt {
+
+ public UnsetDefaultStorageVaultStmt() {}
+
+ @Override
+ public String toSql() {
+ final String stmt = "UNSET DEFAULT STORAGE VAULT";
+ return stmt;
+ }
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/StorageVaultMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/StorageVaultMgr.java
index db213d4dc77..3cc92d22485 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/StorageVaultMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/StorageVaultMgr.java
@@ -102,6 +102,23 @@ public class StorageVaultMgr {
setDefaultStorageVault(Pair.of(stmt.getStorageVaultName(), vaultId));
}
+ public void unsetDefaultStorageVault() throws DdlException {
+ Cloud.AlterObjStoreInfoRequest.Builder builder =
Cloud.AlterObjStoreInfoRequest.newBuilder();
+ builder.setOp(Operation.UNSET_DEFAULT_VAULT);
+ try {
+ Cloud.AlterObjStoreInfoResponse resp =
+
MetaServiceProxy.getInstance().alterObjStoreInfo(builder.build());
+ if (resp.getStatus().getCode() != Cloud.MetaServiceCode.OK) {
+ LOG.warn("failed to unset default storage vault");
+ throw new DdlException(resp.getStatus().getMsg());
+ }
+ } catch (RpcException e) {
+ LOG.warn("failed to unset default storage vault");
+ throw new DdlException(e.getMessage());
+ }
+ defaultVaultInfo = null;
+ }
+
public void setDefaultStorageVault(Pair<String, String> vaultInfo) {
try {
rwLock.writeLock().lock();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
index 62ae2926e92..7bd3697910c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
@@ -123,6 +123,7 @@ import org.apache.doris.analysis.StopSyncJobStmt;
import org.apache.doris.analysis.SyncStmt;
import org.apache.doris.analysis.TruncateTableStmt;
import org.apache.doris.analysis.UninstallPluginStmt;
+import org.apache.doris.analysis.UnsetDefaultStorageVaultStmt;
import org.apache.doris.catalog.EncryptKeyHelper;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.DdlException;
@@ -409,6 +410,8 @@ public class DdlExecutor {
env.getStorageVaultMgr().createStorageVaultResource((CreateStorageVaultStmt)
ddlStmt);
} else if (ddlStmt instanceof SetDefaultStorageVaultStmt) {
env.getStorageVaultMgr().setDefaultStorageVault((SetDefaultStorageVaultStmt)
ddlStmt);
+ } else if (ddlStmt instanceof UnsetDefaultStorageVaultStmt) {
+ env.getStorageVaultMgr().unsetDefaultStorageVault();
} else {
LOG.warn("Unkown statement " + ddlStmt.getClass());
throw new DdlException("Unknown statement.");
diff --git a/gensrc/proto/cloud.proto b/gensrc/proto/cloud.proto
index 37fa2e46715..43b7b4fdebe 100644
--- a/gensrc/proto/cloud.proto
+++ b/gensrc/proto/cloud.proto
@@ -764,6 +764,7 @@ message AlterObjStoreInfoRequest {
ADD_S3_VAULT = 103;
SET_DEFAULT_VAULT = 200;
+ UNSET_DEFAULT_VAULT = 201;
}
optional string cloud_unique_id = 1; // For auth
optional ObjectStoreInfoPB obj = 2;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
