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 790cde1190a [Feature](Cloud) Add show storage vault stmt (#33249)
790cde1190a is described below
commit 790cde1190a9299aaea8d1701f4ce409be1e34ff
Author: AlexYue <[email protected]>
AuthorDate: Thu Apr 4 19:57:03 2024 +0800
[Feature](Cloud) Add show storage vault stmt (#33249)
---
cloud/src/meta-service/meta_service_resource.cpp | 1 -
fe/fe-core/src/main/cup/sql_parser.cup | 4 ++
.../doris/analysis/ShowStorageVaultStmt.java | 60 ++++++++++++++++++++++
.../org/apache/doris/catalog/StorageVault.java | 37 +++++++++++++
.../apache/doris/cloud/rpc/MetaServiceClient.java | 11 ++++
.../apache/doris/cloud/rpc/MetaServiceProxy.java | 10 ++++
.../java/org/apache/doris/qe/ShowExecutor.java | 26 ++++++++++
7 files changed, 148 insertions(+), 1 deletion(-)
diff --git a/cloud/src/meta-service/meta_service_resource.cpp
b/cloud/src/meta-service/meta_service_resource.cpp
index ff69f12c9ab..88aefdcf0d0 100644
--- a/cloud/src/meta-service/meta_service_resource.cpp
+++ b/cloud/src/meta-service/meta_service_resource.cpp
@@ -980,7 +980,6 @@ void
MetaServiceImpl::create_instance(google::protobuf::RpcController* controlle
}
if (request->has_hdfs_info()) {
StorageVaultPB hdfs_param;
- hdfs_param.set_name("Default");
hdfs_param.mutable_hdfs_info()->MergeFrom(request->hdfs_info());
if (0 != add_hdfs_storage_vault(instance, txn.get(),
std::move(hdfs_param), code, msg)) {
return;
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup
b/fe/fe-core/src/main/cup/sql_parser.cup
index 23964b7cc7b..ac623e39ff4 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -3976,6 +3976,10 @@ show_stmt ::=
{:
RESULT = new ShowPolicyStmt(PolicyTypeEnum.STORAGE, null, null);
:}
+ | KW_SHOW KW_STORAGE KW_VAULT
+ {:
+ RESULT = new ShowStorageVaultStmt();
+ :}
;
show_param ::=
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowStorageVaultStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowStorageVaultStmt.java
new file mode 100644
index 00000000000..e4af07e43b1
--- /dev/null
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowStorageVaultStmt.java
@@ -0,0 +1,60 @@
+// 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;
+
+import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.StorageVault;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.UserException;
+import org.apache.doris.mysql.privilege.PrivPredicate;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.ShowResultSetMetaData;
+
+/**
+ * Show storage vault statement
+ * syntax:
+ * SHOW STORAGE VAULT
+ **/
+public class ShowStorageVaultStmt extends ShowStmt {
+
+ private final String stmt = "SHOW STORAGE VAULT";
+
+ public ShowStorageVaultStmt() {
+ }
+
+ @Override
+ public void analyze(Analyzer analyzer) throws AnalysisException,
UserException {
+ super.analyze(analyzer);
+ // check auth
+ if
(!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(),
PrivPredicate.ADMIN)) {
+
ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR,
"ADMIN");
+ }
+ }
+
+ @Override
+ public String toSql() {
+ return this.stmt;
+ }
+
+ @Override
+ public ShowResultSetMetaData getMetaData() {
+ return StorageVault.STORAGE_VAULT_META_DATA;
+ }
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/StorageVault.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/StorageVault.java
index bd8871ef77f..34668f3cd06 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/StorageVault.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/StorageVault.java
@@ -18,13 +18,18 @@
package org.apache.doris.catalog;
import org.apache.doris.analysis.CreateStorageVaultStmt;
+import org.apache.doris.cloud.proto.Cloud;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.DdlException;
+import org.apache.doris.qe.ShowResultSetMetaData;
import com.google.common.base.Strings;
+import com.google.protobuf.TextFormat;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -153,4 +158,36 @@ public abstract class StorageVault {
}
public abstract Map<String, String> getCopiedProperties();
+
+ public static final ShowResultSetMetaData STORAGE_VAULT_META_DATA =
+ ShowResultSetMetaData.builder()
+ .addColumn(new Column("StorageVaultName",
ScalarType.createVarchar(100)))
+ .addColumn(new Column("StoragevaultId",
ScalarType.createVarchar(20)))
+ .addColumn(new Column("Propeties",
ScalarType.createVarchar(65535)))
+ .build();
+
+ public static List<String>
convertToShowStorageVaultProperties(Cloud.ObjectStoreInfoPB info) {
+ Cloud.ObjectStoreInfoPB.Builder builder =
Cloud.ObjectStoreInfoPB.newBuilder();
+ builder.mergeFrom(info);
+ List<String> row = new ArrayList<>();
+ row.add(info.getVaultName());
+ row.add(info.getId());
+ TextFormat.Printer printer = TextFormat.printer();
+ builder.clearId();
+ builder.clearVaultName();
+ builder.setSk("xxxxxxx");
+ row.add(printer.shortDebugString(builder));
+ return row;
+ }
+
+ public static List<String>
convertToShowStorageVaultProperties(Cloud.StorageVaultPB vault) {
+ List<String> row = new ArrayList<>();
+ row.add(vault.getName());
+ row.add(vault.getId());
+ Cloud.HdfsVaultInfo.Builder builder = Cloud.HdfsVaultInfo.newBuilder();
+ builder.mergeFrom(vault.getHdfsInfo());
+ TextFormat.Printer printer = TextFormat.printer();
+ row.add(printer.shortDebugString(builder));
+ return row;
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/rpc/MetaServiceClient.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/rpc/MetaServiceClient.java
index 19949ac73d3..847c90a73fd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cloud/rpc/MetaServiceClient.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/rpc/MetaServiceClient.java
@@ -325,4 +325,15 @@ public class MetaServiceClient {
}
return blockingStub.getRlTaskCommitAttach(request);
}
+
+ public Cloud.GetObjStoreInfoResponse
+ getObjStoreInfo(Cloud.GetObjStoreInfoRequest request) {
+ if (!request.hasCloudUniqueId()) {
+ Cloud.GetObjStoreInfoRequest.Builder builder =
+ Cloud.GetObjStoreInfoRequest.newBuilder();
+ builder.mergeFrom(request);
+ return
blockingStub.getObjStoreInfo(builder.setCloudUniqueId(Config.cloud_unique_id).build());
+ }
+ return blockingStub.getObjStoreInfo(request);
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/rpc/MetaServiceProxy.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/rpc/MetaServiceProxy.java
index ccdb8006bb7..052abbcf4ef 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cloud/rpc/MetaServiceProxy.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/rpc/MetaServiceProxy.java
@@ -453,4 +453,14 @@ public class MetaServiceProxy {
throw new RpcException("", e.getMessage(), e);
}
}
+
+ public Cloud.GetObjStoreInfoResponse
+ getObjStoreInfo(Cloud.GetObjStoreInfoRequest request) throws
RpcException {
+ try {
+ final MetaServiceClient client = getProxy();
+ return client.getObjStoreInfo(request);
+ } catch (Exception e) {
+ throw new RpcException("", e.getMessage(), e);
+ }
+ }
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
index 45b76077435..9df14c65a39 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
@@ -92,6 +92,7 @@ import org.apache.doris.analysis.ShowSmallFilesStmt;
import org.apache.doris.analysis.ShowSnapshotStmt;
import org.apache.doris.analysis.ShowSqlBlockRuleStmt;
import org.apache.doris.analysis.ShowStmt;
+import org.apache.doris.analysis.ShowStorageVaultStmt;
import org.apache.doris.analysis.ShowStreamLoadStmt;
import org.apache.doris.analysis.ShowSyncJobStmt;
import org.apache.doris.analysis.ShowTableCreationStmt;
@@ -137,6 +138,7 @@ import org.apache.doris.catalog.PrimitiveType;
import org.apache.doris.catalog.Replica;
import org.apache.doris.catalog.ReplicaAllocation;
import org.apache.doris.catalog.ScalarType;
+import org.apache.doris.catalog.StorageVault;
import org.apache.doris.catalog.Table;
import org.apache.doris.catalog.TableIf;
import org.apache.doris.catalog.TableIf.TableType;
@@ -145,6 +147,8 @@ import org.apache.doris.catalog.TabletInvertedIndex;
import org.apache.doris.catalog.TabletMeta;
import org.apache.doris.catalog.View;
import org.apache.doris.clone.DynamicPartitionScheduler;
+import org.apache.doris.cloud.proto.Cloud;
+import org.apache.doris.cloud.rpc.MetaServiceProxy;
import org.apache.doris.cloud.system.CloudSystemInfoService;
import org.apache.doris.cluster.ClusterNamespace;
import org.apache.doris.common.AnalysisException;
@@ -201,6 +205,7 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.mysql.privilege.Privilege;
import org.apache.doris.qe.help.HelpModule;
import org.apache.doris.qe.help.HelpTopic;
+import org.apache.doris.rpc.RpcException;
import org.apache.doris.statistics.AnalysisInfo;
import org.apache.doris.statistics.ColumnStatistic;
import org.apache.doris.statistics.Histogram;
@@ -262,6 +267,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
// Execute one show statement.
public class ShowExecutor {
@@ -455,6 +461,8 @@ public class ShowExecutor {
handleShowConvertLSC();
} else if (stmt instanceof ShowClusterStmt) {
handleShowCluster();
+ } else if (stmt instanceof ShowStorageVaultStmt) {
+ handleShowStorageVault();
} else {
handleEmtpy();
}
@@ -3057,4 +3065,22 @@ public class ShowExecutor {
resultSet = new ShowResultSet(showStmt.getMetaData(), rows);
}
+ private void handleShowStorageVault() throws AnalysisException {
+ ShowStorageVaultStmt showStmt = (ShowStorageVaultStmt) stmt;
+ List<List<String>> rows;
+ try {
+ Cloud.GetObjStoreInfoResponse resp = MetaServiceProxy.getInstance()
+
.getObjStoreInfo(Cloud.GetObjStoreInfoRequest.newBuilder().build());
+ rows = Stream.concat(
+ resp.getObjInfoList().stream()
+
.map(StorageVault::convertToShowStorageVaultProperties),
+ resp.getStorageVaultList().stream()
+
.map(StorageVault::convertToShowStorageVaultProperties))
+ .collect(Collectors.toList());
+ } catch (RpcException e) {
+ throw new AnalysisException(e.getMessage());
+ }
+ resultSet = new ShowResultSet(showStmt.getMetaData(), rows);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
