Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions be/src/olap/base_tablet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,8 @@ Status BaseTablet::calc_segment_delete_bitmap(RowsetSharedPtr rowset,
row_id);
++conflict_rows;
continue;
// NOTE: for partial update which doesn't specify the sequence column, we can't use the sequence column value filled in flush phase
// as its final value. Otherwise it may cause inconsistency between replicas.
}
if (is_partial_update && rowset_writer != nullptr) {
// In publish version, record rows to be deleted for concurrent update
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !seq_map_0 --
1 1 1 1 1
2 2 2 2 2
3 3 3 3 3

-- !seq_map_1 --
1 20 99 88 1
2 10 99 88 2
3 10 99 3 3

-- !inspect --
1 1 1 1 1 0 1 2
1 10 99 1 1 0 10 3
1 20 1 88 1 0 20 4
1 20 99 88 1 0 20 4
2 2 2 2 2 0 2 2
2 10 99 2 2 0 10 3
2 10 2 88 2 0 10 4
2 10 99 88 2 0 10 4
3 3 3 3 3 0 3 2
3 10 99 3 3 0 10 3
3 5 3 88 3 0 5 4

-- !seq_map_2 --
1 20 99 88 33
2 10 77 88 33
3 50 77 3 33

-- !inspect --
1 1 1 1 1 0 1 2
1 10 99 1 1 0 10 3
1 20 1 88 1 0 20 4
1 20 99 88 1 0 20 4
1 9 77 88 1 0 9 5
1 20 99 88 33 0 20 6
2 2 2 2 2 0 2 2
2 10 99 2 2 0 10 3
2 10 2 88 2 0 10 4
2 10 99 88 2 0 10 4
2 10 77 88 2 0 10 5
2 10 99 88 33 0 10 6
2 10 77 88 33 0 10 6
3 3 3 3 3 0 3 2
3 10 99 3 3 0 10 3
3 5 3 88 3 0 5 4
3 50 77 3 3 0 50 5
3 10 99 3 33 0 10 6
3 50 77 3 33 0 50 6

-- !seq_map_3 --
3 120 66 3 33

-- !inspect --
1 1 1 1 1 0 1 2
1 10 99 1 1 0 10 3
1 20 99 88 1 0 20 4
1 20 1 88 1 0 20 4
1 9 77 88 1 0 9 5
1 20 99 88 33 0 20 6
1 80 66 88 33 0 80 7
1 100 66 88 33 1 100 8
1 100 99 88 33 1 100 8
2 2 2 2 2 0 2 2
2 10 99 2 2 0 10 3
2 10 99 88 2 0 10 4
2 10 2 88 2 0 10 4
2 10 77 88 2 0 10 5
2 10 99 88 33 0 10 6
2 10 77 88 33 0 10 6
2 100 66 88 33 0 100 7
2 100 66 88 33 1 100 8
2 100 77 88 33 1 100 8
3 3 3 3 3 0 3 2
3 10 99 3 3 0 10 3
3 5 3 88 3 0 5 4
3 50 77 3 3 0 50 5
3 10 99 3 33 0 10 6
3 50 77 3 33 0 50 6
3 120 66 3 33 0 120 7
3 100 77 3 33 1 100 8

-- !seq_map_4 --

-- !inspect --
1 10 1 1 1 0 10 2
1 20 55 1 1 0 20 3
1 10 1 1 100 1 10 4
1 20 55 1 100 1 20 4
2 10 2 2 2 0 10 2
2 100 55 2 2 0 100 3
2 10 2 2 100 1 10 4
2 100 55 2 100 1 100 4
3 10 3 3 3 0 10 2
3 120 55 3 3 0 120 3
3 10 3 3 100 1 10 4
3 120 55 3 100 1 120 4

Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,32 @@
2 doris2 400 223 1
3 yixiu 600 4321 4321

-- !sql --
1 1 3.141592653589793 2.718281828459045 0
2 2 3.141592653589793 2.718281828459045 0
3 3 3.141592653589793 2.718281828459045 0

-- !sql --
1 10 3.141592653589793 2.718281828459045 0
2 20 3.141592653589793 2.718281828459045 0
3 3 3.141592653589793 2.718281828459045 0
4 40 3.141592653589793 2.718281828459045 0
5 50 3.141592653589793 2.718281828459045 0

-- !select_default --
1 doris 200 123 1
2 doris2 400 223 1
3 yixiu 600 4321 4321

-- !sql --
1 1 3.141592653589793 2.718281828459045 0
2 2 3.141592653589793 2.718281828459045 0
3 3 3.141592653589793 2.718281828459045 0

-- !sql --
1 10 3.141592653589793 2.718281828459045 0
2 20 3.141592653589793 2.718281828459045 0
3 3 3.141592653589793 2.718281828459045 0
4 40 3.141592653589793 2.718281828459045 0
5 50 3.141592653589793 2.718281828459045 0

Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !1 --
1 400 1 1 1
2 400 2 2 2
3 400 3 3 3
4 400 4 4 4

-- !1 --
1 400 99 1 1 400
2 400 99 2 2 400
3 400 99 3 3 400
4 400 99 4 4 400
5 \N 99 \N \N \N
6 \N 99 \N \N \N

-- !2 --
1 400 1 1 1
2 400 2 2 2
3 400 3 3 3
4 400 4 4 4

-- !2 --
1 500 1 88 1 500
2 500 2 88 2 500
3 400 3 3 3 400
4 400 4 4 4 400
5 200 \N 88 \N 200
6 200 \N 88 \N 200

-- !1 --
1 400 1 1 1
2 400 2 2 2
3 400 3 3 3
4 400 4 4 4

-- !1 --
1 400 99 1 1 400
2 400 99 2 2 400
3 400 99 3 3 400
4 400 99 4 4 400
5 \N 99 \N \N \N
6 \N 99 \N \N \N

-- !2 --
1 400 1 1 1
2 400 2 2 2
3 400 3 3 3
4 400 4 4 4

-- !2 --
1 500 1 88 1 500
2 500 2 88 2 500
3 400 3 3 3 400
4 400 4 4 4 400
5 200 \N 88 \N 200
6 200 \N 88 \N 200

Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !1 --
1 1 1 1
2 2 2 2
3 3 3 3
4 4 4 4
5 5 5 5
6 6 6 6

-- !2 --
1 10 10 1 22
2 20 20 2 22
3 3 3 3 22
4 4 4 4 22
5 50 50 5 22
6 6 6 6 22
7 70 70 7 22
8 8 8 8 22
9 9 9 9 22
100 100 100 \N 22

-- !2 --
1 10 10 99 22
2 20 20 2 22
3 3 3 99 22
4 4 4 4 22
5 50 50 5 22
6 6 6 99 22
7 70 70 7 22
8 8 8 99 22
9 9 9 9 22
100 100 100 \N 22
200 \N \N 200 18

-- !3 --
1 1 1 1
2 2 2 2
3 3 3 3
4 4 4 4
5 5 5 5
6 6 6 6

-- !4 --
1 1 1 1 55
2 2 777 2 55
3 3 777 3 55
4 4 4 4 55
5 5 5 5 55
6 6 6 6 55
7 7 7 7 55
8 8 777 8 55
9 9 9 9 55
10 \N 777 \N 47
21 \N 777 \N 47

-- !4 --
1 1 1 987 22
2 2 777 987 22
3 3 777 3 22
4 4 4 4 22
5 5 5 5 22
6 6 6 6 22
7 7 7 7 22
8 8 777 8 22
9 9 9 9 22
10 \N 777 \N 22
11 11 11 987 22
20 20 20 20 22
21 \N 777 \N 22
22 \N \N 987 18

Loading
Loading