This is an automated email from the ASF dual-hosted git repository.
lijibing pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 11a58752830 [fix](regression)Remove useless case which may cause
preHeat npe. (#35582) (#35685)
11a58752830 is described below
commit 11a5875283081286f57bf5aa5148781d73cc77cf
Author: Jibing-Li <64681310+jibing...@users.noreply.github.com>
AuthorDate: Fri May 31 10:20:21 2024 +0800
[fix](regression)Remove useless case which may cause preHeat npe. (#35582)
(#35685)
backport https://github.com/apache/doris/pull/35582
Remove useless case which may cause preHeat npe.
---
.../org/apache/doris/statistics/ColumnStatistic.java | 5 ++++-
.../org/apache/doris/statistics/StatisticsCache.java | 5 ++++-
regression-test/suites/statistics/test_ddl.groovy | 16 ----------------
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatistic.java
b/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatistic.java
index e5dd1e1765b..c932bceac16 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatistic.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatistic.java
@@ -199,7 +199,10 @@ public class ColumnStatistic {
columnStatisticBuilder.setUpdatedTime(row.get(13));
return columnStatisticBuilder.build();
} catch (Exception e) {
- LOG.warn("Failed to deserialize column statistics.", e);
+ LOG.warn("Failed to deserialize column statistics. reason: [{}].
Row [{}]", e.getMessage(), row);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(e);
+ }
return ColumnStatistic.UNKNOWN;
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsCache.java
b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsCache.java
index e8f46468aab..e8ef250e674 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsCache.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsCache.java
@@ -175,7 +175,10 @@ public class StatisticsCache {
}
putCache(k, c);
} catch (Throwable t) {
- LOG.warn("Error when preheating stats cache", t);
+ LOG.warn("Error when preheating stats cache. reason: [{}].
Row:[{}]", t.getMessage(), r);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(t);
+ }
}
}
}
diff --git a/regression-test/suites/statistics/test_ddl.groovy
b/regression-test/suites/statistics/test_ddl.groovy
index 06e1c72e164..be2c82bd4ba 100644
--- a/regression-test/suites/statistics/test_ddl.groovy
+++ b/regression-test/suites/statistics/test_ddl.groovy
@@ -44,22 +44,6 @@ suite("test_ddl") {
INSERT INTO `agg_all_for_analyze_test` VALUES
(-24673,0,-127,-1939606877,-105278987563368327,-257119.385,'bA5rPeM244SovDhOOQ02CmXeM69uhJ8GSHtU','2022-09-28','2022-08-23
01:34:09','wrHimKN3w24QvUiplB9HFWdeCCeX0bQbbFima85zhb1kQ0s6lP6ctie2oGuKF',-4060736.642127,NULL,'22bCQDgO6A0FJB22Q9bASB8cHnYqHeKKGsa1e','-6225805734985728798'),(-22254,0,28,702265972,-6301108547516189202,-667430.114,'M0sReWtDXk7zt7AiDCzuqciSo0JuZzNI3Kez','2022-11-24','2022-11-29
22:52:56','gxsUl9OwrHYuy8Ih0A6XShMYk [...]
"""
- sql """
- INSERT INTO __internal_schema.column_statistics SELECT id,
catalog_id, db_id, tbl_id, idx_id, col_id,
- part_id, row_count, ndv, null_count, min, max, data_size,
update_time
- FROM
- (SELECT CONCAT(18570, '-', -1, '-', 'k13') AS id, 0 AS
catalog_id, 13003 AS db_id,
- 18570 AS tbl_id, -1 AS idx_id,
- 'k13' AS col_id, NULL AS part_id, SUM(count) AS
row_count,
- SUM(null_count) AS null_count,
- MIN(CAST(min AS LARGEINT)) AS min, MAX(CAST(max AS
LARGEINT)) AS max,
- SUM(data_size_in_bytes) AS data_size, NOW() AS update_time
- FROM __internal_schema.column_statistics WHERE
__internal_schema.column_statistics.db_id = '13003' AND
- __internal_schema.column_statistics.tbl_id='18570' AND
__internal_schema.column_statistics.col_id='k13' AND
- __internal_schema.column_statistics.idx_id='-1' AND
__internal_schema.column_statistics.part_id IS NOT NULL ) t1,
- (SELECT NDV(`agg_all_for_analyze_test_k13`) AS ndv FROM
`agg_all_for_analyze_test`) t2
- """
-
// Delete always timeout when running p0 test
// sql """
// DELETE FROM __internal_schema.column_statistics WHERE col_id =
'agg_all_for_analyze_test_k2'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
