This is an automated email from the ASF dual-hosted git repository.
zhangchen pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
from ce14183c3a [fix](compile) fix GHA mac ut compile failure (#24738)
add 58ab25ccaa Revert "[Feature](merge-on-write)Support ignore mode for
merge-on-write unique table (#21773)" (#24731)
No new revisions were added by this update.
Summary of changes:
be/src/exec/tablet_info.cpp | 8 +-
be/src/exec/tablet_info.h | 2 -
be/src/http/action/stream_load.cpp | 7 --
be/src/http/http_common.h | 1 -
be/src/olap/rowset/beta_rowset_writer.cpp | 2 +-
be/src/olap/rowset_builder.cpp | 1 -
be/src/olap/tablet.cpp | 74 +++++-------
be/src/olap/tablet_schema.cpp | 2 -
be/src/olap/tablet_schema.h | 9 +-
.../Load/STREAM-LOAD.md | 2 -
.../Manipulation/INSERT.md | 4 +-
.../Load/STREAM-LOAD.md | 2 -
.../Manipulation/INSERT.md | 5 +-
fe/fe-core/src/main/cup/sql_parser.cup | 21 +---
.../java/org/apache/doris/analysis/DeleteStmt.java | 3 +-
.../apache/doris/analysis/NativeInsertStmt.java | 26 +---
.../java/org/apache/doris/analysis/UpdateStmt.java | 3 +-
.../doris/load/loadv2/LoadingTaskPlanner.java | 2 +-
.../plans/commands/InsertIntoTableCommand.java | 3 +-
.../org/apache/doris/planner/OlapTableSink.java | 18 +--
.../apache/doris/planner/StreamLoadPlanner.java | 8 +-
.../java/org/apache/doris/task/LoadTaskInfo.java | 4 -
.../java/org/apache/doris/task/StreamLoadTask.java | 8 --
.../apache/doris/planner/OlapTableSinkTest.java | 8 +-
gensrc/proto/descriptors.proto | 1 -
gensrc/proto/olap_file.proto | 1 -
gensrc/thrift/Descriptors.thrift | 1 -
gensrc/thrift/FrontendService.thrift | 1 -
regression-test/data/insert_p0/insert_ignore.out | 36 ------
.../data/unique_with_mow_p0/ignore_mode.csv | 10 --
.../data/unique_with_mow_p0/ignore_mode2.csv | 2 -
.../data/unique_with_mow_p0/test_ignore_mode.out | 20 ----
.../suites/insert_p0/insert_ignore.groovy | 132 ---------------------
.../unique_with_mow_p0/test_ignore_mode.groovy | 112 -----------------
34 files changed, 62 insertions(+), 477 deletions(-)
delete mode 100644 regression-test/data/insert_p0/insert_ignore.out
delete mode 100644 regression-test/data/unique_with_mow_p0/ignore_mode.csv
delete mode 100644 regression-test/data/unique_with_mow_p0/ignore_mode2.csv
delete mode 100644 regression-test/data/unique_with_mow_p0/test_ignore_mode.out
delete mode 100644 regression-test/suites/insert_p0/insert_ignore.groovy
delete mode 100644
regression-test/suites/unique_with_mow_p0/test_ignore_mode.groovy
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
