From 41bf4452ac765160c1c49ba88e89d8e9c17c4af5 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Mon, 9 Oct 2023 20:17:18 +0800 Subject: [PATCH 1/5] fix not display be_port --- .../apache/doris/common/proc/BackendsProcDir.java | 2 -- .../main/java/org/apache/doris/qe/ShowExecutor.java | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendsProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendsProcDir.java index 647e4caf570d92..7d5acf40d22e37 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendsProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendsProcDir.java @@ -51,8 +51,6 @@ public class BackendsProcDir implements ProcDirInterface { .add("HeartbeatFailureCounter").add("NodeRole") .build(); - public static final int HOSTNAME_INDEX = 3; - private SystemInfoService systemInfoService; public BackendsProcDir(SystemInfoService systemInfoService) { 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 64a5d8a0e9a0e0..04644c0c920949 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 @@ -682,19 +682,6 @@ private void handleShowProc() throws AnalysisException { ProcNodeInterface procNode = showProcStmt.getNode(); List> finalRows = procNode.fetchResult().getRows(); - // if this is superuser, hide ip and host info form backends info proc - if (procNode instanceof BackendsProcDir) { - if (!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(), PrivPredicate.OPERATOR)) { - // hide host info - for (List row : finalRows) { - row.remove(BackendsProcDir.HOSTNAME_INDEX); - } - - // mod meta data - metaData.removeColumn(BackendsProcDir.HOSTNAME_INDEX); - } - } - resultSet = new ShowResultSet(metaData, finalRows); } From f4d3126a87ba7c9d530bfca2e0b773a5a0c4ab52 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Wed, 11 Oct 2023 20:59:09 +0800 Subject: [PATCH 2/5] 1 --- .../suites/show_p0/test_show_backends.groovy | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 regression-test/suites/show_p0/test_show_backends.groovy diff --git a/regression-test/suites/show_p0/test_show_backends.groovy b/regression-test/suites/show_p0/test_show_backends.groovy new file mode 100644 index 00000000000000..5897954894adb0 --- /dev/null +++ b/regression-test/suites/show_p0/test_show_backends.groovy @@ -0,0 +1,35 @@ +// 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. + +suite("test_show_backends", "show") { + + sql """drop user if exists test_show_backends_user1""" + + sql """create user test_show_backends_user1 identified by '12345'""" + + sql """grant ADMIN_PRIV on *.*.* to test_show_backends_user1""" + + result1 = connect(user = 'test_show_backends_user1', password = '12345', url = context.config.jdbcUrl) { + sql 'show backends' + } + println result1.toString() + result2 = connect(user = 'test_show_backends_user1', password = '12345', url = context.config.jdbcUrl) { + sql 'show proc '/backends'' + } + println result2.toString() +} + From 2a5daf0059fb29da2fdd079b1fdbdce15de5612f Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Wed, 11 Oct 2023 21:10:09 +0800 Subject: [PATCH 3/5] 1 --- regression-test/suites/show_p0/test_show_backends.groovy | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/regression-test/suites/show_p0/test_show_backends.groovy b/regression-test/suites/show_p0/test_show_backends.groovy index 5897954894adb0..223c6e37cfdcf3 100644 --- a/regression-test/suites/show_p0/test_show_backends.groovy +++ b/regression-test/suites/show_p0/test_show_backends.groovy @@ -28,8 +28,15 @@ suite("test_show_backends", "show") { } println result1.toString() result2 = connect(user = 'test_show_backends_user1', password = '12345', url = context.config.jdbcUrl) { - sql 'show proc '/backends'' + sql 'show proc \'\/backends\'' } println result2.toString() + assertEquals(result1[0][0],result2[0][0]) + assertEquals(result1[0][1],result2[0][1]) + assertEquals(result1[0][2],result2[0][2]) + assertEquals(result1[0][3],result2[0][3]) + assertEquals(result1[0][4],result2[0][4]) + assertEquals(result1[0][5],result2[0][5]) + assertEquals(result1[0][6],result2[0][6]) } From 85bc4d035ff2198a2a5d2a77bd5bc5dc5187551e Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Wed, 11 Oct 2023 21:14:28 +0800 Subject: [PATCH 4/5] 1 --- regression-test/suites/show_p0/test_show_backends.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regression-test/suites/show_p0/test_show_backends.groovy b/regression-test/suites/show_p0/test_show_backends.groovy index 223c6e37cfdcf3..0ac438345e2f5a 100644 --- a/regression-test/suites/show_p0/test_show_backends.groovy +++ b/regression-test/suites/show_p0/test_show_backends.groovy @@ -24,11 +24,11 @@ suite("test_show_backends", "show") { sql """grant ADMIN_PRIV on *.*.* to test_show_backends_user1""" result1 = connect(user = 'test_show_backends_user1', password = '12345', url = context.config.jdbcUrl) { - sql 'show backends' + sql """ show backends """ } println result1.toString() result2 = connect(user = 'test_show_backends_user1', password = '12345', url = context.config.jdbcUrl) { - sql 'show proc \'\/backends\'' + sql """ show proc '/backends' """ } println result2.toString() assertEquals(result1[0][0],result2[0][0]) From 5f2d57e57eae0b6102dc7910b5914aaba12357e3 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Thu, 12 Oct 2023 08:40:18 +0800 Subject: [PATCH 5/5] 1 --- .../suites/nereids_p0/system/test_query_sys_tables.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression-test/suites/nereids_p0/system/test_query_sys_tables.groovy b/regression-test/suites/nereids_p0/system/test_query_sys_tables.groovy index 7b96e1dc32f689..d48b5235b91b90 100644 --- a/regression-test/suites/nereids_p0/system/test_query_sys_tables.groovy +++ b/regression-test/suites/nereids_p0/system/test_query_sys_tables.groovy @@ -180,7 +180,7 @@ suite("test_query_sys_tables", "query,p0") { sql("GRANT SELECT_PRIV ON *.*.* TO 'test_sys_tables'") sql("use information_schema") qt_user_privileges """ - select GRANTEE, PRIVILEGE_TYPE, IS_GRANTABLE from user_privileges where GRANTEE regexp '^\\'test' + select GRANTEE, PRIVILEGE_TYPE, IS_GRANTABLE from user_privileges where GRANTEE regexp '^\\'test_sys_tables' """ sql("DROP USER 'test_sys_tables'")