This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-1.1-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.1-lts by this push:
new 7990c6a4ae [Fix](storage) Fix bug that cooldown time for partition in
SSD is wrong (#15769)
7990c6a4ae is described below
commit 7990c6a4ae472780edc090beb6f9821a5f059ff4
Author: weizuo93 <wei...@apache.org>
AuthorDate: Sat Jan 21 08:23:34 2023 +0800
[Fix](storage) Fix bug that cooldown time for partition in SSD is wrong
(#15769)
Co-authored-by: weizuo <wei...@xiaomi.com>
---
.../main/java/org/apache/doris/analysis/ModifyPartitionClause.java | 3 ++-
.../src/main/java/org/apache/doris/analysis/SinglePartitionDesc.java | 4 ++--
fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java | 5 +++--
fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java | 4 ++--
.../src/test/java/org/apache/doris/catalog/CatalogTestUtil.java | 4 ++--
.../src/test/java/org/apache/doris/catalog/DataPropertyTest.java | 2 +-
.../src/test/java/org/apache/doris/common/util/UnitTestUtil.java | 2 +-
.../src/test/java/org/apache/doris/http/DorisHttpTestCase.java | 5 +++--
.../java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java | 3 ++-
9 files changed, 18 insertions(+), 14 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyPartitionClause.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyPartitionClause.java
index 504f197ab6..4b895cd810 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyPartitionClause.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyPartitionClause.java
@@ -100,7 +100,8 @@ public class ModifyPartitionClause extends AlterTableClause
{
private void checkProperties(Map<String, String> properties) throws
AnalysisException {
// 1. data property
DataProperty newDataProperty = null;
- newDataProperty = PropertyAnalyzer.analyzeDataProperty(properties,
DataProperty.DEFAULT_DATA_PROPERTY);
+ newDataProperty = PropertyAnalyzer.analyzeDataProperty(properties,
+ new DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
Preconditions.checkNotNull(newDataProperty);
// 2. replica allocation
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/SinglePartitionDesc.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/SinglePartitionDesc.java
index 6e75f67a2f..7d7674ee08 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/SinglePartitionDesc.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/SinglePartitionDesc.java
@@ -57,7 +57,7 @@ public class SinglePartitionDesc {
this.partitionKeyDesc = partitionKeyDesc;
this.properties = properties;
- this.partitionDataProperty = DataProperty.DEFAULT_DATA_PROPERTY;
+ this.partitionDataProperty = new
DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM);
this.replicaAlloc = ReplicaAllocation.DEFAULT_ALLOCATION;
}
@@ -112,7 +112,7 @@ public class SinglePartitionDesc {
// analyze data property
partitionDataProperty =
PropertyAnalyzer.analyzeDataProperty(properties,
- DataProperty.DEFAULT_DATA_PROPERTY);
+ new DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
Preconditions.checkNotNull(partitionDataProperty);
// analyze replication num
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
index 603298dcaf..300f143b7c 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
@@ -3794,7 +3794,7 @@ public class Catalog {
DataProperty dataProperty = null;
try {
dataProperty =
PropertyAnalyzer.analyzeDataProperty(stmt.getProperties(),
- DataProperty.DEFAULT_DATA_PROPERTY);
+ new DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
} catch (AnalysisException e) {
throw new DdlException(e.getMessage());
}
@@ -3927,7 +3927,8 @@ public class Catalog {
try {
// just for remove entries in stmt.getProperties(),
// and then check if there still has unknown properties
- PropertyAnalyzer.analyzeDataProperty(stmt.getProperties(),
DataProperty.DEFAULT_DATA_PROPERTY);
+ PropertyAnalyzer.analyzeDataProperty(stmt.getProperties(),
+ new
DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
if (partitionInfo.getType() == PartitionType.RANGE) {
DynamicPartitionUtil.checkAndSetDynamicPartitionProperty(olapTable, properties);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
index 8d4c22c9e6..dba36fc2d9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
@@ -29,8 +29,8 @@ import java.io.DataOutput;
import java.io.IOException;
public class DataProperty implements Writable {
- public static final DataProperty DEFAULT_DATA_PROPERTY = new DataProperty(
- "SSD".equalsIgnoreCase(Config.default_storage_medium) ?
TStorageMedium.SSD : TStorageMedium.HDD);
+ public static final TStorageMedium DEFAULT_STORAGE_MEDIUM =
+ "SSD".equalsIgnoreCase(Config.default_storage_medium) ?
TStorageMedium.SSD : TStorageMedium.HDD;
public static final long MAX_COOLDOWN_TIME_MS = 253402271999000L; //
9999-12-31 23:59:59
@SerializedName(value = "storageMedium")
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java
index 831f67acae..11ea6f062b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java
@@ -216,7 +216,7 @@ public class CatalogTestUtil {
// table
PartitionInfo partitionInfo = new SinglePartitionInfo();
- partitionInfo.setDataProperty(partitionId,
DataProperty.DEFAULT_DATA_PROPERTY);
+ partitionInfo.setDataProperty(partitionId, new
DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
partitionInfo.setReplicaAllocation(partitionId, new
ReplicaAllocation((short) 3));
OlapTable table = new OlapTable(tableId, testTable1, columns,
KeysType.AGG_KEYS, partitionInfo,
distributionInfo);
@@ -275,7 +275,7 @@ public class CatalogTestUtil {
// table
PartitionInfo partitionInfo = new SinglePartitionInfo();
- partitionInfo.setDataProperty(testPartitionId2,
DataProperty.DEFAULT_DATA_PROPERTY);
+ partitionInfo.setDataProperty(testPartitionId2, new
DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
partitionInfo.setReplicaAllocation(testPartitionId2, new
ReplicaAllocation((short) 1));
OlapTable table = new OlapTable(testTableId2, testTable2, columns,
KeysType.DUP_KEYS, partitionInfo,
distributionInfo);
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/DataPropertyTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/DataPropertyTest.java
index 7bb4eac665..01b7b32c0e 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/DataPropertyTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/DataPropertyTest.java
@@ -27,7 +27,7 @@ public class DataPropertyTest {
@Test
public void tesCooldownTimeMs() throws Exception {
Config.default_storage_medium = "ssd";
- DataProperty dataProperty = DataProperty.DEFAULT_DATA_PROPERTY;
+ DataProperty dataProperty = new
DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM);
Assert.assertNotEquals(DataProperty.MAX_COOLDOWN_TIME_MS,
dataProperty.getCooldownTimeMs());
dataProperty = new DataProperty(TStorageMedium.SSD);
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/common/util/UnitTestUtil.java
b/fe/fe-core/src/test/java/org/apache/doris/common/util/UnitTestUtil.java
index b85d1b20ba..80aefb5fa2 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/common/util/UnitTestUtil.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/UnitTestUtil.java
@@ -110,7 +110,7 @@ public class UnitTestUtil {
// table
PartitionInfo partitionInfo = new SinglePartitionInfo();
- partitionInfo.setDataProperty(partitionId,
DataProperty.DEFAULT_DATA_PROPERTY);
+ partitionInfo.setDataProperty(partitionId, new
DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
partitionInfo.setReplicaAllocation(partitionId, new
ReplicaAllocation((short) 3));
partitionInfo.setIsInMemory(partitionId, false);
partitionInfo.setTabletType(partitionId, TTabletType.TABLET_TYPE_DISK);
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java
b/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java
index d9489841d7..efe2c83e2f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java
@@ -152,7 +152,7 @@ abstract public class DorisHttpTestCase {
// table
PartitionInfo partitionInfo = new SinglePartitionInfo();
- partitionInfo.setDataProperty(testPartitionId,
DataProperty.DEFAULT_DATA_PROPERTY);
+ partitionInfo.setDataProperty(testPartitionId, new
DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
partitionInfo.setReplicaAllocation(testPartitionId, new
ReplicaAllocation((short) 3));
OlapTable table = new OlapTable(testTableId, name, columns,
KeysType.AGG_KEYS, partitionInfo,
distributionInfo);
@@ -170,7 +170,8 @@ abstract public class DorisHttpTestCase {
columns.add(k1);
columns.add(k2);
PartitionInfo partitionInfo = new SinglePartitionInfo();
- partitionInfo.setDataProperty(testPartitionId + 100,
DataProperty.DEFAULT_DATA_PROPERTY);
+ partitionInfo.setDataProperty(testPartitionId + 100,
+ new DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
partitionInfo.setReplicaAllocation(testPartitionId + 100,
ReplicaAllocation.DEFAULT_ALLOCATION);
EsTable table = null;
Map<String, String> props = new HashMap<>();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java
b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java
index b828fe01e7..1a84530058 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java
@@ -61,7 +61,8 @@ public class BatchModifyPartitionsInfoTest {
List<Long> partitionIds = Lists.newArrayList(PARTITION_ID_1,
PARTITION_ID_2, PARTITION_ID_3);
for (long partitionId : partitionIds) {
ModifyInfos.add(new ModifyPartitionInfo(DB_ID, TB_ID, partitionId,
- DataProperty.DEFAULT_DATA_PROPERTY,
ReplicaAllocation.DEFAULT_ALLOCATION, true));
+ new DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM),
+ ReplicaAllocation.DEFAULT_ALLOCATION, true));
}
BatchModifyPartitionsInfo batchModifyPartitionsInfo = new
BatchModifyPartitionsInfo(ModifyInfos);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
