This is an automated email from the ASF dual-hosted git repository.

dataroaring pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


    from 7e964f4d699 [Fix]fix compile warning (#53445)
     add 6391b1ca1ed [Fix](flexible partial update) Fix some problems in 
flexible partial update (#41701)

No new revisions were added by this update.

Summary of changes:
 be/src/olap/base_tablet.cpp                        | 101 ++--
 be/src/olap/memtable.cpp                           | 209 ++++---
 be/src/olap/memtable.h                             |  20 +-
 be/src/olap/partial_update_info.cpp                | 616 +++++++++++++++++++--
 be/src/olap/partial_update_info.h                  |  84 ++-
 be/src/olap/rowset/segment_v2/segment_writer.cpp   |  11 +-
 .../rowset/segment_v2/vertical_segment_writer.cpp  | 236 ++------
 .../rowset/segment_v2/vertical_segment_writer.h    |  14 +-
 be/src/olap/tablet_meta.cpp                        |   3 +
 be/src/olap/tablet_schema.cpp                      |   5 +
 be/src/olap/tablet_schema.h                        |   6 +
 be/src/vec/exec/format/json/new_json_reader.cpp    |  15 +-
 be/src/vec/exec/format/json/new_json_reader.h      |   4 +-
 .../main/java/org/apache/doris/catalog/Column.java |   1 +
 gensrc/proto/olap_file.proto                       |   2 +
 gensrc/thrift/Descriptors.thrift                   |   1 +
 .../data/fault_injection_p0/flexible/test3.json    |   5 -
 .../data/fault_injection_p0/flexible/test4.json    |   5 -
 ...leixble_partial_update_publish_conflict_seq.out | Bin 791 -> 0 bytes
 .../data/unique_with_mow_p0/flexible/debug.json    |   1 +
 .../data/unique_with_mow_p0/flexible/debug2.json   |   1 +
 .../data/unique_with_mow_p0/flexible/debug3.json   |   1 +
 .../data/unique_with_mow_p0/flexible/debug4.json   |   1 +
 .../data/unique_with_mow_p0/flexible/default1.json |   8 +
 .../data/unique_with_mow_p0/flexible/default2.json |   4 +
 .../data/unique_with_mow_p0/flexible/default3.json |   5 +
 .../data/unique_with_mow_p0/flexible/delete10.json |  39 ++
 .../data/unique_with_mow_p0/flexible/delete11.json |  12 +
 .../data/unique_with_mow_p0/flexible/delete3.json  |  27 +
 .../data/unique_with_mow_p0/flexible/delete4.json  |  27 +
 .../data/unique_with_mow_p0/flexible/delete5.json  |  62 +++
 .../data/unique_with_mow_p0/flexible/delete6.json  |  42 ++
 .../data/unique_with_mow_p0/flexible/delete7.json  |  39 ++
 .../data/unique_with_mow_p0/flexible/delete8.json  |  62 +++
 .../data/unique_with_mow_p0/flexible/delete9.json  |  42 ++
 .../flexible/publish}/test1.json                   |   0
 .../flexible/publish}/test2.json                   |   0
 .../unique_with_mow_p0/flexible/publish/test3.json |  11 +
 .../unique_with_mow_p0/flexible/publish/test4.json |  12 +
 .../unique_with_mow_p0/flexible/publish/test5.json |   2 +
 .../unique_with_mow_p0/flexible/publish/test6.json |   2 +
 .../publish/test_auto_inc_replica_consistency.out  | Bin 0 -> 195 bytes
 .../publish/test_f_auto_inc_compaction.out         | Bin 0 -> 404 bytes
 .../publish/test_f_seq_publish_read_from_old.out   | Bin 0 -> 783 bytes
 ...leixble_partial_update_publish_conflict_seq.out | Bin 0 -> 2379 bytes
 ...st_flexible_partial_update_publish_conflict.out | Bin 418 -> 504 bytes
 .../data/unique_with_mow_p0/flexible/test4.json    |   2 +-
 .../data/unique_with_mow_p0/flexible/test5.json    |   2 +-
 .../data/unique_with_mow_p0/flexible/test6.json    |  25 +-
 .../data/unique_with_mow_p0/flexible/test7.json    |   2 +-
 .../flexible/test_f_seq_read_from_old.out          | Bin 0 -> 1058 bytes
 .../test_flexible_partial_update_auto_inc.out      | Bin 1683 -> 1715 bytes
 .../test_flexible_partial_update_default_value.out | Bin 0 -> 1543 bytes
 .../test_flexible_partial_update_delete_sign.out   | Bin 3362 -> 10964 bytes
 .../test_flexible_partial_update_seq_col.out       | Bin 7320 -> 4070 bytes
 .../test_p_seq_publish_read_from_old.out           | Bin 0 -> 683 bytes
 .../test_partial_update_seq_read_from_old.out      | Bin 0 -> 907 bytes
 ...xble_partial_update_publish_conflict_seq.groovy | 143 -----
 ...flexible_partial_update_publish_conflict.groovy | 117 ----
 .../test_auto_inc_replica_consistency.groovy       | 132 +++++
 .../publish/test_f_auto_inc_compaction.groovy      | 205 +++++++
 .../test_f_seq_publish_read_from_old.groovy        | 143 +++++
 ...xble_partial_update_publish_conflict_seq.groovy | 236 ++++++++
 ...flexible_partial_update_publish_conflict.groovy | 203 +++++++
 .../flexible/test_f_seq_read_from_old.groovy       |  88 +++
 .../test_flexible_partial_update_auto_inc.groovy   |  25 +
 ...t_flexible_partial_update_default_value.groovy} |  88 +--
 ...test_flexible_partial_update_delete_sign.groovy | 280 +++++++++-
 .../test_flexible_partial_update_seq_col.groovy    |  13 +-
 .../test_p_seq_publish_read_from_old.groovy        | 167 ++++++
 .../test_partial_update_seq_read_from_old.groovy   |  67 +++
 71 files changed, 2942 insertions(+), 734 deletions(-)
 delete mode 100644 regression-test/data/fault_injection_p0/flexible/test3.json
 delete mode 100644 regression-test/data/fault_injection_p0/flexible/test4.json
 delete mode 100644 
regression-test/data/fault_injection_p0/flexible/test_fleixble_partial_update_publish_conflict_seq.out
 create mode 100644 regression-test/data/unique_with_mow_p0/flexible/debug.json
 create mode 100644 regression-test/data/unique_with_mow_p0/flexible/debug2.json
 create mode 100644 regression-test/data/unique_with_mow_p0/flexible/debug3.json
 create mode 100644 regression-test/data/unique_with_mow_p0/flexible/debug4.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/default1.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/default2.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/default3.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/delete10.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/delete11.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/delete3.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/delete4.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/delete5.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/delete6.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/delete7.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/delete8.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/delete9.json
 rename regression-test/data/{fault_injection_p0/flexible => 
unique_with_mow_p0/flexible/publish}/test1.json (100%)
 rename regression-test/data/{fault_injection_p0/flexible => 
unique_with_mow_p0/flexible/publish}/test2.json (100%)
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/publish/test3.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/publish/test4.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/publish/test5.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/publish/test6.json
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/publish/test_auto_inc_replica_consistency.out
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/publish/test_f_auto_inc_compaction.out
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/publish/test_f_seq_publish_read_from_old.out
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/publish/test_fleixble_partial_update_publish_conflict_seq.out
 rename regression-test/data/{fault_injection_p0/flexible => 
unique_with_mow_p0/flexible/publish}/test_flexible_partial_update_publish_conflict.out
 (82%)
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/test_f_seq_read_from_old.out
 create mode 100644 
regression-test/data/unique_with_mow_p0/flexible/test_flexible_partial_update_default_value.out
 create mode 100644 
regression-test/data/unique_with_mow_p0/partial_update/test_p_seq_publish_read_from_old.out
 create mode 100644 
regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_seq_read_from_old.out
 delete mode 100644 
regression-test/suites/fault_injection_p0/flexible/test_fleixble_partial_update_publish_conflict_seq.groovy
 delete mode 100644 
regression-test/suites/fault_injection_p0/flexible/test_flexible_partial_update_publish_conflict.groovy
 create mode 100644 
regression-test/suites/unique_with_mow_p0/flexible/publish/test_auto_inc_replica_consistency.groovy
 create mode 100644 
regression-test/suites/unique_with_mow_p0/flexible/publish/test_f_auto_inc_compaction.groovy
 create mode 100644 
regression-test/suites/unique_with_mow_p0/flexible/publish/test_f_seq_publish_read_from_old.groovy
 create mode 100644 
regression-test/suites/unique_with_mow_p0/flexible/publish/test_fleixble_partial_update_publish_conflict_seq.groovy
 create mode 100644 
regression-test/suites/unique_with_mow_p0/flexible/publish/test_flexible_partial_update_publish_conflict.groovy
 create mode 100644 
regression-test/suites/unique_with_mow_p0/flexible/test_f_seq_read_from_old.groovy
 copy 
regression-test/suites/unique_with_mow_p0/flexible/{test_flexible_partial_update_delete_sign.groovy
 => test_flexible_partial_update_default_value.groovy} (51%)
 create mode 100644 
regression-test/suites/unique_with_mow_p0/partial_update/test_p_seq_publish_read_from_old.groovy
 create mode 100644 
regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_read_from_old.groovy


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to