This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a change to branch auto-pick-47690-branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
discard 32bd2c7aeee [fix](restore) Filter partition property storage policy in synced table (#47690) add e8531621c00 branch-2.1: [feat](binlog) Support getting binlogs in batch #47557 (#47640) add cb3e77379dd branch-2.1: [fix](backup) filter the staled task response by job id #47416 (#47445) add f85176bee04 branch-2.1: [improve](move-memtable) improve error log and message for "not enough streams" #47470 (#47722) add eee254efab5 [regression-test](case) remove test_auto_partition_behavior before fix (#47818) add 48bcdf539a0 branch-2.1: [fix](table) Supply rollup for get ddl for sync #47732 (#47796) add 8c6c6424626 branch-2.1: [fix](nereids)keep at least one hash output slot when prune slots in hash join node #47318 (#47683) add f8fb5f90b81 branch-2.1: [fix](Nereids) not release lock if schema changed when insert #47733 (#47833) add c4a10849d54 branch-2.1: [fix](nereids) fix nereids dead loop due to simplify range output in-predicate's options in random order #47830 (#47828) add 058929528c4 branch-2.1: [fix](mv) Fix use sync mv wrongly when use rbo materialized view rewrite rule #47650 (#47835) add 13c8b1797db [fix](nereids)fix logical repeat computefd (#47798) add 8fb10b0fa02 branch-2.1: [opt](paimon) Optimize error prompt #47593 (#47790) add 3ec900e8784 branch-2.1:[opt](jdbc catalog) Compatible with higher ClickHouse JDBC Driver versions (#47832) add 03529e37439 branch-2.1: [fix](nereids) fix join condition with AddMinMax rule hung #47772 (#47808) add 8d3fe30bde9 [test](mv) Fix test case use wrong (#47885) add f4e73378964 branch-2.1: [fix](Nereids) let anonymous alias same as user input #47093 (#47770) add fb315866127 branch-2.1: [test](jdbc catalog) add more jdbc catalog extreme test (#47799) add 1fb96b8f275 branch-2.1: [opt](Nereids) avoid lock failed if async mv has invalid base info #47771 (#47914) add 156a2e336e5 branch-2.1: [hotfix](external) Fixed External meta replay check (#47931) add 0034c63b86b branch-2.1: [fix](routine load) fix incorrect auto-resume interval caused by excessive auto-resume attempts #47528 (#47811) add 3f7308baa56 [fix](regression) regression case: limit_push_down is unstable (Branch-2.1) (#47895) add e38902db180 branch-2.1: [improve](routine load) ensure abnormal jobs do not interfere with normal task scheduling #47530 (#47848) add a8fad9d4f24 branch-2.1: [fix](Nereids) normalize plan should also lock target table #47843 (#47916) add 056022b4234 branch-2.1: [chore](persist) save base index id & index names in TableAddOrDropColumnsInfo #47881 (#47936) add 3a747996078 branch-2.1: [fix](Nereids) fix fold constant of time acquired functions #47288 (#47920) add aabe704c7db [test](mv)Fix test mv case fail because doesn't find test method (#47953) add efa5125cdfe branch-2.1: [chore](rename) Forbid renaming partition columns since this is a buggy feature #47596 (#47938) add e153103e4d3 branch-2.1: [improve](load) improve error message "close wait failed coz rpc error" #47518 (#47805) add def86b90989 [fix](restore) Filter partition property storage policy in synced table (#47690) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (32bd2c7aeee) \ N -- N -- N refs/heads/auto-pick-47690-branch-2.1 (def86b90989) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: be/src/vec/sink/writer/vtablet_writer.cpp | 3 +- be/src/vec/sink/writer/vtablet_writer.h | 12 +- be/src/vec/sink/writer/vtablet_writer_v2.cpp | 21 +++- .../clickhouse/init/03-create-table.sql | 104 ++++++++++++++++ .../docker-compose/clickhouse/init/04-insert.sql | 18 +++ .../docker-compose/oracle/init/03-create-table.sql | 72 +++++++++++ .../docker-compose/oracle/init/04-insert.sql | 50 ++++++++ .../postgresql/init/02-create-table.sql | 76 ++++++++++++ .../docker-compose/postgresql/init/04-insert.sql | 77 ++++++++++++ .../sqlserver/init/03-create-table.sql | 129 ++++++++++++++++++++ .../docker-compose/sqlserver/init/04-insert.sql | 18 +++ .../apache/doris/alter/SchemaChangeHandler.java | 6 +- .../org/apache/doris/backup/BackupHandler.java | 28 ++++- .../org/apache/doris/binlog/BinlogManager.java | 11 +- .../java/org/apache/doris/binlog/BinlogUtils.java | 17 ++- .../java/org/apache/doris/binlog/DBBinlog.java | 6 +- .../java/org/apache/doris/binlog/TableBinlog.java | 4 +- .../main/java/org/apache/doris/catalog/Env.java | 54 +++++++-- .../apache/doris/datasource/ExternalDatabase.java | 8 +- .../doris/datasource/jdbc/JdbcExternalCatalog.java | 2 +- .../jdbc/client/JdbcClickHouseClient.java | 130 ++++++++++++++++++++ .../doris/datasource/jdbc/client/JdbcClient.java | 12 ++ .../jdbc/client/JdbcOceanBaseClient.java | 2 +- .../datasource/paimon/PaimonExternalCatalog.java | 16 +-- .../load/routineload/KafkaRoutineLoadJob.java | 89 ++++++++------ .../doris/load/routineload/RoutineLoadJob.java | 16 ++- .../doris/load/routineload/ScheduleRule.java | 14 ++- .../java/org/apache/doris/mtmv/BaseTableInfo.java | 4 + .../doris/nereids/analyzer/UnboundAlias.java | 22 +++- .../glue/translator/PhysicalPlanTranslator.java | 12 ++ .../doris/nereids/parser/LogicalPlanBuilder.java | 23 ++-- .../nereids/rules/analysis/CollectRelation.java | 11 +- .../nereids/rules/analysis/ExpressionAnalyzer.java | 2 +- .../rules/expression/ExpressionRewrite.java | 13 +- .../rules/expression/rules/SimplifyRange.java | 55 +++++---- .../mv/SelectMaterializedIndexWithAggregate.java | 16 ++- .../doris/nereids/trees/expressions/Alias.java | 6 +- .../commands/insert/InsertIntoTableCommand.java | 2 + .../trees/plans/commands/insert/InsertUtils.java | 18 ++- .../nereids/trees/plans/logical/LogicalRepeat.java | 9 +- .../doris/persist/TableAddOrDropColumnsInfo.java | 11 +- .../apache/doris/service/FrontendServiceImpl.java | 10 +- .../apache/doris/catalog/CreateTableLikeTest.java | 38 ++++++ .../jdbc/client/JdbcClickHouseClientTest.java | 67 +++++++++++ .../jdbc/{ => client}/JdbcClientExceptionTest.java | 4 +- .../paimon/PaimonExternalCatalogTest.java} | 31 ++--- .../load/routineload/RoutineLoadManagerTest.java | 33 +++++- .../properties/FunctionalDependenciesTest.java | 15 +-- .../rules/analysis/FillUpMissingSlotsTest.java | 8 +- .../persist/TableAddOrDropColumnsInfoTest.java | 8 +- gensrc/thrift/FrontendService.thrift | 1 + .../test_column_prune_in_hash_join.out | Bin 0 -> 255 bytes .../jdbc/test_clickhouse_jdbc_catalog.out | Bin 4381 -> 8056 bytes .../select/test_clickhouse_all_types_select.out | Bin 0 -> 2936 bytes .../select/test_oracle_all_types_select.out | Bin 0 -> 10265 bytes .../type_test/select/test_pg_all_types_select.out | Bin 0 -> 1959 bytes .../select/test_sqlserver_all_types_select.out | Bin 0 -> 3508 bytes .../agg_use_key_direct/agg_use_key_direct.out} | Bin 165 -> 210 bytes .../data/nereids_hint_tpcds_p0/shape/query54.out | Bin 7315 -> 7307 bytes .../push_down_count_through_join.out | Bin 29572 -> 29578 bytes .../push_down_count_through_join_one_side.out | Bin 31747 -> 31753 bytes .../eager_aggregate/push_down_min_through_join.out | Bin 16427 -> 16433 bytes .../eager_aggregate/push_down_sum_through_join.out | Bin 16193 -> 16199 bytes .../push_down_sum_through_join_one_side.out | Bin 17453 -> 17459 bytes .../filter_push_down/push_filter_through.out | Bin 10142 -> 10141 bytes .../limit_push_down/limit_push_down.out | Bin 21141 -> 20873 bytes .../data/nereids_syntax_p0/join_condition.out | Bin 0 -> 31842 bytes .../bs_downgrade_shape/query54.out | Bin 7149 -> 7141 bytes .../shape/query54.out | Bin 7149 -> 7141 bytes .../noStatsRfPrune/query54.out | Bin 6151 -> 6143 bytes .../no_stats_shape/query54.out | Bin 6420 -> 6412 bytes .../rf_prune/query54.out | Bin 7259 -> 7251 bytes .../nereids_tpcds_shape_sf100_p0/shape/query54.out | Bin 7306 -> 7298 bytes .../pipeline/p0/conf/regression-conf.groovy | 1 + .../test_column_prune_in_hash_join.groovy | 131 +++++++++++++++++++++ .../ddl_p0/test_create_table_like_nereids.groovy | 56 ++++----- .../jdbc/test_clickhouse_jdbc_catalog.groovy | 73 ++++++++---- .../test_clickhouse_all_types_select.groovy} | 33 +++--- .../select/test_oracle_all_types_select.groovy} | 34 +++--- .../select/test_pg_all_types_select.groovy | 76 ++++++++++++ .../select/test_sqlserver_all_types_select.groovy} | 34 +++--- .../test_multi_replica_fault_injection.groovy | 2 +- .../agg_use_key_direct/agg_use_key_direct.groovy | 63 ++++++++++ .../fold_constant_date_arithmatic.groovy} | 34 ++---- .../subquery/test_duplicate_name_in_view.groovy | 2 +- .../expression/test_simplify_range.groovy | 34 ++++++ .../limit_push_down/limit_push_down.groovy | 5 +- .../suites/nereids_syntax_p0/join_condition.groovy | 67 +++++++++++ .../suites/nereids_syntax_p0/select_const.groovy | 2 + .../test_dynamic_partition_with_rename.groovy | 37 +++--- ....groovy => test_rename_partition_column.groovy} | 22 +--- 91 files changed, 1761 insertions(+), 359 deletions(-) create mode 100644 fe/fe-core/src/test/java/org/apache/doris/datasource/jdbc/client/JdbcClickHouseClientTest.java rename fe/fe-core/src/test/java/org/apache/doris/datasource/jdbc/{ => client}/JdbcClientExceptionTest.java (97%) copy fe/fe-core/src/test/java/org/apache/doris/{analysis/IsNullPredicateTest.java => datasource/paimon/PaimonExternalCatalogTest.java} (59%) create mode 100644 regression-test/data/correctness_p0/test_column_prune_in_hash_join.out create mode 100644 regression-test/data/external_table_p0/jdbc/type_test/select/test_clickhouse_all_types_select.out create mode 100644 regression-test/data/external_table_p0/jdbc/type_test/select/test_oracle_all_types_select.out create mode 100644 regression-test/data/external_table_p0/jdbc/type_test/select/test_pg_all_types_select.out create mode 100644 regression-test/data/external_table_p0/jdbc/type_test/select/test_sqlserver_all_types_select.out copy regression-test/data/{workload_manager_p0/test_check_wg.out => mv_p0/agg_use_key_direct/agg_use_key_direct.out} (55%) create mode 100644 regression-test/data/nereids_syntax_p0/join_condition.out create mode 100644 regression-test/suites/correctness_p0/test_column_prune_in_hash_join.groovy copy regression-test/suites/external_table_p0/jdbc/{test_oceanbase_jdbc_catalog.groovy => type_test/select/test_clickhouse_all_types_select.groovy} (54%) copy regression-test/suites/external_table_p0/jdbc/{test_oceanbase_jdbc_catalog.groovy => type_test/select/test_oracle_all_types_select.groovy} (55%) create mode 100644 regression-test/suites/external_table_p0/jdbc/type_test/select/test_pg_all_types_select.groovy copy regression-test/suites/external_table_p0/jdbc/{test_oceanbase_jdbc_catalog.groovy => type_test/select/test_sqlserver_all_types_select.groovy} (54%) create mode 100644 regression-test/suites/mv_p0/agg_use_key_direct/agg_use_key_direct.groovy copy regression-test/suites/{nereids_syntax_p0/utf8_id_test.groovy => nereids_p0/expression/fold_constant/fold_constant_date_arithmatic.groovy} (63%) create mode 100644 regression-test/suites/nereids_syntax_p0/join_condition.groovy copy regression-test/suites/schema_change_p0/{test_rename_partition.groovy => test_rename_partition_column.groovy} (68%) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org