This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
from 4f00ca1cbad [feature](analyzer) support * as json_object's parameter
(#57256)
add c21b125e2ce [feat](load) support merge into (#57044)
No new revisions were added by this update.
Summary of changes:
.../antlr4/org/apache/doris/nereids/DorisLexer.g4 | 1 +
.../antlr4/org/apache/doris/nereids/DorisParser.g4 | 15 +
.../java/org/apache/doris/analysis/StmtType.java | 1 +
.../main/java/org/apache/doris/catalog/Column.java | 4 +
.../java/org/apache/doris/catalog/OlapTable.java | 4 +
.../doris/nereids/parser/LogicalPlanBuilder.java | 51 +-
.../doris/nereids/rules/analysis/BindSink.java | 4 +-
.../apache/doris/nereids/trees/plans/PlanType.java | 1 +
.../trees/plans/commands/UpdateCommand.java | 22 +-
.../plans/commands/merge/MergeIntoCommand.java | 534 ++++++++++++
.../plans/commands/merge/MergeMatchedClause.java | 55 ++
.../commands/merge/MergeNotMatchedClause.java | 55 ++
.../trees/plans/visitor/CommandVisitor.java | 5 +
.../doris/nereids/parser/NereidsParserTest.java | 109 ++-
.../plans/commands/merge/MergeIntoCommandTest.java | 956 +++++++++++++++++++++
.../data/load_p0/merge_into/test_merge_into.out | 17 +
.../load_p0/merge_into/test_merge_into.groovy | 254 ++++++
17 files changed, 2073 insertions(+), 15 deletions(-)
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/merge/MergeIntoCommand.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/merge/MergeMatchedClause.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/merge/MergeNotMatchedClause.java
create mode 100644
fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/merge/MergeIntoCommandTest.java
create mode 100644 regression-test/data/load_p0/merge_into/test_merge_into.out
create mode 100644
regression-test/suites/load_p0/merge_into/test_merge_into.groovy
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
