This is an automated email from the ASF dual-hosted git repository. HappenLee pushed a commit to branch paimon-blob-4.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 85b6d6044907fb35f0da8d09b58e62bd31e7a428 Merge: 680d25215f5 b29a0cf0184 Author: happenlee <[email protected]> AuthorDate: Fri Oct 23 11:18:35 2026 +0800 [fix](file) Sync the branch-4.1 FILE backport into Paimon Blob ### What problem does this PR solve? Related PR: #68853, #69040 Problem Summary: Bring the four follow-up commits from the FILE type backport into the Paimon Blob branch. Preserve existing Blob readers while applying cast integration fixes, simplified FILE expression and resource propagation, aggregate and array restrictions, and removal of unused FILE literal APIs. ### Release note Align FILE expressions and restrictions with the updated branch-4.1 backport. ### Check List (For Author) - Test: Manual merge review and git diff --check; integration validation follows after synchronizing the remaining upstream changes. - Behavior changed: Yes, as described above. - Does this need documentation: No, this synchronizes the existing feature backport. be/src/agent/be_exec_version_manager.cpp | 5 +- be/src/agent/be_exec_version_manager.h | 1 - be/src/core/data_type/data_type_file.cpp | 21 --- be/src/core/data_type/data_type_file.h | 3 - .../core/data_type_serde/data_type_file_serde.cpp | 2 +- be/src/exprs/function/cast/cast_to_array.h | 4 +- be/src/exprs/function/cast/cast_to_map.h | 2 +- be/src/exprs/function/function_dict_get_many.cpp | 1 + be/src/exprs/function/function_variant_type.cpp | 1 + be/src/exprs/vcase_expr.h | 3 + be/src/exprs/vexpr.cpp | 5 - be/src/exprs/vfile_literal.cpp | 64 ------- be/src/exprs/vfile_literal.h | 38 ----- be/test/core/data_type/data_type_file_test.cpp | 28 ++- .../data_type_serde/data_type_file_serde_test.cpp | 26 +++ .../aggregate/aggregate_function_file_test.cpp | 160 +++++++++++++++++- be/test/exprs/file_expr_test.cpp | 132 --------------- be/test/exprs/vcondition_expr_test.cpp | 79 +++++++++ .../java/org/apache/doris/catalog/FileType.java | 15 -- .../org/apache/doris/catalog/PrimitiveType.java | 3 - .../main/java/org/apache/doris/common/Config.java | 4 +- .../org/apache/doris/analysis/FileLiteral.java | 126 -------------- .../org/apache/doris/analysis/StructLiteral.java | 3 +- .../org/apache/doris/nereids/StatementContext.java | 9 - .../glue/translator/ExpressionTranslator.java | 11 +- .../nereids/rules/analysis/BindExpression.java | 3 +- .../nereids/rules/analysis/CheckAnalysis.java | 33 ++-- .../expression/rules/FoldConstantRuleOnBE.java | 51 +----- .../expression/rules/FoldConstantRuleOnFE.java | 4 - .../nereids/trees/expressions/Expression.java | 45 +---- .../trees/expressions/functions/agg/MapAgg.java | 3 +- .../trees/expressions/functions/agg/MapAggV2.java | 3 +- .../expressions/functions/scalar/ArrayCompact.java | 2 +- .../functions/scalar/ArrayReverseSort.java | 2 +- .../expressions/functions/scalar/ArraySortBy.java | 3 +- .../expressions/functions/scalar/ElementAt.java | 43 +---- .../trees/expressions/literal/FileLiteral.java | 85 ---------- .../expressions/visitor/ExpressionVisitor.java | 5 - .../org/apache/doris/nereids/types/DataType.java | 9 +- .../apache/doris/nereids/util/ExpressionUtils.java | 22 +++ .../doris/nereids/util/TypeCoercionUtils.java | 5 +- .../org/apache/doris/persist/gson/GsonUtils.java | 2 - .../java/org/apache/doris/qe/ConnectContext.java | 17 ++ .../doris/qe/runtime/ThriftPlansBuilder.java | 19 +-- .../tablefunction/ListFileTableValuedFunction.java | 3 +- .../doris/analysis/ExprGsonSerializationTest.java | 45 ----- .../org/apache/doris/catalog/S3ResourceTest.java | 20 ++- .../glue/translator/ToFileTranslatorTest.java | 29 +--- .../rules/expression/FoldConstantRuleOnBETest.java | 89 ++++++---- .../nereids/rules/rewrite/FileAccessPathTest.java | 49 +++++- .../nereids/stats/ExpressionEstimationTest.java | 11 +- .../expressions/literal/StructLiteralTest.java | 20 +++ .../doris/nereids/types/FileTypeDdlTest.java | 18 -- .../nereids/types/FileTypeExpressionTest.java | 188 ++++++++------------- .../apache/doris/nereids/types/FileTypeTest.java | 21 --- .../ListFileTableValuedFunctionTest.java | 11 +- gensrc/thrift/Exprs.thrift | 1 - .../complex_types/test_file_type.groovy | 60 ++++++- .../test_file_type_resource_local.groovy | 30 ++++ 59 files changed, 676 insertions(+), 1021 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
