This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit b712f0b8102c66c3b8166c6752a5190bb6c5a867
Author: qiye <jianliang5...@gmail.com>
AuthorDate: Tue Jan 30 10:17:20 2024 +0800
[improvement](index)add index_id column in show index stmt (#30431)
---
.../org/apache/doris/analysis/ShowIndexStmt.java | 1 +
.../java/org/apache/doris/qe/ShowExecutor.java | 3 +-
.../data/index_p0/test_bitmap_index.out | 58 ------------------
.../test_decimal_bitmap_index_multi_page.out | 3 -
.../data/inverted_index_p0/test_bitmap_index.out | 40 -------------
.../data/inverted_index_p0/test_inverted_index.out | 52 -----------------
.../suites/index_p0/test_bitmap_index.groovy | 68 ++++++++++++++++++++--
.../test_decimal_bitmap_index_multi_page.groovy | 5 +-
.../inverted_index_p0/test_bitmap_index.groovy | 46 ++++++++++++++-
.../inverted_index_p0/test_inverted_index.groovy | 58 +++++++++++++++++-
10 files changed, 168 insertions(+), 166 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java
index b35f2e77287..b2b9e8fc58c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java
@@ -46,6 +46,7 @@ public class ShowIndexStmt extends ShowStmt {
.addColumn(new Column("Index_type",
ScalarType.createVarchar(80)))
.addColumn(new Column("Comment",
ScalarType.createVarchar(80)))
.addColumn(new Column("Properties",
ScalarType.createVarchar(200)))
+ .addColumn(new Column("Index_id",
ScalarType.createVarchar(30)))
.build();
private String dbName;
private TableName tableName;
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 f3dac9eed3d..dbe0a27f931 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
@@ -1082,7 +1082,8 @@ public class ShowExecutor {
for (Index index : indexes) {
rows.add(Lists.newArrayList(showStmt.getTableName().toString(), "",
index.getIndexName(),
"", String.join(",", index.getColumns()), "", "",
"", "",
- "", index.getIndexType().name(),
index.getComment(), index.getPropertiesString()));
+ "", index.getIndexType().name(),
index.getComment(), index.getPropertiesString(),
+ String.valueOf(index.getIndexId())));
}
} finally {
table.readUnlock();
diff --git a/regression-test/data/index_p0/test_bitmap_index.out
b/regression-test/data/index_p0/test_bitmap_index.out
index d076aabae97..1ee61ff37e9 100644
--- a/regression-test/data/index_p0/test_bitmap_index.out
+++ b/regression-test/data/index_p0/test_bitmap_index.out
@@ -16,23 +16,6 @@ k13 DATETIME Yes false \N NONE
k14 DATETIME(3) Yes false \N NONE
k15 DATETIME(6) Yes false \N NONE
--- !sql --
-regression_test_index_p0.test_bitmap_index_dup index1 k1
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index2 k2
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index3 k3
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index4 k4
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index5 k5
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index6 k6
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index7 k7
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index8 k8
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index9 k9
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index10 k10
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index11 k11
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index12 k12
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index13 k13
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index14 k14
BITMAP
-regression_test_index_p0.test_bitmap_index_dup index15 k15
BITMAP
-
-- !sql --
1 1 1 1 1 1 2022-05-31
2022-05-31T10:00 1 1 true 2022-05-31
2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111
@@ -54,23 +37,6 @@ k14 DATETIME(3) Yes true \N
k15 DATETIME(6) Yes true \N
v1 INT Yes false \N SUM
--- !sql --
-regression_test_index_p0.test_bitmap_index_agg index1 k1
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index2 k2
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index3 k3
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index4 k4
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index5 k5
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index6 k6
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index7 k7
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index8 k8
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index9 k9
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index10 k10
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index11 k11
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index12 k12
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index13 k13
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index14 k14
BITMAP
-regression_test_index_p0.test_bitmap_index_agg index15 k15
BITMAP
-
-- !sql --
1 1 1 1 1 1 2022-05-31
2022-05-31T10:00 1 1 true 2022-05-31
2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111
1
@@ -92,24 +58,6 @@ k14 DATETIME(3) Yes false \N NONE
k15 DATETIME(6) Yes false \N NONE
v1 INT Yes false \N NONE
--- !sql --
-regression_test_index_p0.test_bitmap_index_unique index1
k1 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index2
k2 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index3
k3 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index4
k4 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index5
k5 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index6
k6 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index7
k7 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index8
k8 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index9
k9 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index10
k10 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index11
k11 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index12
k12 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index13
k13 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index14
k14 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index15
k15 BITMAP
-regression_test_index_p0.test_bitmap_index_unique index16
v1 BITMAP
-
-- !sql --
1 1 1 1 1 1 2022-05-31
2022-05-31T10:00 1 1 true 2022-05-31
2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111
1
@@ -121,9 +69,6 @@ block_version INT Yes false \N REPLACE
vehicle_mode INT Yes false \N REPLACE
usage_mode INT Yes false \N REPLACE
--- !sql --
-regression_test_index_p0.test_bitmap_index_unique_mor_delete
vid_bitmap_index vid
BITMAP
-
-- !sql --
2
@@ -148,9 +93,6 @@ block_version INT Yes false \N NONE
vehicle_mode INT Yes false \N NONE
usage_mode INT Yes false \N NONE
--- !sql --
-regression_test_index_p0.test_bitmap_index_unique_mow_delete
vid_bitmap_index vid
BITMAP
-
-- !sql --
2
diff --git
a/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out
b/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out
index 8e1edd8ea28..aeb0972b318 100644
--- a/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out
+++ b/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out
@@ -2,9 +2,6 @@
-- !sql --
a DECIMAL(12, 6) No true \N
--- !sql --
-regression_test_index_p0.test_decimal_bitmap_index_multi_page
bitmap_index_multi_page a
BITMAP
-
-- !sql --
0.000001
1.000001
diff --git a/regression-test/data/inverted_index_p0/test_bitmap_index.out
b/regression-test/data/inverted_index_p0/test_bitmap_index.out
index d13f8749427..f61defcbb68 100644
--- a/regression-test/data/inverted_index_p0/test_bitmap_index.out
+++ b/regression-test/data/inverted_index_p0/test_bitmap_index.out
@@ -12,19 +12,6 @@ k9 LARGEINT Yes false \N NONE
k10 DECIMAL Yes false \N NONE
k11 BOOLEAN Yes false \N NONE
--- !sql --
-regression_test_inverted_index_p0.test_bitmap_index_dup index1
k1 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index2
k2 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index3
k3 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index4
k4 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index5
k5 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index6
k6 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index7
k7 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index8
k8 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index9
k9 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index10
k10 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_dup index11
k11 BITMAP
-
-- !sql --
1 1 1 1 1 1 2022-05-31
2022-05-31T10:00 1 1 true
@@ -42,19 +29,6 @@ k10 DECIMAL Yes true \N
k11 BOOLEAN Yes true \N
v1 INT Yes false \N SUM
--- !sql --
-regression_test_inverted_index_p0.test_bitmap_index_agg index1
k1 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index2
k2 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index3
k3 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index4
k4 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index5
k5 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index6
k6 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index7
k7 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index8
k8 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index9
k9 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index10
k10 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_agg index11
k11 BITMAP
-
-- !sql --
1 1 1 1 1 1 2022-05-31
2022-05-31T10:00 1 1 true 1
@@ -72,20 +46,6 @@ k10 DECIMAL Yes true \N
k11 BOOLEAN Yes true \N
v1 INT Yes false \N NONE
--- !sql --
-regression_test_inverted_index_p0.test_bitmap_index_unique index1
k1 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index2
k2 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index3
k3 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index4
k4 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index5
k5 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index6
k6 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index7
k7 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index8
k8 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index9
k9 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index10
k10 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index11
k11 BITMAP
-regression_test_inverted_index_p0.test_bitmap_index_unique index12
v1 BITMAP
-
-- !sql --
1 1 1 1 1 1 2022-05-31
2022-05-31T10:00 1 1 true 1
diff --git a/regression-test/data/inverted_index_p0/test_inverted_index.out
b/regression-test/data/inverted_index_p0/test_inverted_index.out
index 2a673582ec4..0c11ea99116 100644
--- a/regression-test/data/inverted_index_p0/test_inverted_index.out
+++ b/regression-test/data/inverted_index_p0/test_inverted_index.out
@@ -16,23 +16,6 @@ k13 DATETIME Yes false \N NONE
k14 DATETIME(3) Yes false \N NONE
k15 DATETIME(6) Yes false \N NONE
--- !sql --
-regression_test_inverted_index_p0.test_inverted_index_dup index1
k1 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index2
k2 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index3
k3 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index4
k4 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index5
k5 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index6
k6 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index7
k7 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index8
k8 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index9
k9 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index10
k10 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index11
k11 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index12
k12 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index13
k13 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index14
k14 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_dup index15
k15 INVERTED
-
-- !sql --
1 1 1 1 1 1 2022-05-31
2022-05-31T10:00 1 1 true 2022-05-31
2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111
@@ -54,23 +37,6 @@ k14 DATETIME(3) Yes true \N
k15 DATETIME(6) Yes true \N
v1 INT Yes false \N SUM
--- !sql --
-regression_test_inverted_index_p0.test_inverted_index_agg index1
k1 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index2
k2 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index3
k3 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index4
k4 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index5
k5 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index6
k6 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index7
k7 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index8
k8 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index9
k9 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index10
k10 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index11
k11 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index12
k12 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index13
k13 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index14
k14 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_agg index15
k15 INVERTED
-
-- !sql --
1 1 1 1 1 1 2022-05-31
2022-05-31T10:00 1 1 true 2022-05-31
2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111
1
@@ -92,24 +58,6 @@ k14 DATETIME(3) Yes false \N NONE
k15 DATETIME(6) Yes false \N NONE
v1 INT Yes false \N NONE
--- !sql --
-regression_test_inverted_index_p0.test_inverted_index_unique index1
k1 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index2
k2 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index3
k3 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index4
k4 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index5
k5 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index6
k6 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index7
k7 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index8
k8 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index9
k9 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index10
k10 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index11
k11 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index12
k12 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index13
k13 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index14
k14 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index15
k15 INVERTED
-regression_test_inverted_index_p0.test_inverted_index_unique index16
v1 INVERTED
-
-- !sql --
1 1 1 1 1 1 2022-05-31
2022-05-31T10:00 1 1 true 2022-05-31
2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111
1
diff --git a/regression-test/suites/index_p0/test_bitmap_index.groovy
b/regression-test/suites/index_p0/test_bitmap_index.groovy
index f36b3b89717..db442f7fec2 100644
--- a/regression-test/suites/index_p0/test_bitmap_index.groovy
+++ b/regression-test/suites/index_p0/test_bitmap_index.groovy
@@ -79,7 +79,24 @@ suite("test_bitmap_index") {
sql "insert into ${tbName1}
values(1,1,1,1,'1','1','2022-05-31','2022-05-31
10:00:00',1,1.0,1,'2022-05-31','2022-05-31 10:00:00.111111','2022-05-31
10:00:00.111111','2022-05-31 10:00:00.111111');"
qt_sql "desc ${tbName1};"
- qt_sql "SHOW INDEX FROM ${tbName1};"
+ def show_result = sql "show index from ${tbName1}"
+ logger.info("show index from " + tbName1 + " result: " + show_result)
+ assertEquals(show_result.size(), 15)
+ assertEquals(show_result[0][2], "index1")
+ assertEquals(show_result[1][2], "index2")
+ assertEquals(show_result[2][2], "index3")
+ assertEquals(show_result[3][2], "index4")
+ assertEquals(show_result[4][2], "index5")
+ assertEquals(show_result[5][2], "index6")
+ assertEquals(show_result[6][2], "index7")
+ assertEquals(show_result[7][2], "index8")
+ assertEquals(show_result[8][2], "index9")
+ assertEquals(show_result[9][2], "index10")
+ assertEquals(show_result[10][2], "index11")
+ assertEquals(show_result[11][2], "index12")
+ assertEquals(show_result[12][2], "index13")
+ assertEquals(show_result[13][2], "index14")
+ assertEquals(show_result[14][2], "index15")
qt_sql "select * from ${tbName1};"
sql "DROP INDEX IF EXISTS index1 ON ${tbName1};"
@@ -166,7 +183,24 @@ suite("test_bitmap_index") {
sql "insert into ${tbName2}
values(1,1,1,1,'1','1','2022-05-31','2022-05-31
10:00:00',1,1.0,1,'2022-05-31','2022-05-31 10:00:00.111111','2022-05-31
10:00:00.111111','2022-05-31 10:00:00.111111',1);"
qt_sql "desc ${tbName2};"
- qt_sql "SHOW INDEX FROM ${tbName2};"
+ show_result = sql "show index from ${tbName2}"
+ logger.info("show index from " + tbName2 + " result: " + show_result)
+ assertEquals(show_result.size(), 15)
+ assertEquals(show_result[0][2], "index1")
+ assertEquals(show_result[1][2], "index2")
+ assertEquals(show_result[2][2], "index3")
+ assertEquals(show_result[3][2], "index4")
+ assertEquals(show_result[4][2], "index5")
+ assertEquals(show_result[5][2], "index6")
+ assertEquals(show_result[6][2], "index7")
+ assertEquals(show_result[7][2], "index8")
+ assertEquals(show_result[8][2], "index9")
+ assertEquals(show_result[9][2], "index10")
+ assertEquals(show_result[10][2], "index11")
+ assertEquals(show_result[11][2], "index12")
+ assertEquals(show_result[12][2], "index13")
+ assertEquals(show_result[13][2], "index14")
+ assertEquals(show_result[14][2], "index15")
qt_sql "select * from ${tbName2};"
sql "DROP INDEX IF EXISTS index1 ON ${tbName2};"
@@ -249,7 +283,25 @@ suite("test_bitmap_index") {
sql "insert into ${tbName3}
values(1,1,1,1,'1','1','2022-05-31','2022-05-31
10:00:00',1,1.0,1,'2022-05-31','2022-05-31 10:00:00.111111','2022-05-31
10:00:00.111111','2022-05-31 10:00:00.111111',1);"
qt_sql "desc ${tbName3};"
- qt_sql "SHOW INDEX FROM ${tbName3};"
+ show_result = sql "show index from ${tbName3}"
+ logger.info("show index from " + tbName3 + " result: " + show_result)
+ assertEquals(show_result.size(), 16)
+ assertEquals(show_result[0][2], "index1")
+ assertEquals(show_result[1][2], "index2")
+ assertEquals(show_result[2][2], "index3")
+ assertEquals(show_result[3][2], "index4")
+ assertEquals(show_result[4][2], "index5")
+ assertEquals(show_result[5][2], "index6")
+ assertEquals(show_result[6][2], "index7")
+ assertEquals(show_result[7][2], "index8")
+ assertEquals(show_result[8][2], "index9")
+ assertEquals(show_result[9][2], "index10")
+ assertEquals(show_result[10][2], "index11")
+ assertEquals(show_result[11][2], "index12")
+ assertEquals(show_result[12][2], "index13")
+ assertEquals(show_result[13][2], "index14")
+ assertEquals(show_result[14][2], "index15")
+ assertEquals(show_result[15][2], "index16")
qt_sql "select * from ${tbName3};"
sql "DROP INDEX IF EXISTS index1 ON ${tbName3};"
@@ -319,7 +371,10 @@ suite("test_bitmap_index") {
sql "insert into
${tbName4}(create_time,vid,report_time,block_version,vehicle_mode,usage_mode)
values('2023-08-25 11:00:00','123','2023-08-25 11:00:00',2,2,2);"
sql "insert into
${tbName4}(create_time,vid,report_time,block_version,vehicle_mode,usage_mode)
values('2023-08-25 12:00:00','123','2023-08-25 12:00:00',3,3,3);"
qt_sql "desc ${tbName4};"
- qt_sql "SHOW INDEX FROM ${tbName4};"
+ show_result = sql "show index from ${tbName4}"
+ logger.info("show index from " + tbName4 + " result: " + show_result)
+ assertEquals(show_result.size(), 1)
+ assertEquals(show_result[0][2], "vid_bitmap_index")
sql "delete from ${tbName4} where vid='123' and
report_time='2023-08-25 12:00:00' and create_time='2023-08-25 12:00:00';"
qt_sql "select count(*) from ${tbName4}; "
qt_sql "select count(*) from ${tbName4} where vid='123'; "
@@ -394,7 +449,10 @@ suite("test_bitmap_index") {
sql "insert into
${tbName5}(create_time,vid,report_time,block_version,vehicle_mode,usage_mode)
values('2023-08-25 11:00:00','123','2023-08-25 11:00:00',2,2,2);"
sql "insert into
${tbName5}(create_time,vid,report_time,block_version,vehicle_mode,usage_mode)
values('2023-08-25 12:00:00','123','2023-08-25 12:00:00',3,3,3);"
qt_sql "desc ${tbName5};"
- qt_sql "SHOW INDEX FROM ${tbName5};"
+ show_result = sql "show index from ${tbName5}"
+ logger.info("show index from " + tbName5 + " result: " + show_result)
+ assertEquals(show_result.size(), 1)
+ assertEquals(show_result[0][2], "vid_bitmap_index")
sql "delete from ${tbName5} where vid='123' and
report_time='2023-08-25 12:00:00' and create_time='2023-08-25 12:00:00';"
qt_sql "select count(*) from ${tbName5}; "
qt_sql "select count(*) from ${tbName5} where vid='123'; "
diff --git
a/regression-test/suites/index_p0/test_decimal_bitmap_index_multi_page.groovy
b/regression-test/suites/index_p0/test_decimal_bitmap_index_multi_page.groovy
index 607c6a88995..88f44808e33 100644
---
a/regression-test/suites/index_p0/test_decimal_bitmap_index_multi_page.groovy
+++
b/regression-test/suites/index_p0/test_decimal_bitmap_index_multi_page.groovy
@@ -18,7 +18,10 @@ suite("test_decimal_bitmap_index_multi_page") {
def tbName = "test_decimal_bitmap_index_multi_page"
qt_sql "desc ${tbName};"
- qt_sql "SHOW INDEX FROM ${tbName};"
+ def show_result = sql "show index from ${tbName}"
+ logger.info("show index from " + tbName + " result: " + show_result)
+ assertEquals(show_result.size(), 1)
+ assertEquals(show_result[0][2], "bitmap_index_multi_page")
qt_sql "select * from ${tbName} order by a ASC limit 3;"
qt_sql "select * from ${tbName} order by a DESC limit 3;"
diff --git a/regression-test/suites/inverted_index_p0/test_bitmap_index.groovy
b/regression-test/suites/inverted_index_p0/test_bitmap_index.groovy
index 0b360f3f6bf..23944288cd7 100644
--- a/regression-test/suites/inverted_index_p0/test_bitmap_index.groovy
+++ b/regression-test/suites/inverted_index_p0/test_bitmap_index.groovy
@@ -71,7 +71,20 @@ suite("test_bitmap_index", "inverted_index") {
sql "insert into ${tbName1}
values(1,1,1,1,'1','1','2022-05-31','2022-05-31 10:00:00',1,1.0,1);"
qt_sql "desc ${tbName1};"
- qt_sql "SHOW INDEX FROM ${tbName1};"
+ def show_result = sql "show index from ${tbName1}"
+ logger.info("show index from " + tbName1 + " result: " + show_result)
+ assertEquals(show_result.size(), 11)
+ assertEquals(show_result[0][2], "index1")
+ assertEquals(show_result[1][2], "index2")
+ assertEquals(show_result[2][2], "index3")
+ assertEquals(show_result[3][2], "index4")
+ assertEquals(show_result[4][2], "index5")
+ assertEquals(show_result[5][2], "index6")
+ assertEquals(show_result[6][2], "index7")
+ assertEquals(show_result[7][2], "index8")
+ assertEquals(show_result[8][2], "index9")
+ assertEquals(show_result[9][2], "index10")
+ assertEquals(show_result[10][2], "index11")
qt_sql "select * from ${tbName1};"
sql "DROP INDEX IF EXISTS index1 ON ${tbName1};"
@@ -150,7 +163,20 @@ suite("test_bitmap_index", "inverted_index") {
sql "insert into ${tbName2}
values(1,1,1,1,'1','1','2022-05-31','2022-05-31 10:00:00',1,1.0,1,1);"
qt_sql "desc ${tbName2};"
- qt_sql "SHOW INDEX FROM ${tbName2};"
+ show_result = sql "show index from ${tbName2}"
+ logger.info("show index from " + tbName2 + " result: " + show_result)
+ assertEquals(show_result.size(), 11)
+ assertEquals(show_result[0][2], "index1")
+ assertEquals(show_result[1][2], "index2")
+ assertEquals(show_result[2][2], "index3")
+ assertEquals(show_result[3][2], "index4")
+ assertEquals(show_result[4][2], "index5")
+ assertEquals(show_result[5][2], "index6")
+ assertEquals(show_result[6][2], "index7")
+ assertEquals(show_result[7][2], "index8")
+ assertEquals(show_result[8][2], "index9")
+ assertEquals(show_result[9][2], "index10")
+ assertEquals(show_result[10][2], "index11")
qt_sql "select * from ${tbName2};"
sql "DROP INDEX IF EXISTS index1 ON ${tbName2};"
@@ -225,7 +251,21 @@ suite("test_bitmap_index", "inverted_index") {
sql "insert into ${tbName3}
values(1,1,1,1,'1','1','2022-05-31','2022-05-31 10:00:00',1,1.0,1,1);"
qt_sql "desc ${tbName3};"
- qt_sql "SHOW INDEX FROM ${tbName3};"
+ show_result = sql "show index from ${tbName3}"
+ logger.info("show index from " + tbName3 + " result: " + show_result)
+ assertEquals(show_result.size(), 12)
+ assertEquals(show_result[0][2], "index1")
+ assertEquals(show_result[1][2], "index2")
+ assertEquals(show_result[2][2], "index3")
+ assertEquals(show_result[3][2], "index4")
+ assertEquals(show_result[4][2], "index5")
+ assertEquals(show_result[5][2], "index6")
+ assertEquals(show_result[6][2], "index7")
+ assertEquals(show_result[7][2], "index8")
+ assertEquals(show_result[8][2], "index9")
+ assertEquals(show_result[9][2], "index10")
+ assertEquals(show_result[10][2], "index11")
+ assertEquals(show_result[11][2], "index12")
qt_sql "select * from ${tbName3};"
sql "DROP INDEX IF EXISTS index1 ON ${tbName3};"
diff --git
a/regression-test/suites/inverted_index_p0/test_inverted_index.groovy
b/regression-test/suites/inverted_index_p0/test_inverted_index.groovy
index 25cfadff448..f4280c31163 100644
--- a/regression-test/suites/inverted_index_p0/test_inverted_index.groovy
+++ b/regression-test/suites/inverted_index_p0/test_inverted_index.groovy
@@ -79,7 +79,24 @@ suite("test_inverted_index", "inverted_index") {
sql "insert into ${tbName1}
values(1,1,1,1,'1','1','2022-05-31','2022-05-31
10:00:00',1,1.0,1,'2022-05-31','2022-05-31 10:00:00.111111','2022-05-31
10:00:00.111111','2022-05-31 10:00:00.111111');"
qt_sql "desc ${tbName1};"
- qt_sql "SHOW INDEX FROM ${tbName1};"
+ def show_result = sql "show index from ${tbName1}"
+ logger.info("show index from " + tbName1 + " result: " + show_result)
+ assertEquals(show_result.size(), 15)
+ assertEquals(show_result[0][2], "index1")
+ assertEquals(show_result[1][2], "index2")
+ assertEquals(show_result[2][2], "index3")
+ assertEquals(show_result[3][2], "index4")
+ assertEquals(show_result[4][2], "index5")
+ assertEquals(show_result[5][2], "index6")
+ assertEquals(show_result[6][2], "index7")
+ assertEquals(show_result[7][2], "index8")
+ assertEquals(show_result[8][2], "index9")
+ assertEquals(show_result[9][2], "index10")
+ assertEquals(show_result[10][2], "index11")
+ assertEquals(show_result[11][2], "index12")
+ assertEquals(show_result[12][2], "index13")
+ assertEquals(show_result[13][2], "index14")
+ assertEquals(show_result[14][2], "index15")
qt_sql "select * from ${tbName1};"
sql "DROP INDEX IF EXISTS index1 ON ${tbName1};"
@@ -166,7 +183,24 @@ suite("test_inverted_index", "inverted_index") {
sql "insert into ${tbName2}
values(1,1,1,1,'1','1','2022-05-31','2022-05-31
10:00:00',1,1.0,1,'2022-05-31','2022-05-31 10:00:00.111111','2022-05-31
10:00:00.111111','2022-05-31 10:00:00.111111',1);"
qt_sql "desc ${tbName2};"
- qt_sql "SHOW INDEX FROM ${tbName2};"
+ show_result = sql "show index from ${tbName2}"
+ logger.info("show index from " + tbName2 + " result: " + show_result)
+ assertEquals(show_result.size(), 15)
+ assertEquals(show_result[0][2], "index1")
+ assertEquals(show_result[1][2], "index2")
+ assertEquals(show_result[2][2], "index3")
+ assertEquals(show_result[3][2], "index4")
+ assertEquals(show_result[4][2], "index5")
+ assertEquals(show_result[5][2], "index6")
+ assertEquals(show_result[6][2], "index7")
+ assertEquals(show_result[7][2], "index8")
+ assertEquals(show_result[8][2], "index9")
+ assertEquals(show_result[9][2], "index10")
+ assertEquals(show_result[10][2], "index11")
+ assertEquals(show_result[11][2], "index12")
+ assertEquals(show_result[12][2], "index13")
+ assertEquals(show_result[13][2], "index14")
+ assertEquals(show_result[14][2], "index15")
qt_sql "select * from ${tbName2};"
sql "DROP INDEX IF EXISTS index1 ON ${tbName2};"
@@ -253,7 +287,25 @@ suite("test_inverted_index", "inverted_index") {
sql "insert into ${tbName3}
values(1,1,1,1,'1','1','2022-05-31','2022-05-31
10:00:00',1,1.0,1,'2022-05-31','2022-05-31 10:00:00.111111','2022-05-31
10:00:00.111111','2022-05-31 10:00:00.111111',1);"
qt_sql "desc ${tbName3};"
- qt_sql "SHOW INDEX FROM ${tbName3};"
+ show_result = sql "show index from ${tbName3}"
+ logger.info("show index from " + tbName3 + " result: " + show_result)
+ assertEquals(show_result.size(), 16)
+ assertEquals(show_result[0][2], "index1")
+ assertEquals(show_result[1][2], "index2")
+ assertEquals(show_result[2][2], "index3")
+ assertEquals(show_result[3][2], "index4")
+ assertEquals(show_result[4][2], "index5")
+ assertEquals(show_result[5][2], "index6")
+ assertEquals(show_result[6][2], "index7")
+ assertEquals(show_result[7][2], "index8")
+ assertEquals(show_result[8][2], "index9")
+ assertEquals(show_result[9][2], "index10")
+ assertEquals(show_result[10][2], "index11")
+ assertEquals(show_result[11][2], "index12")
+ assertEquals(show_result[12][2], "index13")
+ assertEquals(show_result[13][2], "index14")
+ assertEquals(show_result[14][2], "index15")
+ assertEquals(show_result[15][2], "index16")
qt_sql "select * from ${tbName3};"
sql "DROP INDEX IF EXISTS index1 ON ${tbName3};"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
