This is an automated email from the ASF dual-hosted git repository. morrysnow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 28bbfdd590 [Fix](Nereids) fix minidump unit test caused of
columnstatus changed (#22201)
28bbfdd590 is described below
commit 28bbfdd59094590562b1f8cc08f5c2c5e374e5bd
Author: LiBinfeng <46676950+libinfeng...@users.noreply.github.com>
AuthorDate: Tue Jul 25 19:23:12 2023 +0800
[Fix](Nereids) fix minidump unit test caused of columnstatus changed
(#22201)
Problem:
Minidump unit test failed because of column statistic deserialization need
a new column schema but not added to minidump unit test file
Solved:
Add last update time to unit test input file
---
.../apache/doris/statistics/ColumnStatistic.java | 5 +-
.../doris/statistics/ColumnStatisticBuilder.java | 3 +-
.../doris/nereids/minidump/MinidumpUtTestData.json | 61 +++++++++++-----------
3 files changed, 35 insertions(+), 34 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 cbafcc6407..6887108a68 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
@@ -50,7 +50,7 @@ public class ColumnStatistic {
public static ColumnStatistic UNKNOWN = new
ColumnStatisticBuilder().setAvgSizeByte(1).setNdv(1)
.setNumNulls(1).setCount(1).setMaxValue(Double.POSITIVE_INFINITY).setMinValue(Double.NEGATIVE_INFINITY)
- .setSelectivity(1.0).setIsUnknown(true)
+ .setSelectivity(1.0).setIsUnknown(true).setUpdatedTime("")
.build();
public static ColumnStatistic ZERO = new
ColumnStatisticBuilder().setAvgSizeByte(0).setNdv(0)
@@ -350,6 +350,7 @@ public class ColumnStatistic {
statistic.put("IsUnKnown", isUnKnown);
statistic.put("Histogram", Histogram.serializeToJson(histogram));
statistic.put("Original", original);
+ statistic.put("LastUpdatedTime", updatedTime);
return statistic;
}
@@ -399,7 +400,7 @@ public class ColumnStatistic {
null,
stat.getBoolean("IsUnKnown"),
Histogram.deserializeFromJson(stat.getString("Histogram")),
- stat.getString("lastUpdatedTine")
+ stat.getString("LastUpdatedTime")
);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatisticBuilder.java
b/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatisticBuilder.java
index df1ddb50fe..07de092a17 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatisticBuilder.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatisticBuilder.java
@@ -176,8 +176,9 @@ public class ColumnStatisticBuilder {
return updatedTime;
}
- public void setUpdatedTime(String updatedTime) {
+ public ColumnStatisticBuilder setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
+ return this;
}
public ColumnStatistic build() {
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/minidump/MinidumpUtTestData.json
b/fe/fe-core/src/test/java/org/apache/doris/nereids/minidump/MinidumpUtTestData.json
index 01150aebfe..d2b50200ea 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/minidump/MinidumpUtTestData.json
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/minidump/MinidumpUtTestData.json
@@ -10,6 +10,7 @@
"Tables": [
{
"TableType": "OLAP",
+ "TableName": "t1",
"TableValue": {
"clazz": "OlapTable",
"state": "NORMAL",
@@ -91,7 +92,7 @@
"baseIndex": {
"id": 17009,
"state": "NORMAL",
- "rowCount": 1,
+ "rowCount": 2,
"tablets": [
{
"id": 17010,
@@ -99,7 +100,7 @@
{
"id": 17011,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
"dataSize": 247,
"remoteDataSize": 0,
@@ -107,7 +108,7 @@
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -125,7 +126,7 @@
{
"id": 17013,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
"dataSize": 0,
"remoteDataSize": 0,
@@ -133,7 +134,7 @@
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -151,7 +152,7 @@
{
"id": 17015,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
"dataSize": 0,
"remoteDataSize": 0,
@@ -159,7 +160,7 @@
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -177,7 +178,7 @@
{
"id": 17017,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
"dataSize": 0,
"remoteDataSize": 0,
@@ -185,7 +186,7 @@
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -203,7 +204,7 @@
{
"id": 17019,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
"dataSize": 0,
"remoteDataSize": 0,
@@ -211,7 +212,7 @@
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -229,7 +230,7 @@
{
"id": 17021,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
"dataSize": 0,
"remoteDataSize": 0,
@@ -237,7 +238,7 @@
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -255,7 +256,7 @@
{
"id": 17023,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
"dataSize": 0,
"remoteDataSize": 0,
@@ -263,7 +264,7 @@
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -281,7 +282,7 @@
{
"id": 17025,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
"dataSize": 0,
"remoteDataSize": 0,
@@ -289,7 +290,7 @@
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -307,7 +308,7 @@
{
"id": 17027,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
"dataSize": 0,
"remoteDataSize": 0,
@@ -315,7 +316,7 @@
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -333,15 +334,15 @@
{
"id": 17029,
"backendId": 11003,
- "version": 2,
+ "version": 3,
"versionHash": 0,
- "dataSize": 0,
+ "dataSize": 227,
"remoteDataSize": 0,
- "rowCount": 0,
+ "rowCount": 1,
"state": "NORMAL",
"lastFailedVersion": -1,
"lastFailedVersionHash": 0,
- "lastSuccessVersion": 2,
+ "lastSuccessVersion": 3,
"lastSuccessVersionHash": 0
}
],
@@ -362,10 +363,10 @@
"idToVisibleRollupIndex": {},
"idToShadowIndex": {},
"committedVersionHash": 0,
- "visibleVersion": 2,
- "visibleVersionTime": 1688625776037,
+ "visibleVersion": 3,
+ "visibleVersionTime": 1689754427918,
"visibleVersionHash": 0,
- "nextVersion": 3,
+ "nextVersion": 4,
"nextVersionHash": 0,
"distributionInfo": {
"clazz": "HashDistributionInfo",
@@ -509,9 +510,7 @@
{
"PlanType": "LOGICAL_UNBOUND_RELATION",
"Properties": {
- "ObjectId": "RelationId#0",
- "Table": "Table [id=0, name=null, type=OLAP]",
- "Qualifier": "[]"
+ "RelationId": "RelationId#0"
}
}
]
@@ -537,7 +536,7 @@
"DataSize": 1,
"IsUnKnown": true,
"Histogram": "",
- "Original": "unKnown"
+ "LastUpdatedTime": ""
}
}
],
@@ -565,4 +564,4 @@
"DistributionSpec": "DistributionSpecGather"
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
