Skip to content

Commit

Permalink
[enhancement][regression] remove binary data in regression test outpu…
Browse files Browse the repository at this point in the history 
…t file (apache#39364)

If there are binary outputs in the output file of the regression test,
it will be more difficult to deal with conflicts when cherry-picking PRs
to other branches, and this PR deletes these binary outputs to make it
easier to merge and cherry-pick the code in future.
  • Loading branch information
@zhannngchen @dataroaring
zhannngchen authored and dataroaring committed Aug 17, 2024
1 parent 8fe4ba2 commit 8ac9851
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 12 deletions.
Binary file modified ...ession-test/data/unique_with_mow_p0/partial_update/test_partial_update_insert_seq_col.out
View file
Binary file not shown.
Binary file modified regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_seq_col.out
View file
Binary file not shown.
Binary file modified ...ession-test/data/unique_with_mow_p0/partial_update/test_partial_update_seq_col_delete.out
View file
Binary file not shown.
Binary file modified regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_seq_type.out
View file
Binary file not shown.
Binary file modified ...ssion-test/data/unique_with_mow_p0/partial_update/test_partial_update_seq_type_delete.out
View file
Binary file not shown.
7 changes: 6 additions & 1 deletion ...n-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_seq_col.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,12 @@ suite("test_partial_update_native_insert_seq_col", "p0") {
sql "SET show_hidden_columns=true"
sql "sync"

qt_partial_update_with_seq_hidden_columns """select * from ${tableName} order by id;"""
qt_partial_update_with_seq_hidden_columns """
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

sql """ DROP TABLE IF EXISTS ${tableName} """

Expand Down
5 changes: 4 additions & 1 deletion regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,10 @@ suite("test_primary_key_partial_update_seq_col", "p0") {
sql "sync"

qt_partial_update_with_seq_hidden_columns """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// drop drop
Expand Down
10 changes: 8 additions & 2 deletions ...n-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col_delete.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ suite("test_primary_key_partial_update_seq_col_delete", "p0") {

sql "sync"
qt_partial_update_without_seq_hidden_columns """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

sql "SET show_hidden_columns=false"
Expand Down Expand Up @@ -114,7 +117,10 @@ suite("test_primary_key_partial_update_seq_col_delete", "p0") {
sql "sync"

qt_partial_update_with_seq_hidden_columns """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// drop drop
Expand Down
20 changes: 16 additions & 4 deletions regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ suite("test_primary_key_partial_update_seq_type", "p0") {
sql "sync"

qt_partial_update_with_seq_score_hidden """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// use test as sequence column
Expand Down Expand Up @@ -140,7 +143,10 @@ suite("test_primary_key_partial_update_seq_type", "p0") {
sql "sync"

qt_partial_update_with_seq_test_hidden """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// no partial update header, stream load should success,
Expand All @@ -160,7 +166,10 @@ suite("test_primary_key_partial_update_seq_type", "p0") {
sql "sync"

qt_select_no_partial_update_score """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// no partial update header, stream load should success,
Expand All @@ -180,7 +189,10 @@ suite("test_primary_key_partial_update_seq_type", "p0") {
sql "sync"

qt_select_no_partial_update_test """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// drop table
Expand Down
20 changes: 16 additions & 4 deletions ...-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type_delete.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ suite("test_primary_key_partial_update_seq_type_delete", "p0") {
sql "sync"

qt_partial_update_with_seq_score_hidden """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// use test as sequence column
Expand Down Expand Up @@ -143,7 +146,10 @@ suite("test_primary_key_partial_update_seq_type_delete", "p0") {
sql "sync"

qt_partial_update_with_seq_test_hidden """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// no partial update header, stream load should success,
Expand All @@ -164,7 +170,10 @@ suite("test_primary_key_partial_update_seq_type_delete", "p0") {
sql "sync"

qt_select_no_partial_update_score """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// no partial update header, stream load should success,
Expand All @@ -185,7 +194,10 @@ suite("test_primary_key_partial_update_seq_type_delete", "p0") {
sql "sync"

qt_select_no_partial_update_test """
select * from ${tableName} order by id;
select id, name, score, test, dft, update_time, __DORIS_DELETE_SIGN__, __DORIS_VERSION_COL__,
__DORIS_SEQUENCE_COL__
from ${tableName}
order by id;
"""

// drop table
Expand Down

0 comments on commit 8ac9851

Please sign in to comment.