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 160a5157fbf [fix](statistics)Fix external table show column stats type
bug #26910 (#26921)
160a5157fbf is described below
commit 160a5157fbf0a2e9b9b333926cab373934a7b1c2
Author: Jibing-Li <[email protected]>
AuthorDate: Tue Nov 14 20:15:12 2023 +0800
[fix](statistics)Fix external table show column stats type bug #26910
(#26921)
backport: #26910
---
.../apache/doris/statistics/AnalysisManager.java | 6 ++-
.../hive/test_hive_statistics_p0.groovy | 45 +++++++++++++++++++++-
2 files changed, 48 insertions(+), 3 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java
b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java
index 03e53275fe6..c21f57eb098 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java
@@ -340,6 +340,7 @@ public class AnalysisManager implements Writable {
constructJob(jobInfo, analysisTaskInfos.values());
if (isSync) {
syncExecute(analysisTaskInfos.values());
+ jobInfo.state = AnalysisState.FINISHED;
updateTableStats(jobInfo);
return null;
}
@@ -593,8 +594,9 @@ public class AnalysisManager implements Writable {
public void updateTableStats(AnalysisInfo jobInfo) {
TableIf tbl = StatisticsUtil.findTable(jobInfo.catalogId,
jobInfo.dbId, jobInfo.tblId);
- // External Table update table stats after table level task finished.
- if (tbl instanceof ExternalTable) {
+ // External Table only update table stats when all tasks finished.
+ // Because it needs to get the row count from the result of row count
task.
+ if (tbl instanceof ExternalTable &&
!jobInfo.state.equals(AnalysisState.FINISHED)) {
return;
}
TableStatsMeta tableStats = findTableStatsStatus(tbl.getId());
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_statistics_p0.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_statistics_p0.groovy
index ae041a67b3a..e45381fc3f9 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_statistics_p0.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_statistics_p0.groovy
@@ -66,6 +66,10 @@ suite("test_hive_statistics_p0",
"all_types,p0,external,hive,external_docker,ext
assertEquals("4.0", result[0][5])
assertEquals("1", result[0][6])
assertEquals("3", result[0][7])
+ assertEquals("FULL" , result[0][8])
+ assertEquals("FUNDAMENTALS" , result[0][9])
+ assertEquals("MANUAL" , result[0][10])
+ assertEquals("0" , result[0][11])
result = sql """show column stats stats_test1(value);"""
assertEquals(1, result.size())
@@ -77,6 +81,10 @@ suite("test_hive_statistics_p0",
"all_types,p0,external,hive,external_docker,ext
assertEquals("5.0", result[0][5])
assertEquals("\'name1\'" , result[0][6])
assertEquals("\'name3\'" , result[0][7])
+ assertEquals("FULL" , result[0][8])
+ assertEquals("FUNDAMENTALS" , result[0][9])
+ assertEquals("MANUAL" , result[0][10])
+ assertEquals("0" , result[0][11])
result = sql """show column stats stats_test2(id);"""
assertEquals(1, result.size())
@@ -88,6 +96,10 @@ suite("test_hive_statistics_p0",
"all_types,p0,external,hive,external_docker,ext
assertEquals("4.0", result[0][5])
assertEquals("1", result[0][6])
assertEquals("2", result[0][7])
+ assertEquals("FULL" , result[0][8])
+ assertEquals("FUNDAMENTALS" , result[0][9])
+ assertEquals("MANUAL" , result[0][10])
+ assertEquals("0" , result[0][11])
result = sql """show column stats stats_test2(value);"""
assertEquals(1, result.size())
@@ -99,6 +111,10 @@ suite("test_hive_statistics_p0",
"all_types,p0,external,hive,external_docker,ext
assertEquals("1.0", result[0][5])
assertEquals("\'*\'", result[0][6])
assertEquals("\';\'", result[0][7])
+ assertEquals("FULL" , result[0][8])
+ assertEquals("FUNDAMENTALS" , result[0][9])
+ assertEquals("MANUAL" , result[0][10])
+ assertEquals("0" , result[0][11])
sql """drop catalog if exists ${catalog_name}"""
@@ -118,10 +134,30 @@ suite("test_hive_statistics_p0",
"all_types,p0,external,hive,external_docker,ext
assertEquals("5.0", result[0][5])
assertEquals("\'name1\'" , result[0][6])
assertEquals("\'name3\'" , result[0][7])
+ assertEquals("FULL" , result[0][8])
+ assertEquals("FUNDAMENTALS" , result[0][9])
+ assertEquals("MANUAL" , result[0][10])
+ assertEquals("0" , result[0][11])
result = sql """show column stats stats_test1(id);"""
assertEquals(0, result.size())
+ sql """analyze table stats_test1(id) with sync with sample rows
100"""
+ result = sql """show column stats stats_test1(id);"""
+ assertEquals(1, result.size())
+ assertEquals("id", result[0][0])
+ assertEquals("3.0", result[0][1])
+ assertEquals("3.0", result[0][2])
+ assertEquals("0.0", result[0][3])
+ assertEquals("12.0", result[0][4])
+ assertEquals("4.0", result[0][5])
+ assertEquals("N/A", result[0][6])
+ assertEquals("N/A", result[0][7])
+ assertEquals("SAMPLE" , result[0][8])
+ assertEquals("FUNDAMENTALS" , result[0][9])
+ assertEquals("MANUAL" , result[0][10])
+ assertEquals("0" , result[0][11])
+
sql """analyze table stats_test2 with sync;"""
result = sql """show column stats stats_test2(id);"""
assertEquals(1, result.size())
@@ -133,6 +169,10 @@ suite("test_hive_statistics_p0",
"all_types,p0,external,hive,external_docker,ext
assertEquals("4.0", result[0][5])
assertEquals("1", result[0][6])
assertEquals("2", result[0][7])
+ assertEquals("FULL" , result[0][8])
+ assertEquals("FUNDAMENTALS" , result[0][9])
+ assertEquals("MANUAL" , result[0][10])
+ assertEquals("0" , result[0][11])
result = sql """show column stats stats_test2(value);"""
assertEquals(1, result.size())
@@ -144,8 +184,11 @@ suite("test_hive_statistics_p0",
"all_types,p0,external,hive,external_docker,ext
assertEquals("1.0", result[0][5])
assertEquals("\'*\'", result[0][6])
assertEquals("\';\'", result[0][7])
+ assertEquals("FULL" , result[0][8])
+ assertEquals("FUNDAMENTALS" , result[0][9])
+ assertEquals("MANUAL" , result[0][10])
+ assertEquals("0" , result[0][11])
sql """drop catalog if exists ${catalog_name}"""
-
} finally {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
