This is an automated email from the ASF dual-hosted git repository. morningman pushed a change to branch branch-1.2-unstable in repository https://gitbox.apache.org/repos/asf/doris.git
discard d28010428c [fix](memtracker) Fix DCHECK(!std::count(_consumer_tracker_stack.begin(), _consumer_tracker_stack.end(), tracker)) #13960 add 698541e58d [improvement](exec) add more debug info on fragment exec error (#13899) add f2d84d81e6 [feature-wip][refactor](multi-catalog) Persist external catalog related metadata. (#13746) add e09033276e [fix](runtime-filter) build thread destruct first may cause probe thread coredump (#13911) add efb2596c7a [enhancment](Nereids) enable push down filter through aggregation (#13938) add 9bf20a7b5d [enhancement](Nereids) remove unnecessary int cast (#13881) add dc01fb4085 [enhancement](Nereids) remove unnecessary string cast (#13730) add 948e080b31 [minor](error msg) Fix wrong error message (#13950) add 554f566217 [enhancement](compaction) introduce segment compaction (#12609) (#12866) add 06a1efdb01 [fix](Nerieds) fix tpch and support trace plan's change event (#13957) add a19e6881c7 [chore](be web ui)upgrade jquery version to 3.6.0 (#13942) add f87be09d69 [fix](load) Fix load channel mgr lock (#13960) add 04830af039 [fix](tablet sink) fallback to non-vectorized interface in tablet_sink if is in progress of upgrding from 1.1-lts to 1.2-lts (#13966) 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 (d28010428c) \ N -- N -- N refs/heads/branch-1.2-unstable (04830af039) 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/common/config.h | 11 + be/src/common/status.h | 6 +- be/src/exec/hash_join_node.cpp | 42 +- be/src/exec/tablet_sink.cpp | 46 +- be/src/exec/tablet_sink.h | 4 +- be/src/http/web_page_handler.cpp | 2 +- be/src/olap/compaction.cpp | 2 +- be/src/olap/delta_writer.cpp | 44 +- be/src/olap/delta_writer.h | 3 - be/src/olap/olap_server.cpp | 21 + be/src/olap/rowset/beta_rowset.cpp | 13 + be/src/olap/rowset/beta_rowset.h | 7 + be/src/olap/rowset/beta_rowset_writer.cpp | 654 +++++++++++++++++++-- be/src/olap/rowset/beta_rowset_writer.h | 72 ++- be/src/olap/rowset/segment_v2/segment_writer.h | 7 +- be/src/olap/schema_change.h | 1 + be/src/olap/storage_engine.cpp | 11 + be/src/olap/storage_engine.h | 15 + be/src/runtime/fragment_mgr.cpp | 7 +- be/src/runtime/load_channel_mgr.h | 1 + be/src/service/doris_main.cpp | 1 - be/src/util/doris_metrics.h | 1 + be/src/util/libjvm_loader.cpp | 4 +- be/src/vec/olap/vgeneric_iterators.cpp | 514 +++++----------- be/src/vec/olap/vgeneric_iterators.h | 261 ++++++++ be/src/vec/sink/vtablet_sink.cpp | 172 ++++-- be/src/vec/sink/vtablet_sink.h | 4 + be/test/CMakeLists.txt | 1 + be/test/olap/segcompaction_test.cpp | 454 ++++++++++++++ be/test/vec/exec/vtablet_sink_test.cpp | 298 ++++++---- dist/LICENSE-dist.txt | 5 +- docs/en/docs/admin-manual/config/be-config.md | 18 + .../maint-monitor/be-olap-error-code.md | 6 +- docs/zh-CN/docs/admin-manual/config/be-config.md | 18 + .../maint-monitor/be-olap-error-code.md | 8 +- .../apache/doris/analysis/FunctionCallExpr.java | 5 +- .../main/java/org/apache/doris/catalog/Column.java | 5 +- .../main/java/org/apache/doris/catalog/Env.java | 2 +- .../org/apache/doris/catalog/RefreshManager.java | 10 + .../doris/catalog/external/EsExternalDatabase.java | 79 ++- .../doris/catalog/external/EsExternalTable.java | 79 ++- .../doris/catalog/external/ExternalDatabase.java | 63 +- .../doris/catalog/external/ExternalTable.java | 81 ++- .../catalog/external/HMSExternalDatabase.java | 81 ++- .../doris/catalog/external/HMSExternalTable.java | 133 +++-- .../org/apache/doris/datasource/CatalogMgr.java | 50 ++ .../apache/doris/datasource/EsExternalCatalog.java | 49 +- .../apache/doris/datasource/ExternalCatalog.java | 78 ++- ...alogMgrProperty.java => ExternalObjectLog.java} | 28 +- .../doris/datasource/HMSExternalCatalog.java | 72 ++- .../{CatalogLog.java => InitCatalogLog.java} | 65 +- .../apache/doris/datasource/InitDatabaseLog.java | 96 +++ .../{CatalogLog.java => InitTableLog.java} | 40 +- .../doris/external/elasticsearch/EsUtil.java | 2 + .../org/apache/doris/journal/JournalEntity.java | 25 + .../doris/nereids/exceptions/ParseException.java | 2 +- .../glue/translator/ExpressionTranslator.java | 13 +- .../java/org/apache/doris/nereids/jobs/Job.java | 65 +- .../jobs/batch/NereidsRewriteJobExecutor.java | 4 +- .../doris/nereids/jobs/cascades/ApplyRuleJob.java | 8 + .../nereids/jobs/rewrite/RewriteBottomUpJob.java | 19 +- .../nereids/jobs/rewrite/RewriteTopDownJob.java | 23 +- .../org/apache/doris/nereids/rules/RuleSet.java | 6 +- .../org/apache/doris/nereids/rules/RuleType.java | 2 +- .../doris/nereids/rules/analysis/BindFunction.java | 4 + .../rewrite/ExpressionNormalization.java | 4 +- .../expression/rewrite/rules/SimplifyCastRule.java | 43 +- .../expression/rewrite/rules/TypeCoercion.java | 3 +- .../logical/PushdownFilterThroughProject.java | 2 +- .../nereids/rules/rewrite/logical/ReorderJoin.java | 8 +- .../functions/ExplicitlyCastableSignature.java | 2 +- .../expressions/functions/IdenticalSignature.java | 2 +- .../functions/ImplicitlyCastableSignature.java | 2 +- .../functions/NullOrIdenticalSignature.java | 2 +- .../trees/expressions/functions/agg/Avg.java | 13 +- .../trees/expressions/functions/scalar/Year.java | 4 +- .../trees/expressions/literal/CharLiteral.java | 12 - .../expressions/literal/StringLikeLiteral.java | 12 + .../trees/expressions/literal/StringLiteral.java | 12 - .../trees/expressions/literal/VarcharLiteral.java | 26 +- .../apache/doris/nereids/types/DecimalType.java | 3 +- .../nereids/types/coercion/CharacterType.java | 17 + .../doris/nereids/util/TypeCoercionUtils.java | 3 +- .../java/org/apache/doris/persist/EditLog.java | 49 ++ .../org/apache/doris/persist/OperationType.java | 5 + .../org/apache/doris/persist/gson/GsonUtils.java | 26 +- .../main/java/org/apache/doris/qe/Coordinator.java | 5 +- .../org/apache/doris/qe/MasterCatalogExecutor.java | 84 +++ .../java/org/apache/doris/qe/SessionVariable.java | 2 +- .../java/org/apache/doris/qe/StmtExecutor.java | 2 +- .../apache/doris/service/FrontendServiceImpl.java | 76 +++ .../apache/doris/datasource/CatalogMgrTest.java | 42 +- .../nereids/datasets/ssb/SSBJoinReorderTest.java | 16 +- .../nereids/datasets/tpch/AnalyzeTPCHTest.java | 16 +- .../doris/nereids/parser/LimitClauseTest.java | 4 +- .../doris/nereids/parser/NereidsParserTest.java | 2 +- .../rules/analysis/FunctionRegistryTest.java | 14 +- .../expression/rewrite/ExpressionRewriteTest.java | 26 +- .../rewrite/ExpressionRewriteTestHelper.java | 114 ++++ .../rules/expression/rewrite/FoldConstantTest.java | 221 +++---- .../rules/expression/rewrite/TypeCoercionTest.java | 46 +- .../doris/nereids/util/TypeCoercionUtilsTest.java | 6 + gensrc/thrift/FrontendService.thrift | 12 + .../suites/nereids_syntax_p0/function.groovy | 11 + thirdparty/build-thirdparty.sh | 4 +- thirdparty/vars.sh | 6 +- 106 files changed, 3685 insertions(+), 1197 deletions(-) create mode 100644 be/test/olap/segcompaction_test.cpp copy fe/fe-core/src/main/java/org/apache/doris/datasource/{CatalogMgrProperty.java => ExternalObjectLog.java} (72%) copy fe/fe-core/src/main/java/org/apache/doris/datasource/{CatalogLog.java => InitCatalogLog.java} (51%) create mode 100644 fe/fe-core/src/main/java/org/apache/doris/datasource/InitDatabaseLog.java copy fe/fe-core/src/main/java/org/apache/doris/datasource/{CatalogLog.java => InitTableLog.java} (66%) create mode 100644 fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java create mode 100644 fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rewrite/ExpressionRewriteTestHelper.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org