Skip to content

Commit

Permalink
[fix](regression case) fix variable scope bug in some inverted index …
Browse files Browse the repository at this point in the history 
…regression cases
  • Loading branch information
@Tanya-W
Tanya-W committed Jun 26, 2023
1 parent 50c1d55 commit 9c38665
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 27 deletions.
6 changes: 2 additions & 4 deletions regression-test/suites/inverted_index_p0/test_add_drop_index_ignore_case_column.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions regression-test/suites/inverted_index_p0/test_add_drop_index_with_data.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions regression-test/suites/inverted_index_p0/test_add_drop_index_with_delete_data.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions regression-test/suites/inverted_index_p0/test_index_match_phrase.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions regression-test/suites/inverted_index_p0/test_index_match_select.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions regression-test/suites/inverted_index_p0/test_index_range_in_select.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions regression-test/suites/inverted_index_p0/test_index_range_not_in_select.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
Expand Down

0 comments on commit 9c38665

Please sign in to comment.