This is an automated email from the ASF dual-hosted git repository. kxiao pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 86d5fa4c02cc0e16aa29df33624f386299e98993 Author: zhangguoqiang <[email protected]> AuthorDate: Wed Sep 6 12:12:43 2023 +0800 [fix](segcompaction) disable segcompaction when calculating delete bitmap (#23927) Calc delete bitmap may generate segments, as a result, may trigger segcompaction. But the BetaRowsetWriter is a transient one and in Publishing context, which is bug-prone and hard to rollback. So let us disable the triggering in delete bitmap calc code path. Signed-off-by: freemandealer <[email protected]> --- .../es/test_external_catalog_es.out | 21 +++++++++++---------- .../es/test_external_catalog_es.groovy | 11 ++--------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/regression-test/data/external_table_p2/es/test_external_catalog_es.out b/regression-test/data/external_table_p2/es/test_external_catalog_es.out index 3f61e7c809..d2104f34fc 100644 --- a/regression-test/data/external_table_p2/es/test_external_catalog_es.out +++ b/regression-test/data/external_table_p2/es/test_external_catalog_es.out @@ -1,12 +1,13 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -\N \N \N \N \N \N \N \N \N \N {"properties":{"account_number":{"type":"long"},"firstname":{"type":"text"},"address":{"type":"text"},"balance":{"type":"long"},"gender":{"type":"text"},"city":{"type":"text"},"employer":{"type":"text"},"state":{"type":"text"},"age":{"type":"text"},"email":{"type":"text"},"lastname":{"type":"text"}}} {"index":{"number_of_shards":5,"number_of_replicas":1}} \N -0 244 Columbus Place 29 16623 Hobucken [email protected] Euron Bradshaw F Mckenzie \N \N CO -1 880 Holmes Lane 32 39225 Brogan [email protected] Pyrami Amber M Duke \N \N IL -2 560 Kingsway Place 22 28838 Bennett [email protected] Chillium Roberta F Bender \N \N LA -3 328 Wilson Avenue 26 44947 Cochranville [email protected] Amtap Levine F Burks \N \N HI -4 986 Wyckoff Avenue 31 27658 Eastvale [email protected] Tourmania Rodriquez F Flores \N \N HI -5 311 Elm Place 30 29342 Fairview [email protected] Diginetic Leola F Stewart \N \N NJ -6 671 Bristol Street 36 5686 Dante [email protected] Netagy Hattie M Bond \N \N TN -7 820 Logan Street 22 39121 Shrewsbury [email protected] Teraprene Levy M Richard \N \N MO -8 699 Visitation Place 35 48868 Wakulla [email protected] Glasstep Jan M Burns \N \N AZ +\N \N \N \N \N \N \N \N \N \N {"properties":{"account_number":{"type":"long"},"firstname":{"type":"text"},"address":{"type":"text"},"balance":{"type":"long"},"gender":{"type":"text"},"city":{"type":"text"},"employer":{"type":"text"},"state":{"type":"text"},"age":{"type":"text"},"email":{"type":"text"},"lastname":{"type":"text"}}} {"index":{"number_of_shards":5,"number_of_replicas":1}} \N +0 244 Columbus Place 29 16623 Hobucken [email protected] Euron Bradshaw F Mckenzie \N \N CO +1 880 Holmes Lane 32 39225 Brogan [email protected] Pyrami Amber M Duke \N \N IL +2 560 Kingsway Place 22 28838 Bennett [email protected] Chillium Roberta F Bender \N \N LA +3 328 Wilson Avenue 26 44947 Cochranville [email protected] Amtap Levine F Burks \N \N HI +4 986 Wyckoff Avenue 31 27658 Eastvale [email protected] Tourmania Rodriquez F Flores \N \N HI +5 311 Elm Place 30 29342 Fairview [email protected] Diginetic Leola F Stewart \N \N NJ +6 671 Bristol Street 36 5686 Dante [email protected] Netagy Hattie M Bond \N \N TN +7 820 Logan Street 22 39121 Shrewsbury [email protected] Teraprene Levy M Richard \N \N MO +8 699 Visitation Place 35 48868 Wakulla [email protected] Glasstep Jan M Burns \N \N AZ + diff --git a/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy b/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy index 3f8581930e..6e1cf4e0d8 100644 --- a/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy +++ b/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy @@ -39,16 +39,9 @@ suite("test_external_catalog_es", "p2") { ); """ - sql """ - SWITCH ${esCatalogName}; - """ - sql """ - SHOW DATABASES; - """ + qt_sql "select * from ${esCatalogName}.default_db.${jdbcPg14Table1} order by account_number limit 10;" - def res1=sql "select * from ${jdbcPg14Table1} limit 10;" - logger.info("recoding all: " + res1.toString()) + sql """drop catalog if exists ${esCatalogName};""" - sql """switch internal;""" } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
