This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 2988eedc772 [Refactor](admin-stmt) rename some `admin-show` statestmt
(#29492) (#32996)
2988eedc772 is described below
commit 2988eedc7726bd5b065cb956907c6534ea3ed713
Author: Mingyu Chen <[email protected]>
AuthorDate: Fri Mar 29 11:29:41 2024 +0800
[Refactor](admin-stmt) rename some `admin-show` statestmt (#29492) (#32996)
bp #29492
---
.../docs/admin-manual/config/fe-config-template.md | 14 +++----
docs/en/docs/admin-manual/config/fe-config.md | 14 +++----
.../docs/admin-manual/data-admin/delete-recover.md | 2 +-
.../maint-monitor/tablet-repair-and-balance.md | 8 ++--
docs/en/docs/advanced/alter-table/schema-change.md | 2 +-
docs/en/docs/advanced/variables.md | 2 +-
.../join-optimization/colocation-join.md | 2 +-
docs/en/docs/query-acceleration/statistics.md | 2 +-
.../ADMIN-REPAIR-TABLE.md | 2 +-
.../ADMIN-SET-CONFIG.md | 2 +-
.../{ADMIN-SHOW-CONFIG.md => SHOW-CONFIG.md} | 14 +++----
...ISTRIBUTION.md => SHOW-REPLICA-DISTRIBUTION.md} | 14 +++----
...OW-REPLICA-STATUS.md => SHOW-REPLICA-STATUS.md} | 16 ++++----
...DIAGNOSE-TABLET.md => SHOW-TABLET-DIAGNOSIS.md} | 11 +++---
...AGE-FORMAT.md => SHOW-TABLET-STORAGE-FORMAT.md} | 16 +++++---
.../Utility-Statements/REFRESH-LDAP.md | 2 +-
docs/sidebars.json | 10 ++---
.../docs/admin-manual/config/fe-config-template.md | 14 +++----
docs/zh-CN/docs/admin-manual/config/fe-config.md | 16 ++++----
.../docs/admin-manual/data-admin/delete-recover.md | 2 +-
.../maint-monitor/tablet-repair-and-balance.md | 8 ++--
.../docs/advanced/alter-table/schema-change.md | 2 +-
docs/zh-CN/docs/advanced/variables.md | 2 +-
.../join-optimization/colocation-join.md | 2 +-
docs/zh-CN/docs/query-acceleration/statistics.md | 2 +-
.../ADMIN-REPAIR-TABLE.md | 2 +-
.../ADMIN-SET-CONFIG.md | 2 +-
.../{ADMIN-SHOW-CONFIG.md => SHOW-CONFIG.md} | 14 +++----
...ISTRIBUTION.md => SHOW-REPLICA-DISTRIBUTION.md} | 14 +++----
...OW-REPLICA-STATUS.md => SHOW-REPLICA-STATUS.md} | 16 ++++----
...DIAGNOSE-TABLET.md => SHOW-TABLET-DIAGNOSIS.md} | 11 +++---
...AGE-FORMAT.md => SHOW-TABLET-STORAGE-FORMAT.md} | 17 +++++---
.../Utility-Statements/REFRESH-LDAP.md | 2 +-
fe/fe-core/src/main/cup/sql_parser.cup | 45 +++++++++++++++++++---
...noseTabletStmt.java => DiagnoseTabletStmt.java} | 8 ++--
...dminShowConfigStmt.java => ShowConfigStmt.java} | 6 +--
...nStmt.java => ShowReplicaDistributionStmt.java} | 6 +--
...aStatusStmt.java => ShowReplicaStatusStmt.java} | 4 +-
...tStmt.java => ShowTabletStorageFormatStmt.java} | 6 +--
.../org/apache/doris/catalog/MetadataViewer.java | 8 ++--
.../java/org/apache/doris/qe/ShowExecutor.java | 28 +++++++-------
fe/fe-core/src/main/jflex/sql_scanner.flex | 1 +
...inShowReplicaTest.java => ShowReplicaTest.java} | 28 +++++++-------
.../apache/doris/regression/suite/Syncer.groovy | 2 +-
.../alter_p2/test_alter_table_property.groovy | 2 +-
.../test_alter_database_property.groovy | 2 +-
.../test_show_create_table_and_views.groovy | 2 +-
47 files changed, 226 insertions(+), 181 deletions(-)
diff --git a/docs/en/docs/admin-manual/config/fe-config-template.md
b/docs/en/docs/admin-manual/config/fe-config-template.md
index 2ae517ac243..2b421297f6b 100644
--- a/docs/en/docs/admin-manual/config/fe-config-template.md
+++ b/docs/en/docs/admin-manual/config/fe-config-template.md
@@ -43,7 +43,7 @@ The location of the `fe_custom.conf` file can be configured
in `fe.conf` through
**1.** For the purpose of simplifying the architecture, modifying the
configuration through the mysql protocol will only modify the data in the local
FE memory, and will not synchronize the changes to all FEs.
For Config items that only take effect on the Master FE, the modification
request will be automatically forwarded to the Master FE.
-**2.** Note that the option ```forward_to_master``` will affect the display
results of ```admin show frontend config```, if ```forward_to_master=true```,
```admin show frontend config``` shows the Config of Master FE (Even if you are
connecting to a Follower FE currently), this may cause you to be unable to see
the modification of the local FE configuration; if you expect show config of
the FE you're connecting, then execute the command ```set
forward_to_master=false```.
+**2.** Note that the option ```forward_to_master``` will affect the display
results of ```show frontend config```, if ```forward_to_master=true```, ```show
frontend config``` shows the Config of Master FE (Even if you are connecting to
a Follower FE currently), this may cause you to be unable to see the
modification of the local FE configuration; if you expect show config of the FE
you're connecting, then execute the command ```set forward_to_master=false```.
## View configuration items
@@ -58,7 +58,7 @@ There are two ways to view the configuration items of FE:
After the FE is started, you can view the configuration items of the FE in
the MySQL client with the following command:
- `ADMIN SHOW FRONTEND CONFIG;`
+ `SHOW FRONTEND CONFIG;`
The meanings of the columns in the results are as follows:
@@ -83,7 +83,7 @@ There are two ways to configure FE configuration items:
`ADMIN SET FRONTEND CONFIG (" fe_config_name "=" fe_config_value ");`
- Not all configuration items support dynamic configuration. You can check
whether the dynamic configuration is supported by the `IsMutable` column in
the` ADMIN SHOW FRONTEND CONFIG; `command result.
+ Not all configuration items support dynamic configuration. You can check
whether the dynamic configuration is supported by the `IsMutable` column in
the` SHOW FRONTEND CONFIG; `command result.
If the configuration item of `MasterOnly` is modified, the command will be
directly forwarded to the Master FE and only the corresponding configuration
item in the Master FE will be modified.
@@ -101,7 +101,7 @@ There are two ways to configure FE configuration items:
1. Modify `async_pending_load_task_pool_size`
- Through `ADMIN SHOW FRONTEND CONFIG;` you can see that this configuration
item cannot be dynamically configured (`IsMutable` is false). You need to add
in `fe.conf`:
+ Through `SHOW FRONTEND CONFIG;` you can see that this configuration item
cannot be dynamically configured (`IsMutable` is false). You need to add in
`fe.conf`:
`async_pending_load_task_pool_size = 20`
@@ -109,7 +109,7 @@ There are two ways to configure FE configuration items:
2. Modify `dynamic_partition_enable`
- Through `ADMIN SHOW FRONTEND CONFIG;` you can see that the configuration
item can be dynamically configured (`IsMutable` is true). And it is the unique
configuration of Master FE. Then first we can connect to any FE and execute the
following command to modify the configuration:
+ Through `SHOW FRONTEND CONFIG;` you can see that the configuration item
can be dynamically configured (`IsMutable` is true). And it is the unique
configuration of Master FE. Then first we can connect to any FE and execute the
following command to modify the configuration:
```
ADMIN SET FRONTEND CONFIG ("dynamic_partition_enable" = "true"); `
@@ -119,14 +119,14 @@ There are two ways to configure FE configuration items:
```
set forward_to_master = true;
- ADMIN SHOW FRONTEND CONFIG;
+ SHOW FRONTEND CONFIG;
```
After modification in the above manner, if the Master FE restarts or a
Master election is performed, the configuration will be invalid. You can add
the configuration item directly in `fe.conf` and restart the FE to make the
configuration item permanent.
3. Modify `max_distribution_pruner_recursion_depth`
- Through `ADMIN SHOW FRONTEND CONFIG;` you can see that the configuration
item can be dynamically configured (`IsMutable` is true). It is not unique to
Master FE.
+ Through `SHOW FRONTEND CONFIG;` you can see that the configuration item
can be dynamically configured (`IsMutable` is true). It is not unique to Master
FE.
Similarly, we can modify the configuration by dynamically modifying the
configuration command. Because this configuration is not unique to the Master
FE, user need to connect to different FEs separately to modify the
configuration dynamically, so that all FEs use the modified configuration
values.
diff --git a/docs/en/docs/admin-manual/config/fe-config.md
b/docs/en/docs/admin-manual/config/fe-config.md
index 4daa1516d8e..be1928f5395 100644
--- a/docs/en/docs/admin-manual/config/fe-config.md
+++ b/docs/en/docs/admin-manual/config/fe-config.md
@@ -48,9 +48,9 @@ There are two ways to view the configuration items of FE:
2. View by command
- After the FE is started, you can view the configuration items of the FE in
the MySQL client with the following command,Concrete language law reference
[ADMIN-SHOW-CONFIG](../../sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md):
+ After the FE is started, you can view the configuration items of the FE in
the MySQL client with the following command,Concrete language law reference
[SHOW-CONFIG](../../sql-manual/sql-reference/Database-Administration-Statements/SHOW-CONFIG.md):
- `ADMIN SHOW FRONTEND CONFIG;`
+ `SHOW FRONTEND CONFIG;`
The meanings of the columns in the results are as follows:
@@ -75,7 +75,7 @@ There are two ways to configure FE configuration items:
`ADMIN SET FRONTEND CONFIG (" fe_config_name "=" fe_config_value ");`
- Not all configuration items support dynamic configuration. You can check
whether the dynamic configuration is supported by the `IsMutable` column in
the` ADMIN SHOW FRONTEND CONFIG; `command result.
+ Not all configuration items support dynamic configuration. You can check
whether the dynamic configuration is supported by the `IsMutable` column in
the` SHOW FRONTEND CONFIG; `command result.
If the configuration item of `MasterOnly` is modified, the command will be
directly forwarded to the Master FE and only the corresponding configuration
item in the Master FE will be modified.
@@ -93,7 +93,7 @@ There are two ways to configure FE configuration items:
1. Modify `async_pending_load_task_pool_size`
- Through `ADMIN SHOW FRONTEND CONFIG;` you can see that this configuration
item cannot be dynamically configured (`IsMutable` is false). You need to add
in `fe.conf`:
+ Through `SHOW FRONTEND CONFIG;` you can see that this configuration item
cannot be dynamically configured (`IsMutable` is false). You need to add in
`fe.conf`:
`async_pending_load_task_pool_size = 20`
@@ -101,7 +101,7 @@ There are two ways to configure FE configuration items:
2. Modify `dynamic_partition_enable`
- Through `ADMIN SHOW FRONTEND CONFIG;` you can see that the configuration
item can be dynamically configured (`IsMutable` is true). And it is the unique
configuration of Master FE. Then first we can connect to any FE and execute the
following command to modify the configuration:
+ Through `SHOW FRONTEND CONFIG;` you can see that the configuration item
can be dynamically configured (`IsMutable` is true). And it is the unique
configuration of Master FE. Then first we can connect to any FE and execute the
following command to modify the configuration:
```
ADMIN SET FRONTEND CONFIG ("dynamic_partition_enable" = "true"); `
@@ -111,14 +111,14 @@ There are two ways to configure FE configuration items:
```
set forward_to_master = true;
- ADMIN SHOW FRONTEND CONFIG;
+ SHOW FRONTEND CONFIG;
```
After modification in the above manner, if the Master FE restarts or a
Master election is performed, the configuration will be invalid. You can add
the configuration item directly in `fe.conf` and restart the FE to make the
configuration item permanent.
3. Modify `max_distribution_pruner_recursion_depth`
- Through `ADMIN SHOW FRONTEND CONFIG;` you can see that the configuration
item can be dynamically configured (`IsMutable` is true). It is not unique to
Master FE.
+ Through `SHOW FRONTEND CONFIG;` you can see that the configuration item
can be dynamically configured (`IsMutable` is true). It is not unique to Master
FE.
Similarly, we can modify the configuration by dynamically modifying the
configuration command. Because this configuration is not unique to the Master
FE, user need to connect to different FEs separately to modify the
configuration dynamically, so that all FEs use the modified configuration
values.
diff --git a/docs/en/docs/admin-manual/data-admin/delete-recover.md
b/docs/en/docs/admin-manual/data-admin/delete-recover.md
index 3d5eeb45fd1..802738e511c 100644
--- a/docs/en/docs/admin-manual/data-admin/delete-recover.md
+++ b/docs/en/docs/admin-manual/data-admin/delete-recover.md
@@ -179,7 +179,7 @@ In some very special circumstances, such as code bugs, or
human misoperation, et
ADMIN SET FRONTEND CONFIG ("recover_with_empty_tablet" = "true");
```
- * Note: You can first check whether the current version supports this
parameter through the `ADMIN SHOW FRONTEND CONFIG;` command.
+ * Note: You can first check whether the current version supports this
parameter through the `SHOW FRONTEND CONFIG;` command.
3. A few minutes after the setup is complete, you should see the following log
in the Master FE log `fe.log`:
diff --git
a/docs/en/docs/admin-manual/maint-monitor/tablet-repair-and-balance.md
b/docs/en/docs/admin-manual/maint-monitor/tablet-repair-and-balance.md
index 861cae5fa15..e2b0393f101 100644
--- a/docs/en/docs/admin-manual/maint-monitor/tablet-repair-and-balance.md
+++ b/docs/en/docs/admin-manual/maint-monitor/tablet-repair-and-balance.md
@@ -300,7 +300,7 @@ Tablet state view mainly looks at the state of the tablet,
as well as the state
Users can view the status of a copy of a specified table or partition
through the following commands and filter the status through a WHERE statement.
If you look at table tbl1, the state on partitions P1 and P2 is a copy of OK:
- `ADMIN SHOW REPLICA STATUS FROM tbl1 PARTITION (p1, p2) WHERE STATUS =
"OK";`
+ `SHOW REPLICA STATUS FROM tbl1 PARTITION (p1, p2) WHERE STATUS = "OK";`
```
+----------+-----------+-----------+---------+-------------------+--------------------+------------------+------------+------------+-------+--------+--------+
@@ -315,9 +315,9 @@ Tablet state view mainly looks at the state of the tablet,
as well as the state
+----------+-----------+-----------+---------+-------------------+--------------------+------------------+------------+------------+-------+--------+--------+
```
- The status of all copies is shown here. Where `IsBad` is listed as
`true`, the copy is damaged. The `Status` column displays other states.
Specific status description, you can see help through `HELP ADMIN SHOW REPLICA
STATUS`.
+ The status of all copies is shown here. Where `IsBad` is listed as
`true`, the copy is damaged. The `Status` column displays other states.
Specific status description, you can see help through `HELP SHOW REPLICA
STATUS`.
- ` The ADMIN SHOW REPLICA STATUS `command is mainly used to view the
health status of copies. Users can also view additional information about
copies of a specified table by using the following commands:
+ ` The SHOW REPLICA STATUS `command is mainly used to view the health
status of copies. Users can also view additional information about copies of a
specified table by using the following commands:
`SHOW TABLETS FROM tbl1;`
@@ -337,7 +337,7 @@ Tablet state view mainly looks at the state of the tablet,
as well as the state
In addition, users can check the distribution of replicas in a
specified table or partition by following commands.
- `ADMIN SHOW REPLICA DISTRIBUTION FROM tbl1;`
+ `SHOW REPLICA DISTRIBUTION FROM tbl1;`
```
+-----------+------------+-------+---------+
diff --git a/docs/en/docs/advanced/alter-table/schema-change.md
b/docs/en/docs/advanced/alter-table/schema-change.md
index a8a98a79f7a..7a22b8e694d 100644
--- a/docs/en/docs/advanced/alter-table/schema-change.md
+++ b/docs/en/docs/advanced/alter-table/schema-change.md
@@ -255,7 +255,7 @@ SHOW ALTER TABLE COLUMN\G;
Schema Change can only be started when the table data is complete and
unbalanced. If some data shard copies of the table are incomplete, or if some
copies are undergoing an equalization operation, the submission is rejected.
Whether the data shard copy is complete can be checked with the following
command:
- ```ADMIN SHOW REPLICA STATUS FROM tbl WHERE STATUS != "OK";```
+ ```SHOW REPLICA STATUS FROM tbl WHERE STATUS != "OK";```
If a result is returned, there is a problem with the copy. These problems
are usually fixed automatically by the system. You can also use the following
commands to repair this table first:
```ADMIN REPAIR TABLE tbl1;```
diff --git a/docs/en/docs/advanced/variables.md
b/docs/en/docs/advanced/variables.md
index fc810c592b2..9981bff82ea 100644
--- a/docs/en/docs/advanced/variables.md
+++ b/docs/en/docs/advanced/variables.md
@@ -247,7 +247,7 @@ Note that the comment must start with /*+ and can only
follow the SELECT.
Forward to Master to view the start time and last heartbeat
information.
- 4. `SHOW TABLET;`/`ADMIN SHOW REPLICA DISTRIBUTION;`/`ADMIN SHOW REPLICA
STATUS;`
+ 4. `SHOW TABLET;`/`SHOW REPLICA DISTRIBUTION;`/`SHOW REPLICA STATUS;`
Forward to Master to view the tablet information stored in the Master
FE metadata. Under normal circumstances, the tablet information in different FE
metadata should be consistent. When a problem occurs, this method can be used
to compare the difference between the current FE and Master FE metadata.
diff --git
a/docs/en/docs/query-acceleration/join-optimization/colocation-join.md
b/docs/en/docs/query-acceleration/join-optimization/colocation-join.md
index a9b6c2ab793..0e694f5453e 100644
--- a/docs/en/docs/query-acceleration/join-optimization/colocation-join.md
+++ b/docs/en/docs/query-acceleration/join-optimization/colocation-join.md
@@ -356,7 +356,7 @@ Whether to close Doris's automatic Colocation replica
repair. The default is fal
Whether to turn off automatic Colocation replica balancing for Doris. The
default is false, i.e. not closed. This parameter only affects the replica
balance of the Collocation table, but does not affect the common table.
-User can set these configurations at runtime. See `HELP ADMIN SHOW CONFIG;`
and `HELP ADMIN SET CONFIG;`.
+User can set these configurations at runtime. See `HELP SHOW CONFIG;` and
`HELP ADMIN SET CONFIG;`.
* disable\_colocate\_join
diff --git a/docs/en/docs/query-acceleration/statistics.md
b/docs/en/docs/query-acceleration/statistics.md
index 35c09f9e3f1..9d1c971fa21 100644
--- a/docs/en/docs/query-acceleration/statistics.md
+++ b/docs/en/docs/query-acceleration/statistics.md
@@ -328,7 +328,7 @@ The following FE configuration options are typically not a
major concern:
When ANALYZE is executed, statistics data is written to the internal table
`__internal_schema.column_statistics`. FE checks the tablet status of this
table before executing ANALYZE. If there are unavailable tablets, the task is
rejected. Please check the BE cluster status if this error occurs.
-Users can use `SHOW BACKENDS\G` to verify the BE (Backend) status. If the BE
status is normal, you can use the command `ADMIN SHOW REPLICA STATUS FROM
__internal_schema.[tbl_in_this_db]` to check the tablet status within this
database, ensuring that the tablet status is also normal.
+Users can use `SHOW BACKENDS\G` to verify the BE (Backend) status. If the BE
status is normal, you can use the command `SHOW REPLICA STATUS FROM
__internal_schema.[tbl_in_this_db]` to check the tablet status within this
database, ensuring that the tablet status is also normal.
### 4.2 Failure of ANALYZE on Large Tables
diff --git
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-REPAIR-TABLE.md
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-REPAIR-TABLE.md
index 4b5cdad0cd5..73492b66a71 100644
---
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-REPAIR-TABLE.md
+++
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-REPAIR-TABLE.md
@@ -42,7 +42,7 @@ ADMIN REPAIR TABLE table_name[ PARTITION (p1,...)]
illustrate:
-1. This statement only means to let the system try to repair the shard copy of
the specified table or partition with high priority, and does not guarantee
that the repair can be successful. Users can view the repair status through the
ADMIN SHOW REPLICA STATUS command.
+1. This statement only means to let the system try to repair the shard copy of
the specified table or partition with high priority, and does not guarantee
that the repair can be successful. Users can view the repair status through the
SHOW REPLICA STATUS command.
2. The default timeout is 14400 seconds (4 hours). A timeout means that the
system will no longer repair shard copies of the specified table or partition
with high priority. Need to re-use this command to set
### Example
diff --git
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-CONFIG.md
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-CONFIG.md
index 0b4728f965a..0d76164bdd0 100644
---
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-CONFIG.md
+++
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-CONFIG.md
@@ -33,7 +33,7 @@ ADMIN SET CONFIG
### Description
This statement is used to set the configuration items of the cluster
(currently only the configuration items of FE are supported).
-The settable configuration items can be viewed through the ADMIN SHOW FRONTEND
CONFIG; command.
+The settable configuration items can be viewed through the SHOW FRONTEND
CONFIG; command.
grammar:
diff --git
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-CONFIG.md
similarity index 88%
rename from
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md
rename to
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-CONFIG.md
index 0f9bb92d0c5..97a9654d45b 100644
---
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md
+++
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-CONFIG.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN-SHOW-CONFIG",
+ "title": "SHOW-CONFIG",
"language": "en"
}
---
@@ -24,11 +24,11 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN-SHOW-CONFIG
+## SHOW-CONFIG
### Name
-ADMIN SHOW CONFIG
+SHOW CONFIG
### Description
@@ -37,7 +37,7 @@ This statement is used to display the configuration of the
current cluster (curr
grammar:
```sql
- ADMIN SHOW FRONTEND CONFIG [LIKE "pattern"];
+SHOW FRONTEND CONFIG [LIKE "pattern"];
````
The columns in the results have the following meanings:
@@ -54,13 +54,13 @@ The columns in the results have the following meanings:
1. View the configuration of the current FE node
```sql
- ADMIN SHOW FRONTEND CONFIG;
+ SHOW FRONTEND CONFIG;
```
2. Use the like predicate to search the configuration of the current Fe node
````
- mysql> ADMIN SHOW FRONTEND CONFIG LIKE '%check_java_version%';
+ mysql> SHOW FRONTEND CONFIG LIKE '%check_java_version%';
+--------------------+-------+---------+---------- -+------------+---------+
| Key | Value | Type | IsMutable | MasterOnly | Comment |
+--------------------+-------+---------+---------- -+------------+---------+
@@ -71,7 +71,7 @@ The columns in the results have the following meanings:
### Keywords
- ADMIN, SHOW, CONFIG, ADMIN SHOW
+ SHOW, CONFIG
### Best Practice
diff --git
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-DISTRIBUTION.md
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-DISTRIBUTION.md
similarity index 77%
rename from
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-DISTRIBUTION.md
rename to
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-DISTRIBUTION.md
index 1d1cf938f13..6c72e55ec52 100644
---
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-DISTRIBUTION.md
+++
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-DISTRIBUTION.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN-SHOW-REPLICA-DISTRIBUTION",
+ "title": "SHOW-REPLICA-DISTRIBUTION",
"language": "en"
}
---
@@ -24,11 +24,11 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN-SHOW-REPLICA-DISTRIBUTION
+## SHOW-REPLICA-DISTRIBUTION
### Name
-ADMIN SHOW REPLICA DISTRIBUTION
+SHOW REPLICA DISTRIBUTION
### Description
@@ -37,7 +37,7 @@ This statement is used to display the distribution status of
a table or partitio
grammar:
```sql
-ADMIN SHOW REPLICA DISTRIBUTION FROM [db_name.]tbl_name [PARTITION (p1, ...)];
+SHOW REPLICA DISTRIBUTION FROM [db_name.]tbl_name [PARTITION (p1, ...)];
````
illustrate:
@@ -49,18 +49,18 @@ illustrate:
1. View the replica distribution of the table
```sql
- ADMIN SHOW REPLICA DISTRIBUTION FROM tbl1;
+ SHOW REPLICA DISTRIBUTION FROM tbl1;
````
2. View the replica distribution of the partitions of the table
```sql
- ADMIN SHOW REPLICA DISTRIBUTION FROM db1.tbl1 PARTITION(p1, p2);
+ SHOW REPLICA DISTRIBUTION FROM db1.tbl1 PARTITION(p1, p2);
````
### Keywords
- ADMIN, SHOW, REPLICA, DISTRIBUTION, ADMIN SHOW
+ ADMIN, SHOW, REPLICA, DISTRIBUTION
### Best Practice
diff --git
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-STATUS.md
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-STATUS.md
similarity index 82%
rename from
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-STATUS.md
rename to
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-STATUS.md
index 0fdcab28c7b..06dc0118b6d 100644
---
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-STATUS.md
+++
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-STATUS.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN-SHOW-REPLICA-STATUS",
+ "title": "SHOW-REPLICA-STATUS",
"language": "en"
}
---
@@ -24,11 +24,11 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN-SHOW-REPLICA-STATUS
+## SHOW-REPLICA-STATUS
### Name
-ADMIN SHOW REPLICA STATUS
+SHOW REPLICA STATUS
### Description
@@ -37,7 +37,7 @@ This statement is used to display replica status information
for a table or part
grammar:
```sql
- ADMIN SHOW REPLICA STATUS FROM [db_name.]tbl_name [PARTITION (p1, ...)]
+SHOW REPLICA STATUS FROM [db_name.]tbl_name [PARTITION (p1, ...)]
[where_clause];
````
@@ -58,26 +58,26 @@ illustrate
1. View the status of all replicas of the table
```sql
- ADMIN SHOW REPLICA STATUS FROM db1.tbl1;
+ SHOW REPLICA STATUS FROM db1.tbl1;
````
2. View a copy of a table with a partition status of VERSION_ERROR
```sql
- ADMIN SHOW REPLICA STATUS FROM tbl1 PARTITION (p1, p2)
+ SHOW REPLICA STATUS FROM tbl1 PARTITION (p1, p2)
WHERE STATUS = "VERSION_ERROR";
````
3. View all unhealthy replicas of the table
```sql
- ADMIN SHOW REPLICA STATUS FROM tbl1
+ SHOW REPLICA STATUS FROM tbl1
WHERE STATUS != "OK";
````
### Keywords
- ADMIN, SHOW, REPLICA, STATUS, ADMIN SHOW
+ SHOW, REPLICA, STATUS
### Best Practice
diff --git
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-DIAGNOSE-TABLET.md
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-DIAGNOSIS.md
similarity index 92%
rename from
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-DIAGNOSE-TABLET.md
rename to
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-DIAGNOSIS.md
index df75561b596..bba8b7bd7cb 100644
---
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-DIAGNOSE-TABLET.md
+++
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-DIAGNOSIS.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN DIAGNOSE TABLET",
+ "title": "SHOW TABLET DIAGNOSIS",
"language": "en"
}
---
@@ -22,14 +22,14 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN DIAGNOSE TABLET
+## SHOW TABLET DIAGNOSIS
### Description
This statement is used to diagnose the specified tablet. The results will
show information about the tablet and some potential problems.
grammar:
- ADMIN DIAGNOSE TABLET tblet_id
+ SHOW TABLET DIAGNOSE TABLET tablet_id
illustrate:
@@ -51,7 +51,8 @@ under the License.
1. Diagnose tablet 10001
- ADMIN DIAGNOSE TABLET 10001;
+ SHOW TABLET DIAGNOSE TABLET 10001;
### Keywords
- ADMIN,DIAGNOSE,TABLET
+
+ SHOW, DIAGNOSIS, TABLET
diff --git
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-TABLET-STORAGE-FORMAT.md
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-STORAGE-FORMAT.md
similarity index 83%
rename from
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-TABLET-STORAGE-FORMAT.md
rename to
docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-STORAGE-FORMAT.md
index f2ea0ec14ef..6f5fddc5c28 100644
---
a/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-TABLET-STORAGE-FORMAT.md
+++
b/docs/en/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-STORAGE-FORMAT.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN SHOW TABLET STORAGE FORMAT",
+ "title": "SHOW TABLET STORAGE FORMAT",
"language": "en"
}
---
@@ -24,21 +24,24 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN SHOW TABLET STORAGE FORMAT
+## SHOW TABLET STORAGE FORMAT
### description
+
This statement is used to display tablet storage foramt information (for
administrators only)
Grammar:
- ADMIN SHOW TABLET STORAGE FORMAT [VERBOSE]
+ SHOW TABLET STORAGE FORMAT [VERBOSE]
### example
- MySQL [(none)]> admin show tablet storage format;
+
+ ```
+ MySQL [(none)]> show tablet storage format;
+-----------+---------+---------+
| BackendId | V1Count | V2Count |
+-----------+---------+---------+
| 10002 | 0 | 2867 |
+-----------+---------+---------+
1 row in set (0.003 sec)
- MySQL [test_query_qa]> admin show tablet storage format verbose;
+ MySQL [test_query_qa]> show tablet storage format verbose;
+-----------+----------+---------------+
| BackendId | TabletId | StorageFormat |
+-----------+----------+---------------+
@@ -48,7 +51,8 @@ under the License.
| 10002 | 39199 | V2 |
+-----------+----------+---------------+
4 rows in set (0.034 sec)
+ ```
### keywords
- ADMIN, SHOW, TABLET, STORAGE, FORMAT, ADMIN SHOW
+ SHOW, TABLET, STORAGE, FORMAT
diff --git
a/docs/en/docs/sql-manual/sql-reference/Utility-Statements/REFRESH-LDAP.md
b/docs/en/docs/sql-manual/sql-reference/Utility-Statements/REFRESH-LDAP.md
index 6ca2a3b421a..1e592aca9a0 100644
--- a/docs/en/docs/sql-manual/sql-reference/Utility-Statements/REFRESH-LDAP.md
+++ b/docs/en/docs/sql-manual/sql-reference/Utility-Statements/REFRESH-LDAP.md
@@ -36,7 +36,7 @@ REFRESH-LDAP
### Description
-This statement is used to refresh the cached information of LDAP in Doris. The
default timeout for LDAP information cache in Doris is 12 hours, which can be
viewed by `ADMIN SHOW FRONTEND CONFIG LIKE 'ldap_ user_cache_timeout_s';`.
+This statement is used to refresh the cached information of LDAP in Doris. The
default timeout for LDAP information cache in Doris is 12 hours, which can be
viewed by `SHOW FRONTEND CONFIG LIKE 'ldap_ user_cache_timeout_s';`.
syntax:
diff --git a/docs/sidebars.json b/docs/sidebars.json
index ad201a04e7a..51ad5dd1f06 100644
--- a/docs/sidebars.json
+++ b/docs/sidebars.json
@@ -852,7 +852,7 @@
"type": "category",
"label": "Database Administration",
"items": [
-
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG",
+
"sql-manual/sql-reference/Database-Administration-Statements/SHOW-CONFIG",
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-CONFIG",
"sql-manual/sql-reference/Database-Administration-Statements/SET-VARIABLE",
"sql-manual/sql-reference/Database-Administration-Statements/INSTALL-PLUGIN",
@@ -861,14 +861,14 @@
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-REPLICA-VERSION",
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-PARTITION-VERSION",
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-TABLE-STATUS",
-
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-DISTRIBUTION",
-
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-STATUS",
+
"sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-DISTRIBUTION",
+
"sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-STATUS",
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-REPAIR-TABLE",
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-CANCEL-REPAIR",
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-CHECK-TABLET",
-
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-DIAGNOSE-TABLET",
+
"sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-DIAGNOSIS",
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-COPY-TABLET",
-
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-TABLET-STORAGE-FORMAT",
+
"sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-STORAGE-FORMAT",
"sql-manual/sql-reference/Database-Administration-Statements/ADMIN-CLEAN-TRASH",
"sql-manual/sql-reference/Database-Administration-Statements/RECOVER",
"sql-manual/sql-reference/Database-Administration-Statements/KILL",
diff --git a/docs/zh-CN/docs/admin-manual/config/fe-config-template.md
b/docs/zh-CN/docs/admin-manual/config/fe-config-template.md
index a0fb6a62778..eef3221bd0a 100644
--- a/docs/zh-CN/docs/admin-manual/config/fe-config-template.md
+++ b/docs/zh-CN/docs/admin-manual/config/fe-config-template.md
@@ -42,7 +42,7 @@ FE 进程启动后，会先读取 `fe.conf` 中的配置项，之后再读取 `f
**1.** 出于简化架构的目的，目前通过```mysql协议修改Config```的方式修改配置只会修改本地FE内存中的数据，而不会把变更同步到所有FE。
对于只会在Master FE生效的Config项，修改请求会自动转发到Master节点
-**2.** 需要注意```forward_to_master```选项会影响```admin show frontend
config```的展示结果，如果```forward_to_master=true```，那么只会展示Master的配置（即使您此时连接的是Follower
FE节点），这可能导致您无法看到对本地FE配置的修改；如果期望show config返回本地FE的配置项，那么执行命令```set
forward_to_master=false```
+**2.** 需要注意```forward_to_master```选项会影响```show frontend
config```的展示结果，如果```forward_to_master=true```，那么只会展示Master的配置（即使您此时连接的是Follower
FE节点），这可能导致您无法看到对本地FE配置的修改；如果期望show config返回本地FE的配置项，那么执行命令```set
forward_to_master=false```
## 查看配置项
@@ -56,7 +56,7 @@ FE 的配置项有两种方式进行查看：
FE 启动后，可以在 MySQL 客户端中，通过以下命令查看 FE 的配置项：
- `ADMIN SHOW FRONTEND CONFIG;`
+ `SHOW FRONTEND CONFIG;`
结果中各列含义如下：
@@ -81,7 +81,7 @@ FE 的配置项有两种方式进行配置：
`ADMIN SET FRONTEND CONFIG ("fe_config_name" = "fe_config_value");`
- 不是所有配置项都支持动态配置。可以通过 `ADMIN SHOW FRONTEND CONFIG;` 命令结果中的 `IsMutable`
列查看是否支持动态配置。
+ 不是所有配置项都支持动态配置。可以通过 `SHOW FRONTEND CONFIG;` 命令结果中的 `IsMutable` 列查看是否支持动态配置。
如果是修改 `MasterOnly` 的配置项，则该命令会直接转发给 Master FE 并且仅修改 Master FE 中对应的配置项。
@@ -99,7 +99,7 @@ FE 的配置项有两种方式进行配置：
1. 修改 `async_pending_load_task_pool_size`
- 通过 `ADMIN SHOW FRONTEND CONFIG;` 可以查看到该配置项不能动态配置（`IsMutable` 为 false）。则需要在
`fe.conf` 中添加：
+ 通过 `SHOW FRONTEND CONFIG;` 可以查看到该配置项不能动态配置（`IsMutable` 为 false）。则需要在
`fe.conf` 中添加：
`async_pending_load_task_pool_size=20`
@@ -107,7 +107,7 @@ FE 的配置项有两种方式进行配置：
2. 修改 `dynamic_partition_enable`
- 通过 `ADMIN SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且是
Master FE 独有配置。则首先我们可以连接到任意 FE，执行如下命令修改配置：
+ 通过 `SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且是 Master
FE 独有配置。则首先我们可以连接到任意 FE，执行如下命令修改配置：
```text
ADMIN SET FRONTEND CONFIG ("dynamic_partition_enable" = "true");`
@@ -117,14 +117,14 @@ FE 的配置项有两种方式进行配置：
```text
set forward_to_master=true;
- ADMIN SHOW FRONTEND CONFIG;
+ SHOW FRONTEND CONFIG;
```
通过以上方式修改后，如果 Master FE 重启或进行了 Master 切换，则配置将失效。可以通过在 `fe.conf` 中直接添加配置项，并重启
FE 后，永久生效该配置项。
3. 修改 `max_distribution_pruner_recursion_depth`
- 通过 `ADMIN SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且不是
Master FE 独有配置。
+ 通过 `SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且不是 Master
FE 独有配置。
同样，我们可以通过动态修改配置的命令修改该配置。因为该配置不是 Master FE 独有配置，所以需要单独连接到不同的
FE，进行动态修改配置的操作，这样才能保证所有 FE 都使用了修改后的配置值
diff --git a/docs/zh-CN/docs/admin-manual/config/fe-config.md
b/docs/zh-CN/docs/admin-manual/config/fe-config.md
index 80e56ffec13..cf3124e442b 100644
--- a/docs/zh-CN/docs/admin-manual/config/fe-config.md
+++ b/docs/zh-CN/docs/admin-manual/config/fe-config.md
@@ -47,9 +47,9 @@ FE 的配置项有两种方式进行查看：
2. 通过命令查看
- FE 启动后，可以在 MySQL 客户端中，通过以下命令查看 FE
的配置项，具体语法参照[ADMIN-SHOW-CONFIG](../../sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md)：
+ FE 启动后，可以在 MySQL 客户端中，通过以下命令查看 FE
的配置项，具体语法参照[SHOW-CONFIG](../../sql-manual/sql-reference/Database-Administration-Statements/SHOW-CONFIG.md)：
- `ADMIN SHOW FRONTEND CONFIG;`
+ `SHOW FRONTEND CONFIG;`
结果中各列含义如下：
@@ -74,7 +74,7 @@ FE 的配置项有两种方式进行配置：
`ADMIN SET FRONTEND CONFIG ("fe_config_name" = "fe_config_value");`
- 不是所有配置项都支持动态配置。可以通过 `ADMIN SHOW FRONTEND CONFIG;` 命令结果中的 `IsMutable`
列查看是否支持动态配置。
+ 不是所有配置项都支持动态配置。可以通过 `SHOW FRONTEND CONFIG;` 命令结果中的 `IsMutable` 列查看是否支持动态配置。
如果是修改 `MasterOnly` 的配置项，则该命令会直接转发给 Master FE 并且仅修改 Master FE 中对应的配置项。
@@ -92,7 +92,7 @@ FE 的配置项有两种方式进行配置：
1. 修改 `async_pending_load_task_pool_size`
- 通过 `ADMIN SHOW FRONTEND CONFIG;` 可以查看到该配置项不能动态配置（`IsMutable` 为 false）。则需要在
`fe.conf` 中添加：
+ 通过 `SHOW FRONTEND CONFIG;` 可以查看到该配置项不能动态配置（`IsMutable` 为 false）。则需要在
`fe.conf` 中添加：
`async_pending_load_task_pool_size=20`
@@ -100,7 +100,7 @@ FE 的配置项有两种方式进行配置：
2. 修改 `dynamic_partition_enable`
- 通过 `ADMIN SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且是
Master FE 独有配置。则首先我们可以连接到任意 FE，执行如下命令修改配置：
+ 通过 `SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且是 Master
FE 独有配置。则首先我们可以连接到任意 FE，执行如下命令修改配置：
```text
ADMIN SET FRONTEND CONFIG ("dynamic_partition_enable" = "true");`
@@ -110,14 +110,14 @@ FE 的配置项有两种方式进行配置：
```text
set forward_to_master=true;
- ADMIN SHOW FRONTEND CONFIG;
+ SHOW FRONTEND CONFIG;
```
通过以上方式修改后，如果 Master FE 重启或进行了 Master 切换，则配置将失效。可以通过在 `fe.conf` 中直接添加配置项，并重启
FE 后，永久生效该配置项。
3. 修改 `max_distribution_pruner_recursion_depth`
- 通过 `ADMIN SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且不是
Master FE 独有配置。
+ 通过 `SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且不是 Master
FE 独有配置。
同样，我们可以通过动态修改配置的命令修改该配置。因为该配置不是 Master FE 独有配置，所以需要单独连接到不同的
FE，进行动态修改配置的操作，这样才能保证所有 FE 都使用了修改后的配置值
@@ -902,7 +902,7 @@ http请求处理/api/upload任务的最大线程池
这将限制哈希分布修剪器的最大递归深度。 例如：其中 a in（5 个元素）和 b in（4 个元素）和 c in（3 个元素）和 d in（2 个元素）。
a/b/c/d 是分布式列，所以递归深度为 5 * 4 * 3 * 2 = 120，大于 100， 因此该分发修剪器将不起作用，只会返回所有 buckets。
增加深度可以支持更多元素的分布修剪，但可能会消耗更多的 CPU
-通过 `ADMIN SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且不是
Master FE 独有配置。
+通过 `SHOW FRONTEND CONFIG;` 可以查看到该配置项可以动态配置（`IsMutable` 为 true）。并且不是 Master FE
独有配置。
同样，我们可以通过动态修改配置的命令修改该配置。因为该配置不是 Master FE 独有配置，所以需要单独连接到不同的
FE，进行动态修改配置的操作，这样才能保证所有 FE 都使用了修改后的配置值
diff --git a/docs/zh-CN/docs/admin-manual/data-admin/delete-recover.md
b/docs/zh-CN/docs/admin-manual/data-admin/delete-recover.md
index dc3f5c28b90..26f338e1d9f 100644
--- a/docs/zh-CN/docs/admin-manual/data-admin/delete-recover.md
+++ b/docs/zh-CN/docs/admin-manual/data-admin/delete-recover.md
@@ -185,7 +185,7 @@ sh restore_tablet_tool.sh --backend "http://127.0.0.1:8040";
--file tablets.txt
ADMIN SET FRONTEND CONFIG ("recover_with_empty_tablet" = "true");
```
- * 注：可以先通过 `ADMIN SHOW FRONTEND CONFIG;` 命令查看当前版本是否支持该参数。
+ * 注：可以先通过 `SHOW FRONTEND CONFIG;` 命令查看当前版本是否支持该参数。
3. 设置完成几分钟后，应该会在 Master FE 日志 `fe.log` 中看到如下日志：
diff --git
a/docs/zh-CN/docs/admin-manual/maint-monitor/tablet-repair-and-balance.md
b/docs/zh-CN/docs/admin-manual/maint-monitor/tablet-repair-and-balance.md
index 1109f0eb9f4..0ee5651cafd 100644
--- a/docs/zh-CN/docs/admin-manual/maint-monitor/tablet-repair-and-balance.md
+++ b/docs/zh-CN/docs/admin-manual/maint-monitor/tablet-repair-and-balance.md
@@ -298,7 +298,7 @@ TabletScheduler 在每轮调度时，都会通过 LoadBalancer 来选择一定
用户可以通过以下命令查看指定表或分区的副本状态，并可以通过 WHERE 语句对状态进行过滤。如查看表 tbl1 中，分区 p1 和 p2 上状态为
OK 的副本：
- `ADMIN SHOW REPLICA STATUS FROM tbl1 PARTITION (p1, p2) WHERE STATUS =
"OK";`
+ `SHOW REPLICA STATUS FROM tbl1 PARTITION (p1, p2) WHERE STATUS = "OK";`
```
+----------+-----------+-----------+---------+-------------------+--------------------+------------------+------------+------------+-------+--------+--------+
@@ -313,9 +313,9 @@ TabletScheduler 在每轮调度时，都会通过 LoadBalancer 来选择一定
+----------+-----------+-----------+---------+-------------------+--------------------+------------------+------------+------------+-------+--------+--------+
```
- 这里会展示所有副本的状态。其中 `IsBad` 列为 `true` 则表示副本已经损坏。而 `Status`
列则会显示另外的其他状态。具体的状态说明，可以通过 `HELP ADMIN SHOW REPLICA STATUS;` 查看帮助。
+ 这里会展示所有副本的状态。其中 `IsBad` 列为 `true` 则表示副本已经损坏。而 `Status`
列则会显示另外的其他状态。具体的状态说明，可以通过 `HELP SHOW REPLICA STATUS;` 查看帮助。
- `ADMIN SHOW REPLICA STATUS` 命令主要用于查看副本的健康状态。用户还可以通过以下命令查看指定表中副本的一些额外信息：
+ `SHOW REPLICA STATUS` 命令主要用于查看副本的健康状态。用户还可以通过以下命令查看指定表中副本的一些额外信息：
`SHOW TABLETS FROM tbl1;`
@@ -335,7 +335,7 @@ TabletScheduler 在每轮调度时，都会通过 LoadBalancer 来选择一定
此外，用户也可以通过以下命令，查看指定表或分区的副本分布情况，来检查副本分布是否均匀。
- `ADMIN SHOW REPLICA DISTRIBUTION FROM tbl1;`
+ `SHOW REPLICA DISTRIBUTION FROM tbl1;`
```
+-----------+------------+-------+---------+
diff --git a/docs/zh-CN/docs/advanced/alter-table/schema-change.md
b/docs/zh-CN/docs/advanced/alter-table/schema-change.md
index 4b324a8f73c..2d5474fc62d 100644
--- a/docs/zh-CN/docs/advanced/alter-table/schema-change.md
+++ b/docs/zh-CN/docs/advanced/alter-table/schema-change.md
@@ -264,7 +264,7 @@ SHOW ALTER TABLE COLUMN\G;
数据分片副本是否完整，可以通过以下命令查看：
- `ADMIN SHOW REPLICA STATUS FROM tbl WHERE STATUS != "OK";`
+ `SHOW REPLICA STATUS FROM tbl WHERE STATUS != "OK";`
如果有返回结果，则说明有副本有问题。通常系统会自动修复这些问题，用户也可以通过以下命令优先修复这个表：
diff --git a/docs/zh-CN/docs/advanced/variables.md
b/docs/zh-CN/docs/advanced/variables.md
index 96e47d3d8d6..2035b2af9da 100644
--- a/docs/zh-CN/docs/advanced/variables.md
+++ b/docs/zh-CN/docs/advanced/variables.md
@@ -245,7 +245,7 @@ SELECT /*+ SET_VAR(query_timeout = 1,
enable_partition_cache=true) */ sleep(3);
转发到 Master 可以查看启动时间、最后一次心跳信息。
- 4. `SHOW TABLET;`/`ADMIN SHOW REPLICA DISTRIBUTION;`/`ADMIN SHOW REPLICA
STATUS;`
+ 4. `SHOW TABLET;`/`SHOW REPLICA DISTRIBUTION;`/`SHOW REPLICA STATUS;`
转发到 Master 可以查看 Master FE 元数据中存储的 tablet 信息。正常情况下，不同 FE 元数据中 tablet
信息应该是一致的。当出现问题时，可以通过这个方法比较当前 FE 和 Master FE 元数据的差异。
diff --git
a/docs/zh-CN/docs/query-acceleration/join-optimization/colocation-join.md
b/docs/zh-CN/docs/query-acceleration/join-optimization/colocation-join.md
index 95661219cdb..88a6b86d1e8 100644
--- a/docs/zh-CN/docs/query-acceleration/join-optimization/colocation-join.md
+++ b/docs/zh-CN/docs/query-acceleration/join-optimization/colocation-join.md
@@ -356,7 +356,7 @@ HASH JOIN 节点会显示对应原因：`colocate: false, reason: group is not s
是否关闭 Doris 的自动 Colocation 副本均衡。默认为 false，即不关闭。该参数只影响 Colocation
表的副本均衡，不影响普通表。
-以上参数可以动态修改，设置方式请参阅 `HELP ADMIN SHOW CONFIG;` 和 `HELP ADMIN SET CONFIG;`。
+以上参数可以动态修改，设置方式请参阅 `HELP SHOW CONFIG;` 和 `HELP ADMIN SET CONFIG;`。
- disable_colocate_join
diff --git a/docs/zh-CN/docs/query-acceleration/statistics.md
b/docs/zh-CN/docs/query-acceleration/statistics.md
index 072ed88a417..a9318b7880a 100644
--- a/docs/zh-CN/docs/query-acceleration/statistics.md
+++ b/docs/zh-CN/docs/query-acceleration/statistics.md
@@ -334,7 +334,7 @@ mysql> KILL ANALYZE 52357;
执行ANALYZE时统计数据会被写入到内部表`__internal_schema.column_statistics`中，FE会在执行ANALYZE前检查该表tablet状态，如果存在不可用的tablet则拒绝执行作业。出现该报错请检查BE集群状态。
-用户可通过`SHOW BACKENDS\G`，确定BE状态是否正常。如果BE状态正常，可使用命令`ADMIN SHOW REPLICA STATUS
FROM __internal_schema.[tbl_in_this_db]`，检查该库下tablet状态，确保tablet状态正常。
+用户可通过`SHOW BACKENDS\G`，确定BE状态是否正常。如果BE状态正常，可使用命令`SHOW REPLICA STATUS FROM
__internal_schema.[tbl_in_this_db]`，检查该库下tablet状态，确保tablet状态正常。
<br/>
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-REPAIR-TABLE.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-REPAIR-TABLE.md
index 36fdc619be5..3ebc6a0359e 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-REPAIR-TABLE.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-REPAIR-TABLE.md
@@ -42,7 +42,7 @@ ADMIN REPAIR TABLE table_name[ PARTITION (p1,...)]
说明：
-1. 该语句仅表示让系统尝试以高优先级修复指定表或分区的分片副本，并不保证能够修复成功。用户可以通过 ADMIN SHOW REPLICA STATUS
命令查看修复情况。
+1. 该语句仅表示让系统尝试以高优先级修复指定表或分区的分片副本，并不保证能够修复成功。用户可以通过 `SHOW REPLICA STATUS`
命令查看修复情况。
2. 默认的 timeout 是 14400 秒(4小时)。超时意味着系统将不再以高优先级修复指定表或分区的分片副本。需要重新使用该命令设置
### Example
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-CONFIG.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-CONFIG.md
index ca012b3b4c8..7e8cd41ef99 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-CONFIG.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SET-CONFIG.md
@@ -33,7 +33,7 @@ ADMIN SET CONFIG
### Description
该语句用于设置集群的配置项（当前仅支持设置FE的配置项）。
-可设置的配置项，可以通过 ADMIN SHOW FRONTEND CONFIG; 命令查看。
+可设置的配置项，可以通过 `SHOW FRONTEND CONFIG;` 命令查看。
语法：
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-CONFIG.md
similarity index 87%
rename from
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md
rename to
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-CONFIG.md
index 03b5b93b779..c7544e870d0 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-CONFIG.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN-SHOW-CONFIG",
+ "title": "SHOW-CONFIG",
"language": "zh-CN"
}
---
@@ -24,11 +24,11 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN-SHOW-CONFIG
+## SHOW-CONFIG
### Name
-ADMIN SHOW CONFIG
+SHOW CONFIG
### Description
@@ -37,7 +37,7 @@ ADMIN SHOW CONFIG
语法：
```sql
- ADMIN SHOW FRONTEND CONFIG [LIKE "pattern"];
+SHOW FRONTEND CONFIG [LIKE "pattern"];
```
结果中的各列含义如下：
@@ -54,13 +54,13 @@ ADMIN SHOW CONFIG
1. 查看当前FE节点的配置
```sql
- ADMIN SHOW FRONTEND CONFIG;
+ SHOW FRONTEND CONFIG;
```
2. 使用like谓词搜索当前Fe节点的配置
```
- mysql> ADMIN SHOW FRONTEND CONFIG LIKE '%check_java_version%';
+ mysql> SHOW FRONTEND CONFIG LIKE '%check_java_version%';
+--------------------+-------+---------+-----------+------------+---------+
| Key | Value | Type | IsMutable | MasterOnly | Comment |
+--------------------+-------+---------+-----------+------------+---------+
@@ -71,7 +71,7 @@ ADMIN SHOW CONFIG
### Keywords
- ADMIN, SHOW, CONFIG, ADMIN SHOW
+ SHOW, CONFIG
### Best Practice
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-DISTRIBUTION.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-DISTRIBUTION.md
similarity index 76%
rename from
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-DISTRIBUTION.md
rename to
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-DISTRIBUTION.md
index 43bae4bf13a..318fa654f33 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-DISTRIBUTION.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-DISTRIBUTION.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN-SHOW-REPLICA-DISTRIBUTION",
+ "title": "SHOW-REPLICA-DISTRIBUTION",
"language": "zh-CN"
}
---
@@ -24,11 +24,11 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN-SHOW-REPLICA-DISTRIBUTION
+## SHOW-REPLICA-DISTRIBUTION
### Name
-ADMIN SHOW REPLICA DISTRIBUTION
+SHOW REPLICA DISTRIBUTION
### Description
@@ -37,7 +37,7 @@ ADMIN SHOW REPLICA DISTRIBUTION
语法：
```sql
-ADMIN SHOW REPLICA DISTRIBUTION FROM [db_name.]tbl_name [PARTITION (p1, ...)];
+SHOW REPLICA DISTRIBUTION FROM [db_name.]tbl_name [PARTITION (p1, ...)];
```
说明：
@@ -49,18 +49,18 @@ ADMIN SHOW REPLICA DISTRIBUTION FROM [db_name.]tbl_name
[PARTITION (p1, ...)];
1. 查看表的副本分布
```sql
- ADMIN SHOW REPLICA DISTRIBUTION FROM tbl1;
+ SHOW REPLICA DISTRIBUTION FROM tbl1;
```
2. 查看表的分区的副本分布
```sql
- ADMIN SHOW REPLICA DISTRIBUTION FROM db1.tbl1 PARTITION(p1, p2);
+ SHOW REPLICA DISTRIBUTION FROM db1.tbl1 PARTITION(p1, p2);
```
### Keywords
- ADMIN, SHOW, REPLICA, DISTRIBUTION, ADMIN SHOW
+ SHOW, REPLICA, DISTRIBUTION
### Best Practice
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-STATUS.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-STATUS.md
similarity index 82%
rename from
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-STATUS.md
rename to
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-STATUS.md
index cb2bf069124..7e649807809 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-REPLICA-STATUS.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-REPLICA-STATUS.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN-SHOW-REPLICA-STATUS",
+ "title": "SHOW-REPLICA-STATUS",
"language": "zh-CN"
}
---
@@ -24,11 +24,11 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN-SHOW-REPLICA-STATUS
+## SHOW-REPLICA-STATUS
### Name
-ADMIN SHOW REPLICA STATUS
+SHOW REPLICA STATUS
### Description
@@ -37,7 +37,7 @@ ADMIN SHOW REPLICA STATUS
语法：
```sql
- ADMIN SHOW REPLICA STATUS FROM [db_name.]tbl_name [PARTITION (p1, ...)]
+SHOW REPLICA STATUS FROM [db_name.]tbl_name [PARTITION (p1, ...)]
[where_clause];
```
@@ -58,26 +58,26 @@ ADMIN SHOW REPLICA STATUS
1. 查看表全部的副本状态
```sql
- ADMIN SHOW REPLICA STATUS FROM db1.tbl1;
+ SHOW REPLICA STATUS FROM db1.tbl1;
```
2. 查看表某个分区状态为 VERSION_ERROR 的副本
```sql
- ADMIN SHOW REPLICA STATUS FROM tbl1 PARTITION (p1, p2)
+ SHOW REPLICA STATUS FROM tbl1 PARTITION (p1, p2)
WHERE STATUS = "VERSION_ERROR";
```
3. 查看表所有状态不健康的副本
```sql
- ADMIN SHOW REPLICA STATUS FROM tbl1
+ SHOW REPLICA STATUS FROM tbl1
WHERE STATUS != "OK";
```
### Keywords
- ADMIN, SHOW, REPLICA, STATUS, ADMIN SHOW
+ SHOW, REPLICA, STATUS
### Best Practice
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-DIAGNOSE-TABLET.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-DIAGNOSIS.md
similarity index 92%
rename from
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-DIAGNOSE-TABLET.md
rename to
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-DIAGNOSIS.md
index b6f30dc85bb..3bb7814bbff 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-DIAGNOSE-TABLET.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-DIAGNOSIS.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN DIAGNOSE TABLET",
+ "title": "SHOW TABLET DIAGNOSIS",
"language": "zh-CN"
}
---
@@ -22,14 +22,14 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN DIAGNOSE TABLET
+## SHOW TABLET DIAGNOSIS
### Description
该语句用于诊断指定 tablet。结果中将显示这个 tablet 的信息和一些潜在的问题。
语法：
- ADMIN DIAGNOSE TABLET tblet_id
+ SHOW TABLET DIAGNOSIS tablet_id
说明：
@@ -51,7 +51,8 @@ under the License.
1. 查看 Tablet 10001 的诊断结果
- ADMIN DIAGNOSE TABLET 10001;
+ SHOW TABLET DIAGNOSIS 10001;
### keywords
- ADMIN,DIAGNOSE,TABLET
+
+ SHOW, DIAGNOSIS, TABLET
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-TABLET-STORAGE-FORMAT.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-STORAGE-FORMAT.md
similarity index 83%
rename from
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-TABLET-STORAGE-FORMAT.md
rename to
docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-STORAGE-FORMAT.md
index a56bb73d8c6..3eed4136167 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-TABLET-STORAGE-FORMAT.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Database-Administration-Statements/SHOW-TABLET-STORAGE-FORMAT.md
@@ -1,6 +1,6 @@
---
{
- "title": "ADMIN SHOW TABLET STORAGE FORMAT",
+ "title": "SHOW TABLET STORAGE FORMAT",
"language": "zh-CN"
}
---
@@ -24,21 +24,25 @@ specific language governing permissions and limitations
under the License.
-->
-## ADMIN SHOW TABLET STORAGE FORMAT
+## SHOW TABLET STORAGE FORMAT
### description
+
该语句用于显示Backend上的存储格式信息（仅管理员使用）
语法：
- ADMIN SHOW TABLET STORAGE FORMAT [VERBOSE]
+ SHOW TABLET STORAGE FORMAT [VERBOSE]
### example
- MySQL [(none)]> admin show tablet storage format;
+
+ ```
+ MySQL [(none)]> show tablet storage format;
+-----------+---------+---------+
| BackendId | V1Count | V2Count |
+-----------+---------+---------+
| 10002 | 0 | 2867 |
+-----------+---------+---------+
1 row in set (0.003 sec)
- MySQL [test_query_qa]> admin show tablet storage format verbose;
+
+ MySQL [test_query_qa]> show tablet storage format verbose;
+-----------+----------+---------------+
| BackendId | TabletId | StorageFormat |
+-----------+----------+---------------+
@@ -48,7 +52,8 @@ under the License.
| 10002 | 39199 | V2 |
+-----------+----------+---------------+
4 rows in set (0.034 sec)
+ ```
### keywords
- ADMIN, SHOW, TABLET, STORAGE, FORMAT, ADMIN SHOW
+ SHOW, TABLET, STORAGE, FORMAT
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Utility-Statements/REFRESH-LDAP.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Utility-Statements/REFRESH-LDAP.md
index 9449f60da6f..f800a29cfa4 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Utility-Statements/REFRESH-LDAP.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Utility-Statements/REFRESH-LDAP.md
@@ -37,7 +37,7 @@ REFRESH-LDAP
### Description
-该语句用于刷新Doris中LDAP的缓存信息。修改LDAP服务中用户信息或者修改Doris中LDAP用户组对应的role权限，可能因为缓存的原因不会立即生效，可通过该语句刷新缓存。Doris中LDAP信息缓存默认时间为12小时，可以通过
`ADMIN SHOW FRONTEND CONFIG LIKE 'ldap_user_cache_timeout_s';` 查看。
+该语句用于刷新Doris中LDAP的缓存信息。修改LDAP服务中用户信息或者修改Doris中LDAP用户组对应的role权限，可能因为缓存的原因不会立即生效，可通过该语句刷新缓存。Doris中LDAP信息缓存默认时间为12小时，可以通过
`SHOW FRONTEND CONFIG LIKE 'ldap_user_cache_timeout_s';` 查看。
语法：
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup
b/fe/fe-core/src/main/cup/sql_parser.cup
index 53e5f8903f8..39170d5acb2 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -340,6 +340,7 @@ terminal String
KW_DESC,
KW_DESCRIBE,
KW_DIAGNOSE,
+ KW_DIAGNOSIS,
KW_DISK,
KW_DISTINCT,
KW_DISTINCTPC,
@@ -4212,6 +4213,30 @@ show_param ::=
{:
RESULT = new ShowConvertLSCStmt(db);
:}
+ | KW_REPLICA KW_STATUS KW_FROM base_table_ref:table_ref opt_wild_where
+ {:
+ RESULT = new ShowReplicaStatusStmt(table_ref, parser.where);
+ :}
+ | KW_REPLICA KW_DISTRIBUTION KW_FROM base_table_ref:table_ref
+ {:
+ RESULT = new ShowReplicaDistributionStmt(table_ref);
+ :}
+ | KW_FRONTEND KW_CONFIG opt_wild_where
+ {:
+ RESULT = new ShowConfigStmt(AdminSetConfigStmt.ConfigType.FRONTEND,
parser.wild);
+ :}
+ | KW_TABLET KW_STORAGE KW_FORMAT
+ {:
+ RESULT = new ShowTabletStorageFormatStmt(false);
+ :}
+ | KW_TABLET KW_STORAGE KW_FORMAT KW_VERBOSE
+ {:
+ RESULT = new ShowTabletStorageFormatStmt(true);
+ :}
+ | KW_TABLET KW_DIAGNOSIS INTEGER_LITERAL:tabletId
+ {:
+ RESULT = new DiagnoseTabletStmt(tabletId);
+ :}
;
opt_tmp ::=
@@ -7170,13 +7195,15 @@ integer_list ::=
;
admin_stmt ::=
+ // deprecated
KW_ADMIN KW_SHOW KW_REPLICA KW_STATUS KW_FROM base_table_ref:table_ref
opt_wild_where
{:
- RESULT = new AdminShowReplicaStatusStmt(table_ref, parser.where);
+ RESULT = new ShowReplicaStatusStmt(table_ref, parser.where);
:}
+ // deprecated
| KW_ADMIN KW_SHOW KW_REPLICA KW_DISTRIBUTION KW_FROM
base_table_ref:table_ref
{:
- RESULT = new AdminShowReplicaDistributionStmt(table_ref);
+ RESULT = new ShowReplicaDistributionStmt(table_ref);
:}
| KW_ADMIN KW_SET KW_REPLICA KW_STATUS KW_PROPERTIES LPAREN
key_value_map:prop RPAREN
{:
@@ -7198,9 +7225,10 @@ admin_stmt ::=
{:
RESULT = new
AdminSetConfigStmt(AdminSetConfigStmt.ConfigType.FRONTEND, configs);
:}
+ // deprecated
| KW_ADMIN KW_SHOW KW_FRONTEND KW_CONFIG opt_wild_where
{:
- RESULT = new
AdminShowConfigStmt(AdminSetConfigStmt.ConfigType.FRONTEND, parser.wild);
+ RESULT = new ShowConfigStmt(AdminSetConfigStmt.ConfigType.FRONTEND,
parser.wild);
:}
| KW_ADMIN KW_CHECK KW_TABLET LPAREN integer_list:tabletIds RPAREN
opt_properties:properties
{:
@@ -7230,17 +7258,20 @@ admin_stmt ::=
{:
RESULT = new AdminCleanTrashStmt(null);
:}
+ // deprecated
| KW_ADMIN KW_DIAGNOSE KW_TABLET INTEGER_LITERAL:tabletId
{:
- RESULT = new AdminDiagnoseTabletStmt(tabletId);
+ RESULT = new DiagnoseTabletStmt(tabletId);
:}
+ // deprecated
| KW_ADMIN KW_SHOW KW_TABLET KW_STORAGE KW_FORMAT
{:
- RESULT = new AdminShowTabletStorageFormatStmt(false);
+ RESULT = new ShowTabletStorageFormatStmt(false);
:}
+ // deprecated
| KW_ADMIN KW_SHOW KW_TABLET KW_STORAGE KW_FORMAT KW_VERBOSE
{:
- RESULT = new AdminShowTabletStorageFormatStmt(true);
+ RESULT = new ShowTabletStorageFormatStmt(true);
:}
| KW_ADMIN KW_COPY KW_TABLET INTEGER_LITERAL:tabletId
opt_properties:properties
{:
@@ -7459,6 +7490,8 @@ keyword ::=
{: RESULT = id; :}
| KW_DIAGNOSE:id
{: RESULT = id; :}
+ | KW_DIAGNOSIS:id
+ {: RESULT = id; :}
| KW_DISTINCTPC:id
{: RESULT = id; :}
| KW_DISTINCTPCSA:id
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminDiagnoseTabletStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DiagnoseTabletStmt.java
similarity index 92%
rename from
fe/fe-core/src/main/java/org/apache/doris/analysis/AdminDiagnoseTabletStmt.java
rename to
fe/fe-core/src/main/java/org/apache/doris/analysis/DiagnoseTabletStmt.java
index 87f1902fe7b..b86cb30199e 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminDiagnoseTabletStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DiagnoseTabletStmt.java
@@ -29,15 +29,15 @@ import org.apache.doris.qe.ShowResultSetMetaData;
import com.google.common.collect.ImmutableList;
-// ADMIN DIAGNOSE TABLET tablet_id
-public class AdminDiagnoseTabletStmt extends ShowStmt {
+// SHOW TABLET DIAGNOSIS tablet_id
+public class DiagnoseTabletStmt extends ShowStmt {
public static final ImmutableList<String> TITLE_NAMES = new
ImmutableList.Builder<String>()
.add("Item").add("Info").add("Suggestion")
.build();
private long tabletId;
- public AdminDiagnoseTabletStmt(long tabletId) {
+ public DiagnoseTabletStmt(long tabletId) {
this.tabletId = tabletId;
}
@@ -57,7 +57,7 @@ public class AdminDiagnoseTabletStmt extends ShowStmt {
@Override
public String toSql() {
- return "ADMIN DIAGNOSE TABLET " + tabletId;
+ return "SHOW TABLET DIAGNOSIS " + tabletId;
}
@Override
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowConfigStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowConfigStmt.java
similarity index 95%
rename from
fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowConfigStmt.java
rename to fe/fe-core/src/main/java/org/apache/doris/analysis/ShowConfigStmt.java
index e31dee64016..62b91a32420 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowConfigStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowConfigStmt.java
@@ -31,8 +31,8 @@ import org.apache.doris.qe.ShowResultSetMetaData;
import com.google.common.collect.ImmutableList;
-// admin show frontend config;
-public class AdminShowConfigStmt extends ShowStmt {
+// show frontend config;
+public class ShowConfigStmt extends ShowStmt {
public static final ImmutableList<String> TITLE_NAMES = new
ImmutableList.Builder<String>().add("Key").add(
"Value").add("Type").add("IsMutable").add("MasterOnly").add("Comment").build();
@@ -40,7 +40,7 @@ public class AdminShowConfigStmt extends ShowStmt {
private String pattern;
- public AdminShowConfigStmt(ConfigType type, String pattern) {
+ public ShowConfigStmt(ConfigType type, String pattern) {
this.type = type;
this.pattern = pattern;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowReplicaDistributionStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaDistributionStmt.java
similarity index 93%
rename from
fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowReplicaDistributionStmt.java
rename to
fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaDistributionStmt.java
index 7442d0e9bfb..2f6ef278562 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowReplicaDistributionStmt.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaDistributionStmt.java
@@ -31,8 +31,8 @@ import org.apache.doris.qe.ShowResultSetMetaData;
import com.google.common.collect.ImmutableList;
-// admin show replica distribution from tbl [partition(p1, p2, ...)]
-public class AdminShowReplicaDistributionStmt extends ShowStmt {
+// show replica distribution from tbl [partition(p1, p2, ...)]
+public class ShowReplicaDistributionStmt extends ShowStmt {
public static final ImmutableList<String> TITLE_NAMES = new
ImmutableList.Builder<String>()
.add("BackendId").add("ReplicaNum").add("ReplicaSize")
.add("NumGraph").add("NumPercent")
@@ -41,7 +41,7 @@ public class AdminShowReplicaDistributionStmt extends
ShowStmt {
private TableRef tblRef;
- public AdminShowReplicaDistributionStmt(TableRef tblRef) {
+ public ShowReplicaDistributionStmt(TableRef tblRef) {
this.tblRef = tblRef;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowReplicaStatusStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaStatusStmt.java
similarity index 97%
rename from
fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowReplicaStatusStmt.java
rename to
fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaStatusStmt.java
index ccf9ed17f73..2a1f96fed96 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowReplicaStatusStmt.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaStatusStmt.java
@@ -36,7 +36,7 @@ import com.google.common.collect.Lists;
import java.util.List;
-public class AdminShowReplicaStatusStmt extends ShowStmt {
+public class ShowReplicaStatusStmt extends ShowStmt {
public static final ImmutableList<String> TITLE_NAMES = new
ImmutableList.Builder<String>()
.add("TabletId").add("ReplicaId").add("BackendId").add("Version").add("LastFailedVersion")
.add("LastSuccessVersion").add("CommittedVersion").add("SchemaHash").add("VersionNum")
@@ -50,7 +50,7 @@ public class AdminShowReplicaStatusStmt extends ShowStmt {
private Operator op;
private ReplicaStatus statusFilter;
- public AdminShowReplicaStatusStmt(TableRef tblRef, Expr where) {
+ public ShowReplicaStatusStmt(TableRef tblRef, Expr where) {
this.tblRef = tblRef;
this.where = where;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowTabletStorageFormatStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTabletStorageFormatStmt.java
similarity index 93%
rename from
fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowTabletStorageFormatStmt.java
rename to
fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTabletStorageFormatStmt.java
index 30121b19970..441f0f1d7d5 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowTabletStorageFormatStmt.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTabletStorageFormatStmt.java
@@ -27,10 +27,10 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.ShowResultSetMetaData;
-public class AdminShowTabletStorageFormatStmt extends ShowStmt {
+public class ShowTabletStorageFormatStmt extends ShowStmt {
private boolean verbose;
- public AdminShowTabletStorageFormatStmt(boolean verbose) {
+ public ShowTabletStorageFormatStmt(boolean verbose) {
this.verbose = verbose;
}
@@ -54,7 +54,7 @@ public class AdminShowTabletStorageFormatStmt extends
ShowStmt {
@Override
public String toSql() {
- StringBuilder sb = new StringBuilder("ADMIN SHOW TABLET STORAGE TYPE");
+ StringBuilder sb = new StringBuilder("SHOW TABLET STORAGE TYPE");
if (verbose) {
sb.append(" VERBOSE");
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetadataViewer.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetadataViewer.java
index d99de6ef006..33f0d9f9a57 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetadataViewer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetadataViewer.java
@@ -17,11 +17,11 @@
package org.apache.doris.catalog;
-import org.apache.doris.analysis.AdminShowReplicaDistributionStmt;
-import org.apache.doris.analysis.AdminShowReplicaStatusStmt;
import org.apache.doris.analysis.BinaryPredicate.Operator;
import org.apache.doris.analysis.PartitionNames;
import org.apache.doris.analysis.ShowDataSkewStmt;
+import org.apache.doris.analysis.ShowReplicaDistributionStmt;
+import org.apache.doris.analysis.ShowReplicaStatusStmt;
import org.apache.doris.catalog.MaterializedIndex.IndexExtState;
import org.apache.doris.catalog.Replica.ReplicaStatus;
import org.apache.doris.common.DdlException;
@@ -39,7 +39,7 @@ import java.util.Map;
public class MetadataViewer {
- public static List<List<String>>
getTabletStatus(AdminShowReplicaStatusStmt stmt) throws DdlException {
+ public static List<List<String>> getTabletStatus(ShowReplicaStatusStmt
stmt) throws DdlException {
return getTabletStatus(stmt.getDbName(), stmt.getTblName(),
stmt.getPartitions(),
stmt.getStatusFilter(), stmt.getOp());
}
@@ -159,7 +159,7 @@ public class MetadataViewer {
}
}
- public static List<List<String>>
getTabletDistribution(AdminShowReplicaDistributionStmt stmt) throws
DdlException {
+ public static List<List<String>>
getTabletDistribution(ShowReplicaDistributionStmt stmt) throws DdlException {
return getTabletDistribution(stmt.getDbName(), stmt.getTblName(),
stmt.getPartitionNames());
}
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 ac8e4f5cd98..569d3e1c3a7 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
@@ -18,12 +18,8 @@
package org.apache.doris.qe;
import org.apache.doris.analysis.AdminCopyTabletStmt;
-import org.apache.doris.analysis.AdminDiagnoseTabletStmt;
-import org.apache.doris.analysis.AdminShowConfigStmt;
-import org.apache.doris.analysis.AdminShowReplicaDistributionStmt;
-import org.apache.doris.analysis.AdminShowReplicaStatusStmt;
-import org.apache.doris.analysis.AdminShowTabletStorageFormatStmt;
import org.apache.doris.analysis.DescribeStmt;
+import org.apache.doris.analysis.DiagnoseTabletStmt;
import org.apache.doris.analysis.HelpStmt;
import org.apache.doris.analysis.LimitElement;
import org.apache.doris.analysis.PartitionNames;
@@ -41,6 +37,7 @@ import org.apache.doris.analysis.ShowCollationStmt;
import org.apache.doris.analysis.ShowColumnHistStmt;
import org.apache.doris.analysis.ShowColumnStatsStmt;
import org.apache.doris.analysis.ShowColumnStmt;
+import org.apache.doris.analysis.ShowConfigStmt;
import org.apache.doris.analysis.ShowConvertLSCStmt;
import org.apache.doris.analysis.ShowCreateCatalogStmt;
import org.apache.doris.analysis.ShowCreateDbStmt;
@@ -78,6 +75,8 @@ import org.apache.doris.analysis.ShowProcStmt;
import org.apache.doris.analysis.ShowProcesslistStmt;
import org.apache.doris.analysis.ShowQueryProfileStmt;
import org.apache.doris.analysis.ShowQueryStatsStmt;
+import org.apache.doris.analysis.ShowReplicaDistributionStmt;
+import org.apache.doris.analysis.ShowReplicaStatusStmt;
import org.apache.doris.analysis.ShowRepositoriesStmt;
import org.apache.doris.analysis.ShowResourcesStmt;
import org.apache.doris.analysis.ShowRestoreStmt;
@@ -97,6 +96,7 @@ import org.apache.doris.analysis.ShowTableStatsStmt;
import org.apache.doris.analysis.ShowTableStatusStmt;
import org.apache.doris.analysis.ShowTableStmt;
import org.apache.doris.analysis.ShowTabletStmt;
+import org.apache.doris.analysis.ShowTabletStorageFormatStmt;
import org.apache.doris.analysis.ShowTabletsBelongStmt;
import org.apache.doris.analysis.ShowTransactionStmt;
import org.apache.doris.analysis.ShowTrashDiskStmt;
@@ -377,11 +377,11 @@ public class ShowExecutor {
handleShowTrash();
} else if (stmt instanceof ShowTrashDiskStmt) {
handleShowTrashDisk();
- } else if (stmt instanceof AdminShowReplicaStatusStmt) {
+ } else if (stmt instanceof ShowReplicaStatusStmt) {
handleAdminShowTabletStatus();
- } else if (stmt instanceof AdminShowReplicaDistributionStmt) {
+ } else if (stmt instanceof ShowReplicaDistributionStmt) {
handleAdminShowTabletDistribution();
- } else if (stmt instanceof AdminShowConfigStmt) {
+ } else if (stmt instanceof ShowConfigStmt) {
handleAdminShowConfig();
} else if (stmt instanceof ShowSmallFilesStmt) {
handleShowSmallFiles();
@@ -415,9 +415,9 @@ public class ShowExecutor {
handleShowTableCreation();
} else if (stmt instanceof ShowLastInsertStmt) {
handleShowLastInsert();
- } else if (stmt instanceof AdminShowTabletStorageFormatStmt) {
+ } else if (stmt instanceof ShowTabletStorageFormatStmt) {
handleAdminShowTabletStorageFormat();
- } else if (stmt instanceof AdminDiagnoseTabletStmt) {
+ } else if (stmt instanceof DiagnoseTabletStmt) {
handleAdminDiagnoseTablet();
} else if (stmt instanceof ShowCreateMaterializedViewStmt) {
handleShowCreateMaterializedView();
@@ -2106,7 +2106,7 @@ public class ShowExecutor {
}
private void handleAdminShowTabletStatus() throws AnalysisException {
- AdminShowReplicaStatusStmt showStmt = (AdminShowReplicaStatusStmt)
stmt;
+ ShowReplicaStatusStmt showStmt = (ShowReplicaStatusStmt) stmt;
List<List<String>> results;
try {
results = MetadataViewer.getTabletStatus(showStmt);
@@ -2117,7 +2117,7 @@ public class ShowExecutor {
}
private void handleAdminShowTabletDistribution() throws AnalysisException {
- AdminShowReplicaDistributionStmt showStmt =
(AdminShowReplicaDistributionStmt) stmt;
+ ShowReplicaDistributionStmt showStmt = (ShowReplicaDistributionStmt)
stmt;
List<List<String>> results;
try {
results = MetadataViewer.getTabletDistribution(showStmt);
@@ -2128,7 +2128,7 @@ public class ShowExecutor {
}
private void handleAdminShowConfig() throws AnalysisException {
- AdminShowConfigStmt showStmt = (AdminShowConfigStmt) stmt;
+ ShowConfigStmt showStmt = (ShowConfigStmt) stmt;
List<List<String>> results;
PatternMatcher matcher = null;
@@ -2654,7 +2654,7 @@ public class ShowExecutor {
}
private void handleAdminDiagnoseTablet() {
- AdminDiagnoseTabletStmt showStmt = (AdminDiagnoseTabletStmt) stmt;
+ DiagnoseTabletStmt showStmt = (DiagnoseTabletStmt) stmt;
List<List<String>> resultRowSet =
Diagnoser.diagnoseTablet(showStmt.getTabletId());
ShowResultSetMetaData showMetaData = showStmt.getMetaData();
resultSet = new ShowResultSet(showMetaData, resultRowSet);
diff --git a/fe/fe-core/src/main/jflex/sql_scanner.flex
b/fe/fe-core/src/main/jflex/sql_scanner.flex
index 314a04599b0..97bbd7b49f1 100644
--- a/fe/fe-core/src/main/jflex/sql_scanner.flex
+++ b/fe/fe-core/src/main/jflex/sql_scanner.flex
@@ -191,6 +191,7 @@ import org.apache.doris.qe.SqlModeHelper;
keywordMap.put("desc", new Integer(SqlParserSymbols.KW_DESC));
keywordMap.put("describe", new Integer(SqlParserSymbols.KW_DESCRIBE));
keywordMap.put("diagnose", new Integer(SqlParserSymbols.KW_DIAGNOSE));
+ keywordMap.put("diagnosis", new
Integer(SqlParserSymbols.KW_DIAGNOSIS));
keywordMap.put("disk", new Integer(SqlParserSymbols.KW_DISK));
keywordMap.put("distinct", new Integer(SqlParserSymbols.KW_DISTINCT));
keywordMap.put("distinctpc", new
Integer(SqlParserSymbols.KW_DISTINCTPC));
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminShowReplicaTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
similarity index 80%
rename from
fe/fe-core/src/test/java/org/apache/doris/analysis/AdminShowReplicaTest.java
rename to
fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
index 2c2caf0c5be..56e66631f84 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminShowReplicaTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
import java.io.StringReader;
import java.lang.reflect.Method;
-public class AdminShowReplicaTest extends TestWithFeService {
+public class ShowReplicaTest extends TestWithFeService {
@Override
protected void runBeforeAll() throws Exception {
createDatabase("test");
@@ -51,8 +51,8 @@ public class AdminShowReplicaTest extends TestWithFeService {
@Test
public void testShowReplicaDistribution() throws Exception {
- String stmtStr = "admin show replica distribution from test.tbl1
partition(p1)";
- AdminShowReplicaDistributionStmt stmt =
(AdminShowReplicaDistributionStmt) parseAndAnalyzeStmt(
+ String stmtStr = "show replica distribution from test.tbl1
partition(p1)";
+ ShowReplicaDistributionStmt stmt = (ShowReplicaDistributionStmt)
parseAndAnalyzeStmt(
stmtStr);
ShowExecutor executor = new ShowExecutor(connectContext, stmt);
ShowResultSet resultSet = executor.execute();
@@ -93,36 +93,36 @@ public class AdminShowReplicaTest extends TestWithFeService
{
@Test
public void testShowReplicaStatus() {
- String stmt = new String("ADMIN SHOW REPLICA STATUS FROM db.tbl1 WHERE
status = 'ok'");
+ String stmt = new String("SHOW REPLICA STATUS FROM db.tbl1 WHERE
status = 'ok'");
testAnalyzeWhere(stmt, true);
- stmt = new String("ADMIN SHOW REPLICA STATUS FROM db.tbl1 WHERE status
!= 'ok'");
+ stmt = new String("SHOW REPLICA STATUS FROM db.tbl1 WHERE status !=
'ok'");
testAnalyzeWhere(stmt, true);
- stmt = new String("ADMIN SHOW REPLICA STATUS FROM db.tbl1 WHERE status
= 'dead'");
+ stmt = new String("SHOW REPLICA STATUS FROM db.tbl1 WHERE status =
'dead'");
testAnalyzeWhere(stmt, true);
- stmt = new String("ADMIN SHOW REPLICA STATUS FROM db.tbl1 WHERE status
!= 'VERSION_ERROR'");
+ stmt = new String("SHOW REPLICA STATUS FROM db.tbl1 WHERE status !=
'VERSION_ERROR'");
testAnalyzeWhere(stmt, true);
- stmt = new String("ADMIN SHOW REPLICA STATUS FROM db.tbl1 WHERE status
= 'MISSING'");
+ stmt = new String("SHOW REPLICA STATUS FROM db.tbl1 WHERE status =
'MISSING'");
testAnalyzeWhere(stmt, true);
- stmt = new String("ADMIN SHOW REPLICA STATUS FROM db.tbl1 WHERE status
= 'missing'");
+ stmt = new String("SHOW REPLICA STATUS FROM db.tbl1 WHERE status =
'missing'");
testAnalyzeWhere(stmt, true);
- stmt = new String("ADMIN SHOW REPLICA STATUS FROM db.tbl1 WHERE status
!= 'what'");
+ stmt = new String("SHOW REPLICA STATUS FROM db.tbl1 WHERE status !=
'what'");
testAnalyzeWhere(stmt, false);
- stmt = new String("ADMIN SHOW REPLICA STATUS FROM db.tbl1 WHERE status
= 'how'");
+ stmt = new String("SHOW REPLICA STATUS FROM db.tbl1 WHERE status =
'how'");
testAnalyzeWhere(stmt, false);
}
private void testAnalyzeWhere(String stmt, boolean correct) {
SqlParser parser = new SqlParser(new SqlScanner(new
StringReader(stmt)));
- AdminShowReplicaStatusStmt showStmt = null;
+ ShowReplicaStatusStmt showStmt = null;
try {
- showStmt = (AdminShowReplicaStatusStmt)
SqlParserUtils.getFirstStmt(parser);
+ showStmt = (ShowReplicaStatusStmt)
SqlParserUtils.getFirstStmt(parser);
} catch (Error e) {
Assert.fail(e.getMessage());
} catch (Exception e) {
@@ -130,7 +130,7 @@ public class AdminShowReplicaTest extends TestWithFeService
{
}
try {
- Method method =
AdminShowReplicaStatusStmt.class.getDeclaredMethod("analyzeWhere");
+ Method method =
ShowReplicaStatusStmt.class.getDeclaredMethod("analyzeWhere");
method.setAccessible(true);
if (!(Boolean) method.invoke(showStmt)) {
if (correct) {
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
index fff5c1c26cf..5c32cc48aa4 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
@@ -64,7 +64,7 @@ class Syncer {
}
Boolean checkEnableFeatureBinlog() {
- List<List<Object>> rows = suite.sql("ADMIN SHOW FRONTEND CONFIG LIKE
\"%%enable_feature_binlog%%\"")
+ List<List<Object>> rows = suite.sql("SHOW FRONTEND CONFIG LIKE
\"%%enable_feature_binlog%%\"")
if (rows.size() >= 1 && (rows[0][0] as
String).contains("enable_feature_binlog")) {
return (rows[0][1] as String) == "true"
}
diff --git a/regression-test/suites/alter_p2/test_alter_table_property.groovy
b/regression-test/suites/alter_p2/test_alter_table_property.groovy
index 474a7737d2f..f3d300aafc2 100644
--- a/regression-test/suites/alter_p2/test_alter_table_property.groovy
+++ b/regression-test/suites/alter_p2/test_alter_table_property.groovy
@@ -38,7 +38,7 @@ suite ("test_alter_table_property") {
sql "INSERT INTO ${tableName} VALUES (50, 100)"
def queryReplicaCount = { partitionName ->
- def result = sql "ADMIN SHOW REPLICA DISTRIBUTION FROM ${tableName}
PARTITION ${partitionName}"
+ def result = sql "SHOW REPLICA DISTRIBUTION FROM ${tableName}
PARTITION ${partitionName}"
int sum = 0
for (row in result) {
sum += row[1].toInteger()
diff --git
a/regression-test/suites/schema_change/test_alter_database_property.groovy
b/regression-test/suites/schema_change/test_alter_database_property.groovy
index 3163b42787c..833dbae67d6 100644
--- a/regression-test/suites/schema_change/test_alter_database_property.groovy
+++ b/regression-test/suites/schema_change/test_alter_database_property.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_alter_database_property") {
- def ret = sql "ADMIN SHOW FRONTEND CONFIG like '%enable_feature_binlog%';"
+ def ret = sql "SHOW FRONTEND CONFIG like '%enable_feature_binlog%';"
logger.info("${ret}")
if (ret.size() != 0 && ret[0].size() > 1 && ret[0][1] == 'false') {
logger.info("enable_feature_binlog=false in frontend config, no need
to run this case.")
diff --git
a/regression-test/suites/show_p0/test_show_create_table_and_views.groovy
b/regression-test/suites/show_p0/test_show_create_table_and_views.groovy
index 89670aa434f..31a2229a69c 100644
--- a/regression-test/suites/show_p0/test_show_create_table_and_views.groovy
+++ b/regression-test/suites/show_p0/test_show_create_table_and_views.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_show_create_table_and_views", "show") {
- def ret = sql "ADMIN SHOW FRONTEND CONFIG like '%enable_feature_binlog%';"
+ def ret = sql "SHOW FRONTEND CONFIG like '%enable_feature_binlog%';"
logger.info("${ret}")
if (ret.size() != 0 && ret[0].size() > 1 && ret[0][1] == 'false') {
logger.info("enable_feature_binlog=false in frontend config, no need
to run this case.")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
