diff --git a/docs/en/docs/sql-manual/sql-functions/table-functions/frontends_disks.md b/docs/en/docs/sql-manual/sql-functions/table-functions/frontends_disks.md index c92a076f5f..5bda913d72 100644 --- a/docs/en/docs/sql-manual/sql-functions/table-functions/frontends_disks.md +++ b/docs/en/docs/sql-manual/sql-functions/table-functions/frontends_disks.md @@ -52,7 +52,6 @@ mysql> desc function frontends_disks(); +-------------+------+------+-------+---------+-------+ | Name | TEXT | No | false | NULL | NONE | | Host | TEXT | No | false | NULL | NONE | -| EditLogPort | TEXT | No | false | NULL | NONE | | DirType | TEXT | No | false | NULL | NONE | | Dir | TEXT | No | false | NULL | NONE | | Filesystem | TEXT | No | false | NULL | NONE | @@ -75,7 +74,6 @@ mysql> select * from frontends_disk()\G *************************** 1. row *************************** Name: fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 Host: 172.XX.XX.1 -EditLogPort: 9010 DirType: log Dir: /data/doris/fe-github/log Filesystem: /dev/sdc5 diff --git a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-FRONTENDS-DISKS.md b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-FRONTENDS-DISKS.md index caef903b9a..2ae717a2ba 100644 --- a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-FRONTENDS-DISKS.md +++ b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-FRONTENDS-DISKS.md @@ -44,31 +44,30 @@ illustrate: 1. Name indicates the name of the FE node in bdbje. 2. Host indicates the ip of the FE node. -3. EditLogPort indicates the edit log port of the FE node. -4. DirType indicates the type of dir type, such as meta, log, audit-log and temp dir. -5. Dir indicates the dir path of FE node dir in which type. -6. FileSystem indicates the dir path in which file system on the linux operation system. -7. Capacity indicates total capacity of the filesystem. -8. Used indicates the size of the filesystem already used. -9. Available indicates the size of the filesystem remained. -10.UseRate indicates File system usage capacity ratio. -11.MountOn indicates the mount dir of the filesystem. +3. DirType indicates the type of dir type, such as meta, log, audit-log and temp dir. +4. Dir indicates the dir path of FE node dir in which type. +5. FileSystem indicates the dir path in which file system on the linux operation system. +6. Capacity indicates total capacity of the filesystem. +7. Used indicates the size of the filesystem already used. +8. Available indicates the size of the filesystem remained. +9.UseRate indicates File system usage capacity ratio. +10.MountOn indicates the mount dir of the filesystem. ### Example ` mysql> show frontends disks; +-----------------------------------------+------------+-------------+-----------+-----------------------------+------------+----------+------+-----------+---------+---------+ -| Name | Host | EditLogPort | DirType | Dir | Filesystem | Capacity | Used | Available | UseRate | MountOn | +| Name | Host | DirType | Dir | Filesystem | Capacity | Used | Available | UseRate | MountOn | +-----------------------------------------+------------+-------------+-----------+-----------------------------+------------+----------+------+-----------+---------+---------+ -| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | 9010 | meta | E:\data\doris\fe/doris-meta | | 0 | 0 | 8191P | 0% | | -| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | 9010 | log | E:\data\doris\fe/log | | 0 | 0 | 8191P | 0% | | -| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | 9010 | audit-log | E:\data\doris\fe/log | | 0 | 0 | 8191P | 0% | | -| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | 9010 | temp | E:\data\doris\fe/temp_dir | | 0 | 0 | 8191P | 0% | | -| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | 9010 | meta | /data/doris/fe/doris-meta | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | -| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | 9010 | log | /data/doris/fe/log | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | -| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | 9010 | audit-log | /data/doris/fe/log | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | -| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | 9010 | temp | /data/doris/fe/temp_dir | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | meta | E:\data\doris\fe/doris-meta | | 0 | 0 | 8191P | 0% | | +| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | log | E:\data\doris\fe/log | | 0 | 0 | 8191P | 0% | | +| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | audit-log | E:\data\doris\fe/log | | 0 | 0 | 8191P | 0% | | +| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | temp | E:\data\doris\fe/temp_dir | | 0 | 0 | 8191P | 0% | | +| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | meta | /data/doris/fe/doris-meta | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | log | /data/doris/fe/log | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | audit-log | /data/doris/fe/log | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | temp | /data/doris/fe/temp_dir | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +-----------------------------------------+------------+-------------+-----------+-----------------------------+------------+----------+------+-----------+---------+---------+ 8 rows in set (0.00 sec) ` diff --git a/docs/zh-CN/docs/sql-manual/sql-functions/table-functions/frontends_disks.md b/docs/zh-CN/docs/sql-manual/sql-functions/table-functions/frontends_disks.md index fcba673a0a..33dd79ddcf 100644 --- a/docs/zh-CN/docs/sql-manual/sql-functions/table-functions/frontends_disks.md +++ b/docs/zh-CN/docs/sql-manual/sql-functions/table-functions/frontends_disks.md @@ -51,7 +51,6 @@ mysql> desc function frontends_disks(); +-------------+------+------+-------+---------+-------+ | Name | TEXT | No | false | NULL | NONE | | Host | TEXT | No | false | NULL | NONE | -| EditLogPort | TEXT | No | false | NULL | NONE | | DirType | TEXT | No | false | NULL | NONE | | Dir | TEXT | No | false | NULL | NONE | | Filesystem | TEXT | No | false | NULL | NONE | @@ -74,7 +73,6 @@ mysql> select * from frontends_disk()\G *************************** 1. row *************************** Name: fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 Host: 172.XX.XX.1 -EditLogPort: 9010 DirType: log Dir: /data/doris/fe-github/log Filesystem: /dev/sdc5 diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-FRONTENDS-DISKS.md b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-FRONTENDS-DISKS.md index 6423718e9d..04791e7308 100644 --- a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-FRONTENDS-DISKS.md +++ b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-FRONTENDS-DISKS.md @@ -43,30 +43,29 @@ SHOW FRONTENDS DISKS; 说明： 1. Name 表示该 FE 节点在 bdbje 中的名称。 2. Host 表示该 FE 节点的IP。 -3. EditLogPort 表示该 FE 节点的EditLog端口。 -4. DirType 表示要展示的目录类型，分别有四种类型：meta、log、audit-log、temp。 -5. Dir 表示要展示的目录类型的目录。 -6. FileSystem 表示要展示的目录类型所在的linux系统的文件系统。 -7. Capacity 文件系统的容量。 -8. Used 文件系统已用大小。 -9. Available 文件系统剩余容量。 -10.UseRate 文件系统使用容量占比。 -11.MountOn 文件系统挂在目录。 +3. DirType 表示要展示的目录类型，分别有四种类型：meta、log、audit-log、temp。 +4. Dir 表示要展示的目录类型的目录。 +5. FileSystem 表示要展示的目录类型所在的linux系统的文件系统。 +6. Capacity 文件系统的容量。 +7. Used 文件系统已用大小。 +8. Available 文件系统剩余容量。 +9.UseRate 文件系统使用容量占比。 +10.MountOn 文件系统挂在目录。 ### Example ` mysql> show frontends disks; +-----------------------------------------+------------+-------------+-----------+-----------------------------+------------+----------+------+-----------+---------+---------+ -| Name | Host | EditLogPort | DirType | Dir | Filesystem | Capacity | Used | Available | UseRate | MountOn | +| Name | Host | DirType | Dir | Filesystem | Capacity | Used | Available | UseRate | MountOn | +-----------------------------------------+------------+-------------+-----------+-----------------------------+------------+----------+------+-----------+---------+---------+ -| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | 9010 | meta | E:\data\doris\fe/doris-meta | | 0 | 0 | 8191P | 0% | | -| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | 9010 | log | E:\data\doris\fe/log | | 0 | 0 | 8191P | 0% | | -| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | 9010 | audit-log | E:\data\doris\fe/log | | 0 | 0 | 8191P | 0% | | -| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | 9010 | temp | E:\data\doris\fe/temp_dir | | 0 | 0 | 8191P | 0% | | -| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | 9010 | meta | /data/doris/fe/doris-meta | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | -| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | 9010 | log | /data/doris/fe/log | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | -| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | 9010 | audit-log | /data/doris/fe/log | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | -| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | 9010 | temp | /data/doris/fe/temp_dir | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | meta | E:\data\doris\fe/doris-meta | | 0 | 0 | 8191P | 0% | | +| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | log | E:\data\doris\fe/log | | 0 | 0 | 8191P | 0% | | +| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | audit-log | E:\data\doris\fe/log | | 0 | 0 | 8191P | 0% | | +| fe_6a06ffaa_8346_4381_b462_8e33209ca6ec | 172.1.1.1 | temp | E:\data\doris\fe/temp_dir | | 0 | 0 | 8191P | 0% | | +| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | meta | /data/doris/fe/doris-meta | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | log | /data/doris/fe/log | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | audit-log | /data/doris/fe/log | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +| fe_fe1d5bd9_d1e5_4ccc_9b03_ca79b95c9941 | 172.1.1.2 | temp | /data/doris/fe/temp_dir | /dev/sdc5 | 366G | 111G | 236G | 33% | /data | +-----------------------------------------+------------+-------------+-----------+-----------------------------+------------+----------+------+-----------+---------+---------+ 8 rows in set (0.00 sec) ` diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java index 138cecef73..e11cd81058 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java @@ -53,7 +53,7 @@ public class FrontendsProcNode implements ProcNodeInterface { .build(); public static final ImmutableList DISK_TITLE_NAMES = new ImmutableList.Builder() - .add("Name").add("Host").add("EditLogPort").add("DirType").add("Dir").add("Filesystem") + .add("Name").add("Host").add("DirType").add("Dir").add("Filesystem") .add("Capacity").add("Used").add("Available").add("UseRate").add("MountOn") .build(); @@ -159,7 +159,6 @@ public class FrontendsProcNode implements ProcNodeInterface { List info = new ArrayList(); info.add(fe.getNodeName()); info.add(fe.getHost()); - info.add(Integer.toString(fe.getEditLogPort())); info.add(disk.getDirType()); info.add(disk.getDir()); info.add(disk.getSpaceInfo().fileSystem); diff --git a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/FrontendsDisksTableValuedFunction.java b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/FrontendsDisksTableValuedFunction.java index f7f9f9e7a7..4c16407e33 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/FrontendsDisksTableValuedFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/FrontendsDisksTableValuedFunction.java @@ -40,7 +40,6 @@ public class FrontendsDisksTableValuedFunction extends MetadataTableValuedFuncti private static final ImmutableList SCHEMA = ImmutableList.of( new Column("Name", ScalarType.createStringType()), new Column("Host", ScalarType.createStringType()), - new Column("EditLogPort", ScalarType.createStringType()), new Column("DirType", ScalarType.createStringType()), new Column("Dir", ScalarType.createStringType()), new Column("Filesystem", ScalarType.createStringType()), diff --git a/regression-test/suites/correctness_p0/table_valued_function/test_frontends_disks_tvf.groovy b/regression-test/suites/correctness_p0/table_valued_function/test_frontends_disks_tvf.groovy index 93bd2490e8..dae09a9cf6 100644 --- a/regression-test/suites/correctness_p0/table_valued_function/test_frontends_disks_tvf.groovy +++ b/regression-test/suites/correctness_p0/table_valued_function/test_frontends_disks_tvf.groovy @@ -19,7 +19,7 @@ suite("test_frontends_disks_tvf") { List> table = sql """ select * from `frontends_disks`(); """ assertTrue(table.size() > 0) - assertTrue(table[0].size == 11) + assertTrue(table[0].size == 10) // filter columns table = sql """ select Name from `frontends_disks`();""" @@ -27,22 +27,22 @@ suite("test_frontends_disks_tvf") { assertTrue(table[0].size == 1) // case insensitive - table = sql """ select name, host, editlogport, dirtype, dir from frontends_disks() order by dirtype;""" - assertTrue(table.size() > 0) - assertTrue(table[0].size == 5) - assertEquals("audit-log", table[0][3]) - - // test aliase columns - table = sql """ select name as n, host as h, dirtype as a, editlogport as e from frontends_disks() order by dirtype; """ + table = sql """ select name, host, dirtype, dir from frontends_disks() order by dirtype;""" assertTrue(table.size() > 0) assertTrue(table[0].size == 4) assertEquals("audit-log", table[0][2]) + // test aliase columns + table = sql """ select name as n, host as h, dirtype as a from frontends_disks() order by dirtype; """ + assertTrue(table.size() > 0) + assertTrue(table[0].size == 3) + assertEquals("audit-log", table[0][2]) + // test changing position of columns def res = sql """ select count(*) from frontends_disks() where dirtype = 'audit-log'; """ assertTrue(res[0][0] > 0) - sql """ select Name, Host, EditLogPort, + sql """ select Name, Host, DirType, Dir, Filesystem, Capacity, Used Available, UseRate, MountOn from frontends_disks(); """