This is an automated email from the ASF dual-hosted git repository. diwu pushed a commit to branch streaming-job-dev in repository https://gitbox.apache.org/repos/asf/doris.git
commit 1fb95b2dd116fb5e811597e9cb61f94dce8e3203 Merge: 777ba161038 72e1080eb21 Author: wudi <[email protected]> AuthorDate: Fri Sep 19 09:55:01 2025 +0800 Merge branch 'master' into streaming-job-dev be/src/cloud/cloud_internal_service.cpp | 92 +- be/src/cloud/cloud_schema_change_job.cpp | 5 +- be/src/cloud/cloud_storage_engine.cpp | 9 +- be/src/cloud/cloud_storage_engine.h | 13 + be/src/cloud/cloud_tablet.cpp | 270 ++++- be/src/cloud/cloud_tablet.h | 92 +- be/src/cloud/cloud_warm_up_manager.cpp | 44 +- be/src/cloud/pb_convert.cpp | 12 + be/src/common/config.cpp | 6 + be/src/common/config.h | 6 + be/src/exec/rowid_fetcher.cpp | 17 +- be/src/io/cache/block_file_cache.cpp | 47 + be/src/io/cache/block_file_cache.h | 11 + be/src/io/cache/cached_remote_file_reader.cpp | 14 + be/src/io/cache/file_cache_common.h | 2 + be/src/io/io_common.h | 2 + be/src/olap/base_tablet.h | 29 +- be/src/olap/calc_delete_bitmap_executor.cpp | 5 +- be/src/olap/calc_delete_bitmap_executor.h | 2 +- be/src/olap/olap_common.h | 8 + be/src/olap/parallel_scanner_builder.cpp | 2 +- be/src/olap/parallel_scanner_builder.h | 3 + be/src/olap/rowset/beta_rowset.cpp | 7 +- be/src/olap/rowset/beta_rowset.h | 3 +- be/src/olap/rowset/beta_rowset_reader.cpp | 2 +- be/src/olap/rowset/beta_rowset_writer.cpp | 2 +- be/src/olap/rowset/rowset.cpp | 4 + be/src/olap/rowset/rowset.h | 2 + be/src/olap/rowset/rowset_meta.h | 17 + be/src/olap/rowset/segment_v2/segment.cpp | 19 +- be/src/olap/rowset/segment_v2/segment.h | 3 +- .../variant/hierarchical_data_iterator.cpp | 8 +- .../variant/hierarchical_data_iterator.h | 9 +- .../variant/sparse_column_extract_iterator.h | 23 +- .../segment_v2/variant/variant_column_reader.cpp | 7 +- be/src/olap/rowset_builder.cpp | 38 +- be/src/olap/storage_engine.cpp | 9 +- be/src/olap/storage_engine.h | 5 + be/src/olap/tablet.cpp | 4 +- be/src/olap/tablet.h | 4 +- be/src/olap/tablet_meta.h | 6 +- be/src/olap/version_graph.cpp | 208 ++++ be/src/olap/version_graph.h | 63 ++ be/src/pipeline/exec/olap_scan_operator.cpp | 34 +- be/src/pipeline/exec/olap_scan_operator.h | 16 + be/src/runtime/runtime_state.h | 14 + be/src/service/point_query_executor.cpp | 6 +- be/src/vec/exec/scan/olap_scanner.cpp | 24 +- .../cloud/cloud_tablet_query_prefer_cache_test.cpp | 804 +++++++++++++++ .../cloud_tablet_query_with_tolerance_test.cpp | 1074 ++++++++++++++++++++ be/test/cloud/cloud_tablet_test.cpp | 84 +- be/test/olap/rowid_conversion_test.cpp | 3 +- .../variant_column_writer_reader_test.cpp | 23 +- be/test/olap/segcompaction_mow_test.cpp | 3 +- be/test/olap/segcompaction_test.cpp | 9 +- be/test/olap/tablet_test.cpp | 4 +- cloud/src/meta-service/meta_service_job.cpp | 40 +- cloud/src/meta-service/meta_service_txn.cpp | 9 + cloud/src/meta-service/txn_lazy_committer.cpp | 4 + cloud/test/meta_service_job_test.cpp | 14 + cloud/test/meta_service_test.cpp | 63 ++ .../main/java/org/apache/doris/common/Config.java | 6 + .../org/apache/doris/mysql/privilege/Auth.java | 18 + .../mysql/privilege/CommonUserProperties.java | 22 + .../apache/doris/mysql/privilege/UserProperty.java | 37 + .../doris/mysql/privilege/UserPropertyMgr.java | 18 + .../functions/ComputeSignatureHelper.java | 2 +- .../trees/expressions/functions/scalar/Array.java | 2 +- .../expressions/functions/scalar/Coalesce.java | 4 +- .../functions/scalar/GreatestLeast.java | 4 +- .../trees/expressions/functions/scalar/If.java | 2 +- .../trees/expressions/functions/scalar/NullIf.java | 2 +- .../trees/expressions/functions/scalar/Nvl.java | 2 +- .../trees/plans/logical/LogicalSetOperation.java | 2 +- .../doris/nereids/util/TypeCoercionUtils.java | 53 +- .../java/org/apache/doris/qe/SessionVariable.java | 38 + .../doris/transaction/DatabaseTransactionMgr.java | 59 +- .../org/apache/doris/catalog/UserPropertyTest.java | 4 + .../doris/nereids/util/TypeCoercionMatrixTest.java | 2 +- .../apache/doris/planner/ResourceTagQueryTest.java | 2 +- gensrc/proto/olap_file.proto | 4 + gensrc/thrift/PaloInternalService.thrift | 3 + .../no_warmup/test_enable_prefer_cached_rowset.out | Bin 0 -> 586 bytes .../no_warmup/test_query_freshness_tolerance.out | Bin 0 -> 446 bytes ...est_warmup_delay_compaction_query_tolerance.out | Bin 0 -> 136 bytes .../test_warmup_delay_idx_query_tolerance.out | Bin 0 -> 264 bytes .../test_warmup_delay_sc_query_tolerance.out | Bin 0 -> 181 bytes ...up_delay_timeout_compaction_query_tolerance.out | Bin 0 -> 262 bytes .../warmup/test_warmup_download_fail.out | Bin 0 -> 140 bytes .../test_outer_join_with_window_function.out | Bin 220 -> 223 bytes ...test_outer_join_with_window_function_datev2.out | Bin 220 -> 223 bytes .../float/test_float_special_values.out | Bin 66662 -> 66663 bytes .../data/doc/sql-manual/ArrayNullsafe.out | Bin 8344 -> 8377 bytes .../basic-elements/data-types/array-md.out | Bin 1984 -> 1969 bytes .../data/nereids_function_p0/type_coercion.out | Bin 777 -> 727 bytes .../conditional_functions/test_coalesce.out | Bin 8703 -> 8613 bytes .../test_conditional_function.out | Bin 2722 -> 2682 bytes .../conditional_functions/test_nullif.out | Bin 4701 -> 4248 bytes .../data/nereids_p0/union/test_union.out | Bin 13952 -> 13923 bytes .../infer_predicate/infer_intersect_except.out | Bin 4335 -> 4328 bytes .../infer_predicate/pull_up_predicate_set_op.out | Bin 19873 -> 19725 bytes .../simplify_conditional_function.out | Bin 1281 -> 1223 bytes .../data/nereids_syntax_p0/set_operation.out | Bin 5494 -> 3619 bytes .../sql/test_compare_expression.out | Bin 781 -> 784 bytes .../query_p0/cast/test_complextype_to_json.out | Bin 1498 -> 1464 bytes .../sql_functions/array_functions/sql/q02.out | Bin 2854 -> 2826 bytes .../array_functions/test_array_functions.out | Bin 29216 -> 29072 bytes .../test_array_functions_by_literal.out | Bin 30420 -> 30210 bytes .../test_array_functions_with_where.out | Bin 1911 -> 1863 bytes .../conditional_functions/test_coalesce.out | Bin 8703 -> 8613 bytes .../test_conditional_function.out | Bin 3303 -> 3283 bytes .../conditional_functions/test_nullif.out | Bin 4574 -> 4276 bytes regression-test/data/query_p0/union/test_union.out | Bin 13952 -> 13923 bytes .../cache/http/test_list_cache_file.groovy | 3 + .../test_enable_prefer_cached_rowset.groovy | 178 ++++ .../test_query_freshness_tolerance.groovy | 183 ++++ ..._warmup_delay_compaction_query_tolerance.groovy | 316 ++++++ .../test_warmup_delay_idx_query_tolerance.groovy | 332 ++++++ .../test_warmup_delay_sc_query_tolerance.groovy | 308 ++++++ ...delay_timeout_compaction_query_tolerance.groovy | 335 ++++++ .../warmup/test_warmup_download_fail.groovy | 254 +++++ .../cloud_p0/test_read_cluster_var_property.groovy | 214 ++++ ...ilecache_with_base_compaction_thresthold.groovy | 56 +- .../insert_p0/transaction/test_txn_limit.groovy | 91 ++ .../insert/test_too_many_versions_detection.groovy | 44 + .../suites/nereids_p0/datatype/test_cast.groovy | 2 +- .../datatype/test_date_implicit_cast.groovy | 6 +- .../fold_constant/fold_constant_by_be.groovy | 2 +- .../suites/query_p0/cast/test_cast.groovy | 4 +- 129 files changed, 5733 insertions(+), 243 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
