This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 6601866e771 [chore](regression) Do stale resource reclaim before
executing cold heat separation p2 case #26596 (#26660)
6601866e771 is described below
commit 6601866e771b528297426280feb1166d2161cd7f
Author: AlexYue <yj976240...@gmail.com>
AuthorDate: Thu Nov 9 18:55:37 2023 +0800
[chore](regression) Do stale resource reclaim before executing cold heat
separation p2 case #26596 (#26660)
---
.../suites/cold_heat_separation_p2/load.groovy | 52 ++++++++++++++++++++++
.../table_modify_resouce_and_policy.groovy | 4 +-
2 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/regression-test/suites/cold_heat_separation_p2/load.groovy
b/regression-test/suites/cold_heat_separation_p2/load.groovy
new file mode 100644
index 00000000000..25509500c97
--- /dev/null
+++ b/regression-test/suites/cold_heat_separation_p2/load.groovy
@@ -0,0 +1,52 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+import groovy.json.JsonSlurper
+import org.codehaus.groovy.runtime.IOGroovyMethods
+
+suite("cold_heat_separation", "p2") {
+ try_sql """
+ drop database regression_test_cold_heat_separation_p2 force;
+ """
+
+ try_sql """
+ create database regression_test_cold_heat_separation_p2;
+ """
+
+ def polices = sql """
+ show storage policy;
+ """
+
+ for (policy in polices) {
+ if (policy[3].equals("STORAGE")) {
+ try_sql """
+ drop storage policy if exists ${policy[0]}
+ """
+ }
+ }
+
+ def resources = sql """
+ show resources;
+ """
+
+ for (resource in resources) {
+ if (resource[1].equals("s3")) {
+ try_sql """
+ drop resource if exists ${resource[0]}
+ """
+ }
+ }
+}
\ No newline at end of file
diff --git
a/regression-test/suites/cold_heat_separation_p2/table_modify_resouce_and_policy.groovy
b/regression-test/suites/cold_heat_separation_p2/table_modify_resouce_and_policy.groovy
index bc9a518799e..79b78834f8c 100644
---
a/regression-test/suites/cold_heat_separation_p2/table_modify_resouce_and_policy.groovy
+++
b/regression-test/suites/cold_heat_separation_p2/table_modify_resouce_and_policy.groovy
@@ -234,7 +234,7 @@ suite("table_modify_resouce") {
log.info( "test all remote size not zero")
for (int i = 0; i < tablets2.size(); i++) {
fetchDataSize(sizes, tablets2[i])
- assertEquals(sizes[1], tablets[i][9])
+ assertTrue(sizes[1] > 0)
}
@@ -317,7 +317,7 @@ suite("table_modify_resouce") {
log.info( "test all remote size not zero")
for (int i = 0; i < tablets2.size(); i++) {
fetchDataSize(sizes, tablets2[i])
- assertEquals(sizes[1], tablets[i][9])
+ assertTrue(sizes[1] > 0)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
