This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 1b19fca4a78 branch-3.1: [fix](alter) alter partition without
storage_policy property will also cancel storage_policy #51662 (#52026)
1b19fca4a78 is described below
commit 1b19fca4a789bd176547d9d43a60240497a82e93
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jun 20 14:59:37 2025 +0800
branch-3.1: [fix](alter) alter partition without storage_policy property
will also cancel storage_policy #51662 (#52026)
Cherry-picked from #51662
Co-authored-by: camby <[email protected]>
---
fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java | 3 ++-
.../java/org/apache/doris/common/util/PropertyAnalyzer.java | 7 +++++++
.../test_show_storage_policy_using.groovy | 13 ++++++++++++-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java
index ca6268c5b03..37b1f177d45 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java
@@ -852,7 +852,8 @@ public class Alter {
// check currentStoragePolicy resource exist.
Env.getCurrentEnv().getPolicyMgr().checkStoragePolicyExist(currentStoragePolicy);
partitionInfo.setStoragePolicy(partition.getId(),
currentStoragePolicy);
- } else {
+ } else if (PropertyAnalyzer.hasStoragePolicy(properties)) {
+ // only set "storage_policy" = "", means cancel storage policy
// if current partition is already in remote storage
if (partition.getRemoteDataSize() > 0) {
throw new AnalysisException(
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
index 2460119f60a..1c12d2b106b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
@@ -1194,6 +1194,13 @@ public class PropertyAnalyzer {
return storagePolicy;
}
+ public static boolean hasStoragePolicy(Map<String, String> properties) {
+ if (properties != null &&
properties.containsKey(PROPERTIES_STORAGE_POLICY)) {
+ return true;
+ }
+ return false;
+ }
+
public static String analyzeStorageVaultName(Map<String, String>
properties) {
String storageVaultName = null;
if (properties != null &&
properties.containsKey(PROPERTIES_STORAGE_VAULT_NAME)) {
diff --git
a/regression-test/suites/cold_heat_separation_p2/test_show_storage_policy_using.groovy
b/regression-test/suites/cold_heat_separation_p2/test_show_storage_policy_using.groovy
index a6277e663d7..b3ea5c7c8de 100644
---
a/regression-test/suites/cold_heat_separation_p2/test_show_storage_policy_using.groovy
+++
b/regression-test/suites/cold_heat_separation_p2/test_show_storage_policy_using.groovy
@@ -156,6 +156,17 @@ suite("test_show_storage_policy_using") {
"""
assertTrue(show_result.size() >= 4)
+ // alter other property, will not cancel storage_policy
+ sql """ ALTER STORAGE POLICY ${policy_name} PROPERTIES("cooldown_ttl" =
"1"); """
+ sql """
+ ALTER TABLE partition_with_multiple_storage_policy MODIFY PARTITION
(`p201701`) SET ("replication_num"="1")
+ """
+ show_result = sql """
+ show storage policy using for ${policy_name}
+ """
+ assertEquals(show_result.size(), 2)
+ sql """ ALTER STORAGE POLICY ${policy_name} PROPERTIES("cooldown_ttl" =
"300"); """
+
// test cancel a partition's storage policy
sql """
ALTER TABLE partition_with_multiple_storage_policy MODIFY PARTITION
(`p201701`) SET ("storage_policy"="")
@@ -187,4 +198,4 @@ suite("test_show_storage_policy_using") {
sql """ DROP TABLE IF EXISTS table_no_storage_policy_1 """
sql """ DROP TABLE IF EXISTS partition_with_multiple_storage_policy """
sql """ DROP TABLE IF EXISTS table_with_storage_policy_2"""
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
