This is an automated email from the ASF dual-hosted git repository.
panxiaolei 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 899f7fbfeb [fix](regression case) fix variable scope bug in some
inverted index regression cases (#21194)
899f7fbfeb is described below
commit 899f7fbfeb069e1d961c65ed3bfe4f3117dfcf31
Author: YueW <[email protected]>
AuthorDate: Tue Jul 4 18:05:46 2023 +0800
[fix](regression case) fix variable scope bug in some inverted index
regression cases (#21194)
fix variable scope bug in some inverted index regression cases
---
.../inverted_index_p0/test_add_drop_index_ignore_case_column.groovy | 6 ++----
.../suites/inverted_index_p0/test_add_drop_index_with_data.groovy | 4 +---
.../inverted_index_p0/test_add_drop_index_with_delete_data.groovy | 6 ++----
.../suites/inverted_index_p0/test_index_match_phrase.groovy | 6 ++----
.../suites/inverted_index_p0/test_index_match_select.groovy | 6 ++----
.../suites/inverted_index_p0/test_index_range_in_select.groovy | 6 ++----
.../suites/inverted_index_p0/test_index_range_not_in_select.groovy | 6 ++----
7 files changed, 13 insertions(+), 27 deletions(-)
diff --git
a/regression-test/suites/inverted_index_p0/test_add_drop_index_ignore_case_column.groovy
b/regression-test/suites/inverted_index_p0/test_add_drop_index_ignore_case_column.groovy
index 0efbcc0b52..42473016a6 100644
---
a/regression-test/suites/inverted_index_p0/test_add_drop_index_ignore_case_column.groovy
+++
b/regression-test/suites/inverted_index_p0/test_add_drop_index_ignore_case_column.groovy
@@ -40,8 +40,8 @@ suite("test_add_drop_index_with_ignore_case_column",
"inverted_index"){
def wait_for_build_index_on_partition_finish = { table_name, OpTimeout ->
for(int t = delta_time; t <= OpTimeout; t += delta_time){
alter_res = sql """SHOW BUILD INDEX WHERE TableName =
"${table_name}";"""
- expected_finished_num = alter_res.size();
- finished_num = 0;
+ def expected_finished_num = alter_res.size();
+ def finished_num = 0;
for (int i = 0; i < expected_finished_num; i++) {
logger.info(table_name + " build index job state: " +
alter_res[i][7] + i)
if (alter_res[i][7] == "FINISHED") {
@@ -51,8 +51,6 @@ suite("test_add_drop_index_with_ignore_case_column",
"inverted_index"){
if (finished_num == expected_finished_num) {
logger.info(table_name + " all build index jobs finished,
detail: " + alter_res)
break
- } else {
- finished_num = 0;
}
useTime = t
sleep(delta_time)
diff --git
a/regression-test/suites/inverted_index_p0/test_add_drop_index_with_data.groovy
b/regression-test/suites/inverted_index_p0/test_add_drop_index_with_data.groovy
index 35aceb3717..6b48a7add0 100644
---
a/regression-test/suites/inverted_index_p0/test_add_drop_index_with_data.groovy
+++
b/regression-test/suites/inverted_index_p0/test_add_drop_index_with_data.groovy
@@ -41,7 +41,7 @@ suite("test_add_drop_index_with_data", "inverted_index"){
for(int t = delta_time; t <= OpTimeout; t += delta_time){
alter_res = sql """SHOW BUILD INDEX WHERE TableName =
"${table_name}";"""
def expected_finished_num = alter_res.size();
- finished_num = 0;
+ def finished_num = 0;
for (int i = 0; i < expected_finished_num; i++) {
logger.info(table_name + " build index job state: " +
alter_res[i][7] + i)
if (alter_res[i][7] == "FINISHED") {
@@ -51,8 +51,6 @@ suite("test_add_drop_index_with_data", "inverted_index"){
if (finished_num == expected_finished_num) {
logger.info(table_name + " all build index jobs finished,
detail: " + alter_res)
break
- } else {
- finished_num = 0;
}
useTime = t
sleep(delta_time)
diff --git
a/regression-test/suites/inverted_index_p0/test_add_drop_index_with_delete_data.groovy
b/regression-test/suites/inverted_index_p0/test_add_drop_index_with_delete_data.groovy
index 0d8a03a5f7..7f614cf71a 100644
---
a/regression-test/suites/inverted_index_p0/test_add_drop_index_with_delete_data.groovy
+++
b/regression-test/suites/inverted_index_p0/test_add_drop_index_with_delete_data.groovy
@@ -40,8 +40,8 @@ suite("test_add_drop_index_with_delete_data",
"inverted_index"){
def wait_for_build_index_on_partition_finish = { table_name, OpTimeout ->
for(int t = delta_time; t <= OpTimeout; t += delta_time){
alter_res = sql """SHOW BUILD INDEX WHERE TableName =
"${table_name}";"""
- expected_finished_num = alter_res.size();
- finished_num = 0;
+ def expected_finished_num = alter_res.size();
+ def finished_num = 0;
for (int i = 0; i < expected_finished_num; i++) {
logger.info(table_name + " build index job state: " +
alter_res[i][7] + i)
if (alter_res[i][7] == "FINISHED") {
@@ -51,8 +51,6 @@ suite("test_add_drop_index_with_delete_data",
"inverted_index"){
if (finished_num == expected_finished_num) {
logger.info(table_name + " all build index jobs finished,
detail: " + alter_res)
break
- } else {
- finished_num = 0;
}
useTime = t
sleep(delta_time)
diff --git
a/regression-test/suites/inverted_index_p0/test_index_match_phrase.groovy
b/regression-test/suites/inverted_index_p0/test_index_match_phrase.groovy
index 10b28e59ca..d15ab10f9c 100644
--- a/regression-test/suites/inverted_index_p0/test_index_match_phrase.groovy
+++ b/regression-test/suites/inverted_index_p0/test_index_match_phrase.groovy
@@ -50,8 +50,8 @@ suite("test_index_match_phrase_select",
"inverted_index_select"){
def wait_for_build_index_on_partition_finish = { table_name, OpTimeout ->
for(int t = delta_time; t <= OpTimeout; t += delta_time){
alter_res = sql """SHOW BUILD INDEX WHERE TableName =
"${table_name}";"""
- expected_finished_num = alter_res.size();
- finished_num = 0;
+ def expected_finished_num = alter_res.size();
+ def finished_num = 0;
for (int i = 0; i < expected_finished_num; i++) {
logger.info(table_name + " build index job state: " +
alter_res[i][7] + i)
if (alter_res[i][7] == "FINISHED") {
@@ -61,8 +61,6 @@ suite("test_index_match_phrase_select",
"inverted_index_select"){
if (finished_num == expected_finished_num) {
logger.info(table_name + " all build index jobs finished,
detail: " + alter_res)
break
- } else {
- finished_num = 0;
}
useTime = t
sleep(delta_time)
diff --git
a/regression-test/suites/inverted_index_p0/test_index_match_select.groovy
b/regression-test/suites/inverted_index_p0/test_index_match_select.groovy
index 4442c93c83..0bd03eea6a 100644
--- a/regression-test/suites/inverted_index_p0/test_index_match_select.groovy
+++ b/regression-test/suites/inverted_index_p0/test_index_match_select.groovy
@@ -50,8 +50,8 @@ suite("test_index_match_select", "inverted_index_select"){
def wait_for_build_index_on_partition_finish = { table_name, OpTimeout ->
for(int t = delta_time; t <= OpTimeout; t += delta_time){
alter_res = sql """SHOW BUILD INDEX WHERE TableName =
"${table_name}";"""
- expected_finished_num = alter_res.size();
- finished_num = 0;
+ def expected_finished_num = alter_res.size();
+ def finished_num = 0;
for (int i = 0; i < expected_finished_num; i++) {
logger.info(table_name + " build index job state: " +
alter_res[i][7] + i)
if (alter_res[i][7] == "FINISHED") {
@@ -61,8 +61,6 @@ suite("test_index_match_select", "inverted_index_select"){
if (finished_num == expected_finished_num) {
logger.info(table_name + " all build index jobs finished,
detail: " + alter_res)
break
- } else {
- finished_num = 0;
}
useTime = t
sleep(delta_time)
diff --git
a/regression-test/suites/inverted_index_p0/test_index_range_in_select.groovy
b/regression-test/suites/inverted_index_p0/test_index_range_in_select.groovy
index bb17d0f76b..637ce50eea 100644
--- a/regression-test/suites/inverted_index_p0/test_index_range_in_select.groovy
+++ b/regression-test/suites/inverted_index_p0/test_index_range_in_select.groovy
@@ -88,8 +88,8 @@ suite("test_index_range_in_select", "inverted_index_select"){
def wait_for_build_index_on_partition_finish = { table_name, OpTimeout ->
for(int t = delta_time; t <= OpTimeout; t += delta_time){
alter_res = sql """SHOW BUILD INDEX WHERE TableName =
"${table_name}";"""
- expected_finished_num = alter_res.size();
- finished_num = 0;
+ def expected_finished_num = alter_res.size();
+ def finished_num = 0;
for (int i = 0; i < expected_finished_num; i++) {
logger.info(table_name + " build index job state: " +
alter_res[i][7] + i)
if (alter_res[i][7] == "FINISHED") {
@@ -99,8 +99,6 @@ suite("test_index_range_in_select", "inverted_index_select"){
if (finished_num == expected_finished_num) {
logger.info(table_name + " all build index jobs finished,
detail: " + alter_res)
break
- } else {
- finished_num = 0;
}
useTime = t
sleep(delta_time)
diff --git
a/regression-test/suites/inverted_index_p0/test_index_range_not_in_select.groovy
b/regression-test/suites/inverted_index_p0/test_index_range_not_in_select.groovy
index 04a2df58a6..5cb79845a4 100644
---
a/regression-test/suites/inverted_index_p0/test_index_range_not_in_select.groovy
+++
b/regression-test/suites/inverted_index_p0/test_index_range_not_in_select.groovy
@@ -94,8 +94,8 @@ suite("test_index_range_not_in_select",
"inverted_index_select"){
def wait_for_build_index_on_partition_finish = { table_name, OpTimeout
->
for(int t = delta_time; t <= OpTimeout; t += delta_time){
alter_res = sql """SHOW BUILD INDEX WHERE TableName =
"${table_name}";"""
- expected_finished_num = alter_res.size();
- finished_num = 0;
+ def expected_finished_num = alter_res.size();
+ def finished_num = 0;
for (int i = 0; i < expected_finished_num; i++) {
logger.info(table_name + " build index job state: " +
alter_res[i][7] + i)
if (alter_res[i][7] == "FINISHED") {
@@ -105,8 +105,6 @@ suite("test_index_range_not_in_select",
"inverted_index_select"){
if (finished_num == expected_finished_num) {
logger.info(table_name + " all build index jobs finished,
detail: " + alter_res)
break
- } else {
- finished_num = 0;
}
useTime = t
sleep(delta_time)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
