This is an automated email from the ASF dual-hosted git repository.
lijibing pushed a commit to branch high-priority-column
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/high-priority-column by this
push:
new c128662ee26 fix p0 (#33210)
c128662ee26 is described below
commit c128662ee26fa5ad50277787e50bb37d3d0c07d8
Author: Jibing-Li <64681310+jibing...@users.noreply.github.com>
AuthorDate: Wed Apr 3 14:59:57 2024 +0800
fix p0 (#33210)
---
.../src/main/java/org/apache/doris/analysis/AnalyzeProperties.java | 2 ++
fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java | 3 +--
.../src/main/java/org/apache/doris/datasource/ExternalTable.java | 3 +--
.../src/main/java/org/apache/doris/statistics/AnalysisManager.java | 2 +-
.../src/main/java/org/apache/doris/statistics/OlapAnalysisTask.java | 3 +--
.../suites/external_table_p2/hive/test_hive_statistic_auto.groovy | 2 +-
regression-test/suites/statistics/analyze_stats.groovy | 2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeProperties.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeProperties.java
index 94083989ca7..f78c63ebea1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeProperties.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeProperties.java
@@ -44,6 +44,7 @@ public class AnalyzeProperties {
public static final String PROPERTY_PERIOD_SECONDS = "period.seconds";
public static final String PROPERTY_FORCE_FULL = "force.full";
public static final String PROPERTY_PARTITION_COLUMN_FROM_SQL =
"partition.column.from.sql";
+ public static final String PROPERTY_USE_AUTO_ANALYZER =
"use.auto.analyzer";
public static final AnalyzeProperties DEFAULT_PROP = new
AnalyzeProperties(new HashMap<String, String>() {
{
@@ -72,6 +73,7 @@ public class AnalyzeProperties {
.add(PROPERTY_PERIOD_CRON)
.add(PROPERTY_FORCE_FULL)
.add(PROPERTY_PARTITION_COLUMN_FROM_SQL)
+ .add(PROPERTY_USE_AUTO_ANALYZER)
.build();
public AnalyzeProperties(Map<String, String> properties) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
index 5bbf10c4acd..d8f55accb74 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -99,7 +99,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -1319,7 +1318,7 @@ public class OlapTable extends Table implements
MTMVRelatedTableIf {
if (col == null ||
StatisticsUtil.isUnsupportedType(col.getType())) {
continue;
}
- ret.add(Pair.of(getIndexNameById(meta.getIndexId()),
column.toLowerCase(Locale.ROOT)));
+ ret.add(Pair.of(getIndexNameById(meta.getIndexId()), column));
}
}
return ret;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalTable.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalTable.java
index bb5b5089a2f..7fff8850d65 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalTable.java
@@ -47,7 +47,6 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
@@ -320,7 +319,7 @@ public class ExternalTable implements TableIf, Writable,
GsonPostProcessable {
continue;
}
// External table put table name as index name.
- ret.add(Pair.of(String.valueOf(name),
column.toLowerCase(Locale.ROOT)));
+ ret.add(Pair.of(String.valueOf(name), column));
}
return ret;
}
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 e3391756bc4..ebd92a841d1 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
@@ -218,7 +218,7 @@ public class AnalysisManager implements Writable {
// Each analyze stmt corresponding to an analysis job.
public void createAnalysisJob(AnalyzeTblStmt stmt, boolean proxy) throws
DdlException {
// Using auto analyzer if user specifies.
- if
(stmt.getAnalyzeProperties().getProperties().containsKey("use.auto.analyzer")) {
+ if
("true".equalsIgnoreCase(stmt.getAnalyzeProperties().getProperties().get("use.auto.analyzer")))
{
Env.getCurrentEnv().getStatisticsAutoCollector()
.processOneJob(stmt.getTable(),
stmt.getTable().getColumnIndexPairs(stmt.getColumnNames()), JobPriority.HIGH);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/statistics/OlapAnalysisTask.java
b/fe/fe-core/src/main/java/org/apache/doris/statistics/OlapAnalysisTask.java
index 08d770454bc..c1f7765ea54 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/OlapAnalysisTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/OlapAnalysisTask.java
@@ -228,8 +228,7 @@ public class OlapAnalysisTask extends BaseAnalysisTask {
params.put("tblName", String.valueOf(tbl.getName()));
params.put("index", getIndex());
StringSubstitutor stringSubstitutor = new StringSubstitutor(params);
- String collectColStats =
stringSubstitutor.replace(FULL_ANALYZE_TEMPLATE);
- runQuery(collectColStats);
+ runQuery(stringSubstitutor.replace(FULL_ANALYZE_TEMPLATE));
}
protected String getIndex() {
diff --git
a/regression-test/suites/external_table_p2/hive/test_hive_statistic_auto.groovy
b/regression-test/suites/external_table_p2/hive/test_hive_statistic_auto.groovy
index 8a7591daeb1..eddf0bd8e7c 100644
---
a/regression-test/suites/external_table_p2/hive/test_hive_statistic_auto.groovy
+++
b/regression-test/suites/external_table_p2/hive/test_hive_statistic_auto.groovy
@@ -32,7 +32,7 @@ suite("test_hive_statistic_auto",
"p2,external,hive,external_remote,external_rem
logger.info("catalog " + catalog_name + " created")
// Test analyze table without init.
- sql """analyze database ${catalog_name}.statistics
PROPERTIES("use.auto.analyzer"="true")"""
+ sql """analyze table ${catalog_name}.statistics.statistics
PROPERTIES("use.auto.analyzer"="true")"""
sql """use ${catalog_name}.statistics"""
for (int i = 0; i < 10; i++) {
diff --git a/regression-test/suites/statistics/analyze_stats.groovy
b/regression-test/suites/statistics/analyze_stats.groovy
index 7c6231aa48f..bcbec86b1a7 100644
--- a/regression-test/suites/statistics/analyze_stats.groovy
+++ b/regression-test/suites/statistics/analyze_stats.groovy
@@ -2774,7 +2774,7 @@ PARTITION `p599` VALUES IN (599)
// Test auto analyze with job type SYSTEM
sql """drop stats trigger_test"""
- sql """analyze database trigger PROPERTIES("use.auto.analyzer"="true")"""
+ sql """analyze table trigger_test PROPERTIES("use.auto.analyzer"="true")"""
int i = 0;
for (0; i < 10; i++) {
result = sql """show column stats trigger_test"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
