This is an automated email from the ASF dual-hosted git repository. dataroaring 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 61366b21aa [regression-test](merge-on-write) Optimize merge-on-write case execution time (#17956) 61366b21aa is described below commit 61366b21aa4136c22ff97421c501985b83a8be2a Author: Xin Liao <liaoxin...@126.com> AuthorDate: Tue Mar 21 12:49:42 2023 +0800 [regression-test](merge-on-write) Optimize merge-on-write case execution time (#17956) --- .../ssb_unique_sql_zstd_p0/sql/q1.1.out | 0 .../ssb_unique_sql_zstd_p0/sql/q1.2.out | 0 .../ssb_unique_sql_zstd_p0/sql/q1.3.out | 0 .../ssb_unique_sql_zstd_p0/sql/q2.1.out | 0 .../ssb_unique_sql_zstd_p0/sql/q2.2.out | 0 .../ssb_unique_sql_zstd_p0/sql/q2.3.out | 0 .../ssb_unique_sql_zstd_p0/sql/q3.1.out | 0 .../ssb_unique_sql_zstd_p0/sql/q3.2.out | 0 .../ssb_unique_sql_zstd_p0/sql/q3.3.out | 0 .../ssb_unique_sql_zstd_p0/sql/q3.4.out | 0 .../ssb_unique_sql_zstd_p0/sql/q4.1.out | 0 .../ssb_unique_sql_zstd_p0/sql/q4.2.out | 0 .../ssb_unique_sql_zstd_p0/sql/q4.3.out | 0 .../test_mow_with_null_sequence.out | 0 .../test_unique_mow_sequence.out | 0 .../ssb_unique_sql_zstd_p0/sql/q1.1.out | 0 .../ssb_unique_sql_zstd_p0/sql/q1.2.out | 0 .../ssb_unique_sql_zstd_p0/sql/q1.3.out | 0 .../ssb_unique_sql_zstd_p0/sql/q2.1.out | 0 .../ssb_unique_sql_zstd_p0/sql/q2.2.out | 0 .../ssb_unique_sql_zstd_p0/sql/q2.3.out | 0 .../ssb_unique_sql_zstd_p0/sql/q3.1.out | 0 .../ssb_unique_sql_zstd_p0/sql/q3.2.out | 0 .../ssb_unique_sql_zstd_p0/sql/q3.3.out | 0 .../ssb_unique_sql_zstd_p0/sql/q3.4.out | 0 .../ssb_unique_sql_zstd_p0/sql/q4.1.out | 0 .../ssb_unique_sql_zstd_p0/sql/q4.2.out | 0 .../ssb_unique_sql_zstd_p0/sql/q4.3.out | 0 .../ddl/customer_create.sql | 0 .../ddl/customer_delete.sql | 0 .../ddl/customer_part_delete.sql | 0 .../ddl/customer_sequence_create.sql | 0 .../ssb_unique_load_zstd_p0/ddl/date_create.sql | 0 .../ssb_unique_load_zstd_p0/ddl/date_delete.sql | 0 .../ddl/date_part_delete.sql | 0 .../ddl/date_sequence_create.sql | 0 .../ddl/lineorder_create.sql | 0 .../ddl/lineorder_delete.sql | 0 .../ddl/lineorder_part_delete.sql | 0 .../ddl/lineorder_sequence_create.sql | 0 .../ssb_unique_load_zstd_p0/ddl/part_create.sql | 0 .../ssb_unique_load_zstd_p0/ddl/part_delete.sql | 0 .../ddl/part_part_delete.sql | 0 .../ddl/part_sequence_create.sql | 0 .../ddl/supplier_create.sql | 0 .../ddl/supplier_delete.sql | 0 .../ddl/supplier_part_delete.sql | 0 .../ddl/supplier_sequence_create.sql | 0 .../four/load_four_step.groovy | 33 ++++-------- .../one/load_one_step.groovy | 33 ++++-------- .../three/load_three_step.groovy | 33 ++++-------- .../two/load_two_step.groovy | 33 ++++-------- .../ssb_unique_sql_zstd_p0/ddl/customer_create.sql | 0 .../ssb_unique_sql_zstd_p0/ddl/customer_delete.sql | 0 .../ssb_unique_sql_zstd_p0/ddl/date_create.sql | 0 .../ssb_unique_sql_zstd_p0/ddl/date_delete.sql | 0 .../ddl/lineorder_create.sql | 0 .../ddl/lineorder_delete.sql | 0 .../ssb_unique_sql_zstd_p0/ddl/part_create.sql | 0 .../ssb_unique_sql_zstd_p0/ddl/part_delete.sql | 0 .../ssb_unique_sql_zstd_p0/ddl/supplier_create.sql | 0 .../ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql | 0 .../ssb_unique_sql_zstd_p0/load.groovy | 0 .../ssb_unique_sql_zstd_p0/sql/q1.1.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q1.2.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q1.3.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q2.1.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q2.2.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q2.3.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q3.1.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q3.2.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q3.3.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q3.4.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q4.1.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q4.2.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q4.3.sql | 0 .../test_mow_with_null_sequence.groovy | 0 .../test_pk_uk_case.groovy | 2 +- .../test_primary_key_simple_case.groovy | 0 .../test_unique_mow_sequence.groovy | 0 .../ddl/customer_create.sql | 0 .../ddl/customer_delete.sql | 0 .../ddl/customer_part_delete.sql | 0 .../ddl/customer_sequence_create.sql | 0 .../ssb_unique_load_zstd_p0/ddl/date_create.sql | 0 .../ssb_unique_load_zstd_p0/ddl/date_delete.sql | 0 .../ddl/date_part_delete.sql | 0 .../ddl/date_sequence_create.sql | 0 .../ddl/lineorder_create.sql | 0 .../ddl/lineorder_delete.sql | 0 .../ddl/lineorder_part_delete.sql | 0 .../ddl/lineorder_sequence_create.sql | 0 .../ssb_unique_load_zstd_p0/ddl/part_create.sql | 0 .../ssb_unique_load_zstd_p0/ddl/part_delete.sql | 0 .../ddl/part_part_delete.sql | 0 .../ddl/part_sequence_create.sql | 0 .../ddl/supplier_create.sql | 0 .../ddl/supplier_delete.sql | 0 .../ddl/supplier_part_delete.sql | 0 .../ddl/supplier_sequence_create.sql | 0 .../four/load_four_step.groovy | 36 +++++-------- .../one/load_one_step.groovy | 37 +++++-------- .../three/load_three_step.groovy | 39 +++++--------- .../two/load_two_step.groovy | 37 +++++-------- .../ddl/customer_create.sql | 0 .../ddl/customer_delete.sql | 0 .../ssb_unique_sql_zstd_p0}/ddl/date_create.sql | 0 .../ssb_unique_sql_zstd_p0}/ddl/date_delete.sql | 0 .../ddl/lineorder_create.sql | 0 .../ddl/lineorder_delete.sql | 0 .../ssb_unique_sql_zstd_p0}/ddl/part_create.sql | 0 .../ssb_unique_sql_zstd_p0}/ddl/part_delete.sql | 0 .../ddl/supplier_create.sql | 0 .../ddl/supplier_delete.sql | 0 .../ssb_unique_sql_zstd_p0/load.groovy | 62 +++++++++++----------- .../ssb_unique_sql_zstd_p0/sql/q1.1.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q1.2.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q1.3.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q2.1.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q2.2.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q2.3.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q3.1.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q3.2.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q3.3.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q3.4.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q4.1.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q4.2.sql | 0 .../ssb_unique_sql_zstd_p0/sql/q4.3.sql | 0 .../test_pk_uk_case.groovy | 2 +- 129 files changed, 123 insertions(+), 224 deletions(-) diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.1.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.1.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.2.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.2.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.3.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.3.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.1.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.1.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.2.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.2.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.3.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.3.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.1.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.1.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.2.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.2.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.3.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.3.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.4.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.4.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.1.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.1.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.2.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.2.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.out b/regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.3.out similarity index 100% copy from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.out copy to regression-test/data/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.3.out diff --git a/regression-test/data/primary_index/test_mow_with_null_sequence.out b/regression-test/data/unique_with_mow_p0/test_mow_with_null_sequence.out similarity index 100% rename from regression-test/data/primary_index/test_mow_with_null_sequence.out rename to regression-test/data/unique_with_mow_p0/test_mow_with_null_sequence.out diff --git a/regression-test/data/primary_index/test_unique_mow_sequence.out b/regression-test/data/unique_with_mow_p0/test_unique_mow_sequence.out similarity index 100% rename from regression-test/data/primary_index/test_unique_mow_sequence.out rename to regression-test/data/unique_with_mow_p0/test_unique_mow_sequence.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.1.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.1.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.2.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.2.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.3.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.3.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.1.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.1.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.2.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.2.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.3.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.3.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.1.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.1.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.2.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.2.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.3.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.3.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.4.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.4.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.1.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.1.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.2.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.2.out diff --git a/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.out b/regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.3.out similarity index 100% rename from regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.out rename to regression-test/data/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.3.out diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/customer_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/customer_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/customer_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/customer_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/date_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/date_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/date_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/date_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/part_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/part_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/part_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/supplier_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/supplier_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/four/load_four_step.groovy similarity index 73% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/four/load_four_step.groovy index 450ecf48bd..49e7904191 100644 --- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy +++ b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/four/load_four_step.groovy @@ -20,11 +20,11 @@ // and modified by Doris. suite("load_four_step") { - def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey", 1500], "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, - lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, - lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572, "lo_orderkey", 481137], "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000, "p_partkey", 10000], "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, - d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, - d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey", 224], "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey", 100]] + def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey", 1500], + "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, + d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, + d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey", 224], + "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey", 100]] tables.each { tableName, rows -> sql """ DROP TABLE IF EXISTS $tableName """ @@ -60,25 +60,10 @@ suite("load_four_step") { } } sql 'sync' - int flag = 1 - while (flag < 30){ - def tableVersion = sql "admin show replica status from ${tableName}" - logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString()) - if (tableVersion[0][3] > 1){ - for (int i = 1; i <= 5; i++) { - def loadRowCount = sql "select count(1) from ${tableName}" - logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) - assertTrue(loadRowCount[0][0] == rows[1]) - } - break - } else { - flag ++ - sleep(1000) - } - } - if (flag >= 30){ - logger.info("wait version timeout") - assertTrue(1 == 2) + for (int i = 1; i <= 5; i++) { + def loadRowCount = sql "select count(1) from ${tableName}" + logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) + assertTrue(loadRowCount[0][0] == rows[1]) } } sql """ set delete_without_partition = true; """ diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/one/load_one_step.groovy similarity index 58% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/one/load_one_step.groovy index 64bb276553..74ff14bf68 100644 --- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy +++ b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/one/load_one_step.groovy @@ -17,11 +17,11 @@ suite("load_one_step") { - def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000], "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, - lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, - lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572], "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000], "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, - d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, - d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255], "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200]] + def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000], + "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, + d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, + d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255], + "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200]] tables.each { tableName, rows -> sql """ DROP TABLE IF EXISTS $tableName """ @@ -54,25 +54,10 @@ suite("load_one_step") { } } sql 'sync' - int flag = 1 - while (flag < 30){ - def tableVersion = sql "admin show replica status from ${tableName}" - logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString()) - if (tableVersion[0][3] > 1){ - for (int i = 1; i <= 5; i++) { - def loadRowCount = sql "select count(1) from ${tableName}" - logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) - assertTrue(loadRowCount[0][0] == rows[1]) - } - break - } else { - flag ++ - sleep(1000) - } - } - if (flag >= 30){ - logger.info("wait version timeout") - assertTrue(1 == 2) + for (int i = 1; i <= 5; i++) { + def loadRowCount = sql "select count(1) from ${tableName}" + logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) + assertTrue(loadRowCount[0][0] == rows[1]) } } } diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/three/load_three_step.groovy similarity index 63% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/three/load_three_step.groovy index 04ec4b03e2..0d44a22312 100644 --- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy +++ b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/three/load_three_step.groovy @@ -17,11 +17,11 @@ suite("load_three_step") { - def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey"], "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, - lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, - lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572, "lo_orderkey"], "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000, "p_partkey"], "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, - d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, - d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey"], "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey"]] + def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey"], + "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, + d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, + d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey"], + "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey"]] tables.each { tableName, rows -> sql """ DROP TABLE IF EXISTS $tableName """ @@ -56,25 +56,10 @@ suite("load_three_step") { } } sql 'sync' - int flag = 1 - while (flag < 30){ - def tableVersion = sql "admin show replica status from ${tableName}" - logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString()) - if (tableVersion[0][3] > 1){ - for (int i = 1; i <= 5; i++) { - def loadRowCount = sql "select count(1) from ${tableName}" - logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) - assertTrue(loadRowCount[0][0] == rows[1]) - } - break - } else { - flag ++ - sleep(1000) - } - } - if (flag >= 30){ - logger.info("wait version timeout") - assertTrue(1 == 2) + for (int i = 1; i <= 5; i++) { + def loadRowCount = sql "select count(1) from ${tableName}" + logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) + assertTrue(loadRowCount[0][0] == rows[1]) } } sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/two/load_two_step.groovy similarity index 63% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy copy to regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/two/load_two_step.groovy index c49410abb9..7b9a3ab0b8 100644 --- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy +++ b/regression-test/suites/unique_with_mow_p0/ssb_unique_load_zstd_p0/two/load_two_step.groovy @@ -17,11 +17,11 @@ suite("load_two_step") { - def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey"], "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, - lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, - lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572, "lo_orderkey"], "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000, "p_partkey"], "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, - d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, - d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey"], "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey"]] + def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey"], + "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, + d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, + d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey"], + "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey"]] tables.each { tableName, rows -> sql """ DROP TABLE IF EXISTS $tableName """ @@ -55,25 +55,10 @@ suite("load_two_step") { } } sql 'sync' - int flag = 1 - while (flag < 30){ - def tableVersion = sql "admin show replica status from ${tableName}" - logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString()) - if (tableVersion[0][3] > 1){ - for (int i = 1; i <= 5; i++) { - def loadRowCount = sql "select count(1) from ${tableName}" - logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) - assertTrue(loadRowCount[0][0] == rows[1]) - } - break - } else { - flag ++ - sleep(1000) - } - } - if (flag >= 30){ - logger.info("wait version timeout") - assertTrue(1 == 2) + for (int i = 1; i <= 5; i++) { + def loadRowCount = sql "select count(1) from ${tableName}" + logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) + assertTrue(loadRowCount[0][0] == rows[1]) } sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text for (int i = 1; i <= 5; i++) { diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/customer_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/customer_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/customer_create.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/customer_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/date_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/date_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/date_create.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/date_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/date_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/date_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/date_delete.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/date_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/part_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/part_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/part_create.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/part_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/part_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/part_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/part_delete.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql rename to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/load.groovy similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/load.groovy diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.1.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.1.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.2.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.2.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.3.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q1.3.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.1.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.1.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.2.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.2.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.3.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q2.3.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.1.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.1.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.2.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.2.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.3.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.3.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.4.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q3.4.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.1.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.1.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.2.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.2.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.sql b/regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.3.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.sql copy to regression-test/suites/unique_with_mow_p0/ssb_unique_sql_zstd_p0/sql/q4.3.sql diff --git a/regression-test/suites/primary_index/test_mow_with_null_sequence.groovy b/regression-test/suites/unique_with_mow_p0/test_mow_with_null_sequence.groovy similarity index 100% rename from regression-test/suites/primary_index/test_mow_with_null_sequence.groovy rename to regression-test/suites/unique_with_mow_p0/test_mow_with_null_sequence.groovy diff --git a/regression-test/suites/primary_index/test_pk_uk_case.groovy b/regression-test/suites/unique_with_mow_p0/test_pk_uk_case.groovy similarity index 99% copy from regression-test/suites/primary_index/test_pk_uk_case.groovy copy to regression-test/suites/unique_with_mow_p0/test_pk_uk_case.groovy index 1ae47e3b10..315e26088b 100644 --- a/regression-test/suites/primary_index/test_pk_uk_case.groovy +++ b/regression-test/suites/unique_with_mow_p0/test_pk_uk_case.groovy @@ -99,7 +99,7 @@ suite("test_pk_uk_case") { def city = RandomStringUtils.randomAlphabetic(10) def name = UUID.randomUUID().toString() def date = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDateTime.now()) - for (int idx = 0; idx < 50; idx++) { + for (int idx = 0; idx < 10; idx++) { order_key = rd.nextInt(10) part_key = rd.nextInt(10) decimal = rd.nextFloat() diff --git a/regression-test/suites/primary_index/test_primary_key_simple_case.groovy b/regression-test/suites/unique_with_mow_p0/test_primary_key_simple_case.groovy similarity index 100% rename from regression-test/suites/primary_index/test_primary_key_simple_case.groovy rename to regression-test/suites/unique_with_mow_p0/test_primary_key_simple_case.groovy diff --git a/regression-test/suites/primary_index/test_unique_mow_sequence.groovy b/regression-test/suites/unique_with_mow_p0/test_unique_mow_sequence.groovy similarity index 100% rename from regression-test/suites/primary_index/test_unique_mow_sequence.groovy rename to regression-test/suites/unique_with_mow_p0/test_unique_mow_sequence.groovy diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/customer_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_create.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/customer_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/customer_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_delete.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/customer_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/date_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_create.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/date_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/date_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_delete.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/date_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/part_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_create.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/part_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/part_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_delete.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/supplier_create.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_create.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/supplier_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql similarity index 100% copy from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql copy to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/four/load_four_step.groovy similarity index 73% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/four/load_four_step.groovy index 450ecf48bd..81702248a8 100644 --- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy +++ b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/four/load_four_step.groovy @@ -20,11 +20,15 @@ // and modified by Doris. suite("load_four_step") { - def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey", 1500], "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, - lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, - lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572, "lo_orderkey", 481137], "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000, "p_partkey", 10000], "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, - d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, - d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey", 224], "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey", 100]] + def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey", 1500], + "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, + lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, + lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572, "lo_orderkey", 481137], + "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000, "p_partkey", 10000], + "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, + d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, + d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey", 224], + "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey", 100]] tables.each { tableName, rows -> sql """ DROP TABLE IF EXISTS $tableName """ @@ -61,24 +65,10 @@ suite("load_four_step") { } sql 'sync' int flag = 1 - while (flag < 30){ - def tableVersion = sql "admin show replica status from ${tableName}" - logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString()) - if (tableVersion[0][3] > 1){ - for (int i = 1; i <= 5; i++) { - def loadRowCount = sql "select count(1) from ${tableName}" - logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) - assertTrue(loadRowCount[0][0] == rows[1]) - } - break - } else { - flag ++ - sleep(1000) - } - } - if (flag >= 30){ - logger.info("wait version timeout") - assertTrue(1 == 2) + for (int i = 1; i <= 5; i++) { + def loadRowCount = sql "select count(1) from ${tableName}" + logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) + assertTrue(loadRowCount[0][0] == rows[1]) } } sql """ set delete_without_partition = true; """ diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/one/load_one_step.groovy similarity index 58% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/one/load_one_step.groovy index 64bb276553..31a8344d73 100644 --- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy +++ b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/one/load_one_step.groovy @@ -17,11 +17,15 @@ suite("load_one_step") { - def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000], "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, - lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, - lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572], "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000], "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, - d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, - d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255], "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200]] + def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000], + "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, + lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, + lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572], + "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000], + "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, + d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, + d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255], + "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200]] tables.each { tableName, rows -> sql """ DROP TABLE IF EXISTS $tableName """ @@ -54,25 +58,10 @@ suite("load_one_step") { } } sql 'sync' - int flag = 1 - while (flag < 30){ - def tableVersion = sql "admin show replica status from ${tableName}" - logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString()) - if (tableVersion[0][3] > 1){ - for (int i = 1; i <= 5; i++) { - def loadRowCount = sql "select count(1) from ${tableName}" - logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) - assertTrue(loadRowCount[0][0] == rows[1]) - } - break - } else { - flag ++ - sleep(1000) - } - } - if (flag >= 30){ - logger.info("wait version timeout") - assertTrue(1 == 2) + for (int i = 1; i <= 5; i++) { + def loadRowCount = sql "select count(1) from ${tableName}" + logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) + assertTrue(loadRowCount[0][0] == rows[1]) } } } diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/three/load_three_step.groovy similarity index 62% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/three/load_three_step.groovy index 04ec4b03e2..aae1b16426 100644 --- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy +++ b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/three/load_three_step.groovy @@ -17,11 +17,15 @@ suite("load_three_step") { - def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey"], "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, - lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, - lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572, "lo_orderkey"], "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000, "p_partkey"], "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, - d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, - d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey"], "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey"]] + def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey"], + "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, + lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, + lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572, "lo_orderkey"], + "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000, "p_partkey"], + "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, + d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, + d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey"], + "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey"]] tables.each { tableName, rows -> sql """ DROP TABLE IF EXISTS $tableName """ @@ -56,26 +60,11 @@ suite("load_three_step") { } } sql 'sync' - int flag = 1 - while (flag < 30){ - def tableVersion = sql "admin show replica status from ${tableName}" - logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString()) - if (tableVersion[0][3] > 1){ - for (int i = 1; i <= 5; i++) { - def loadRowCount = sql "select count(1) from ${tableName}" - logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) - assertTrue(loadRowCount[0][0] == rows[1]) - } - break - } else { - flag ++ - sleep(1000) - } - } - if (flag >= 30){ - logger.info("wait version timeout") - assertTrue(1 == 2) - } + for (int i = 1; i <= 5; i++) { + def loadRowCount = sql "select count(1) from ${tableName}" + logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) + assertTrue(loadRowCount[0][0] == rows[1]) + } } sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text for (int i = 1; i <= 5; i++) { diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/two/load_two_step.groovy similarity index 63% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy rename to regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/two/load_two_step.groovy index c49410abb9..f309aaeba3 100644 --- a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy +++ b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd_p0/two/load_two_step.groovy @@ -17,11 +17,15 @@ suite("load_two_step") { - def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey"], "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, - lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, - lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572, "lo_orderkey"], "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000, "p_partkey"], "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, - d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, - d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey"], "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey"]] + def tables = ["customer": ["""c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use""", 3000, "c_custkey"], + "lineorder": ["""lo_orderkey,lo_linenumber,lo_custkey,lo_partkey,lo_suppkey,lo_orderdate,lo_orderpriority, + lo_shippriority,lo_quantity,lo_extendedprice,lo_ordtotalprice,lo_discount, + lo_revenue,lo_supplycost,lo_tax,lo_commitdate,lo_shipmode,lo_dummy""", 600572, "lo_orderkey"], + "part": ["""p_partkey,p_name,p_mfgr,p_category,p_brand,p_color,p_type,p_size,p_container,p_dummy""", 20000, "p_partkey"], + "date": ["""d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, + d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, + d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,d_dummy""", 255, "d_datekey"], + "supplier": ["""s_suppkey,s_name,s_address,s_city,s_nation,s_region,s_phone,s_dummy""", 200, "s_suppkey"]] tables.each { tableName, rows -> sql """ DROP TABLE IF EXISTS $tableName """ @@ -55,25 +59,10 @@ suite("load_two_step") { } } sql 'sync' - int flag = 1 - while (flag < 30){ - def tableVersion = sql "admin show replica status from ${tableName}" - logger.info(" ${tableName} version: ${tableVersion[0][3]}".toString()) - if (tableVersion[0][3] > 1){ - for (int i = 1; i <= 5; i++) { - def loadRowCount = sql "select count(1) from ${tableName}" - logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) - assertTrue(loadRowCount[0][0] == rows[1]) - } - break - } else { - flag ++ - sleep(1000) - } - } - if (flag >= 30){ - logger.info("wait version timeout") - assertTrue(1 == 2) + for (int i = 1; i <= 5; i++) { + def loadRowCount = sql "select count(1) from ${tableName}" + logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString()) + assertTrue(loadRowCount[0][0] == rows[1]) } sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text for (int i = 1; i <= 5; i++) { diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/customer_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/customer_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/date_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/date_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/date_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/date_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/part_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/part_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/part_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/part_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_create.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_create.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql diff --git a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/load.groovy similarity index 57% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/load.groovy index 417b5fa64c..7860230c55 100644 --- a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy +++ b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/load.groovy @@ -37,44 +37,46 @@ suite("load") { sql new File("""${context.file.parent}/ddl/${table}_create.sql""").text sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text } - def i = 0 - for (String tableName in tables) { - streamLoad { - // a default db 'regression_test' is specified in - // ${DORIS_HOME}/conf/regression-conf.groovy - table tableName + for (int j = 0; j < 10; j++) { + def i = 0 + for (String tableName in tables) { + streamLoad { + // a default db 'regression_test' is specified in + // ${DORIS_HOME}/conf/regression-conf.groovy + table tableName - // default label is UUID: - // set 'label' UUID.randomUUID().toString() + // default label is UUID: + // set 'label' UUID.randomUUID().toString() - // default column_separator is specify in doris fe config, usually is '\t'. - // this line change to ',' - set 'column_separator', '|' - set 'compress_type', 'GZ' - set 'columns', columns[i] - + // default column_separator is specify in doris fe config, usually is '\t'. + // this line change to ',' + set 'column_separator', '|' + set 'compress_type', 'GZ' + set 'columns', columns[i] + - // relate to ${DORIS_HOME}/regression-test/data/demo/streamload_input.csv. - // also, you can stream load a http stream, e.g. http://xxx/some.csv - file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz""" + // relate to ${DORIS_HOME}/regression-test/data/demo/streamload_input.csv. + // also, you can stream load a http stream, e.g. http://xxx/some.csv + file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz""" - time 10000 // limit inflight 10s + time 10000 // limit inflight 10s - // stream load action will check result, include Success status, and NumberTotalRows == NumberLoadedRows + // stream load action will check result, include Success status, and NumberTotalRows == NumberLoadedRows - // if declared a check callback, the default check condition will ignore. - // So you must check all condition - check { result, exception, startTime, endTime -> - if (exception != null) { - throw exception + // if declared a check callback, the default check condition will ignore. + // So you must check all condition + check { result, exception, startTime, endTime -> + if (exception != null) { + throw exception + } + log.info("Stream load result: ${result}".toString()) + def json = parseJson(result) + assertEquals("success", json.Status.toLowerCase()) + assertEquals(json.NumberTotalRows, json.NumberLoadedRows) + assertTrue(json.NumberLoadedRows > 0 && json.LoadBytes > 0) } - log.info("Stream load result: ${result}".toString()) - def json = parseJson(result) - assertEquals("success", json.Status.toLowerCase()) - assertEquals(json.NumberTotalRows, json.NumberLoadedRows) - assertTrue(json.NumberLoadedRows > 0 && json.LoadBytes > 0) } + i++ } - i++ } } diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.1.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.1.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.2.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.2.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.3.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q1.3.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.1.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.1.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.2.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.2.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.3.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q2.3.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.1.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.1.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.2.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.2.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.3.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.3.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.4.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q3.4.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.1.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.1.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.2.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.2.sql diff --git a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.3.sql similarity index 100% rename from regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.sql rename to regression-test/suites/unique_with_mow_p2/ssb_unique_sql_zstd_p0/sql/q4.3.sql diff --git a/regression-test/suites/primary_index/test_pk_uk_case.groovy b/regression-test/suites/unique_with_mow_p2/test_pk_uk_case.groovy similarity index 99% rename from regression-test/suites/primary_index/test_pk_uk_case.groovy rename to regression-test/suites/unique_with_mow_p2/test_pk_uk_case.groovy index 1ae47e3b10..8ca7491b56 100644 --- a/regression-test/suites/primary_index/test_pk_uk_case.groovy +++ b/regression-test/suites/unique_with_mow_p2/test_pk_uk_case.groovy @@ -99,7 +99,7 @@ suite("test_pk_uk_case") { def city = RandomStringUtils.randomAlphabetic(10) def name = UUID.randomUUID().toString() def date = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDateTime.now()) - for (int idx = 0; idx < 50; idx++) { + for (int idx = 0; idx < 500; idx++) { order_key = rd.nextInt(10) part_key = rd.nextInt(10) decimal = rd.nextFloat() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org