Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature-wip](merge-on-write) MOW table support different primary keys and sort keys #24788

Merged
merged 38 commits into from
Nov 24, 2023
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
d74004e
[feature-wip](merge-on-write) MOW table split primary key and sort key
mymeiyi Sep 22, 2023
9326c7f
fix code format
mymeiyi Sep 22, 2023
4379e27
fix regression
mymeiyi Sep 22, 2023
dc80873
add some regression
mymeiyi Sep 25, 2023
8ede803
fix write
mymeiyi Sep 26, 2023
3f96b2c
fix write
mymeiyi Sep 28, 2023
8691d42
Check status when get rowid
mymeiyi Oct 7, 2023
288cd3b
fix read
mymeiyi Oct 7, 2023
aacb645
improve
mymeiyi Oct 7, 2023
87bfda9
fix be format
mymeiyi Oct 7, 2023
6d9db37
improve get pk row range
mymeiyi Oct 8, 2023
373eedb
Add p2 regression
mymeiyi Oct 8, 2023
6251ba5
Support point query
mymeiyi Oct 8, 2023
384bf64
Fix read bug
mymeiyi Oct 8, 2023
6edd267
Modify point query regression
mymeiyi Oct 12, 2023
08b65dc
Fix rebase compile error
mymeiyi Oct 25, 2023
e13bd2a
Fix point query out
mymeiyi Oct 25, 2023
d5c82d3
Support schema change
mymeiyi Oct 26, 2023
ebac9bb
fix read
mymeiyi Oct 30, 2023
35746c0
fix be ut
mymeiyi Oct 30, 2023
cc8d2da
support row compaction
mymeiyi Oct 31, 2023
ad57b40
add compaction regression case
mymeiyi Oct 31, 2023
5ecf38a
support vertical compaction
mymeiyi Oct 31, 2023
cc3b92d
Fix vertical compaction
mymeiyi Nov 2, 2023
052c927
rebase master
mymeiyi Nov 13, 2023
a68ecd0
fix comments
mymeiyi Nov 13, 2023
de54393
disable test_delete_sign_delete_bitmap
mymeiyi Nov 13, 2023
ebf35e0
fix
mymeiyi Nov 14, 2023
bb75b95
fix compile
mymeiyi Nov 16, 2023
f29ce66
skip vertical segment writer
mymeiyi Nov 16, 2023
a3618f4
some fix
mymeiyi Nov 18, 2023
db1b557
modify by comments
mymeiyi Nov 21, 2023
1d1f6c5
fix DeleteBitmapCalculatorTest
mymeiyi Nov 21, 2023
0233921
Fix segment compaction
mymeiyi Nov 22, 2023
80bbd69
Fix test_point_query_cluster_key
mymeiyi Nov 22, 2023
fbb6aa8
Fix test_point_query_cluster_key
mymeiyi Nov 22, 2023
520a15c
Fix test_point_query_cluster_key
mymeiyi Nov 22, 2023
378c20a
Fix test_point_query_cluster_key
mymeiyi Nov 23, 2023
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
Prev Previous commit
Next Next commit
Fix rebase compile error
  • Loading branch information
mymeiyi committed Nov 24, 2023
commit 08b65dc4dbb59023c4655a42fd9407d135ab69bd
14 changes: 9 additions & 5 deletions be/src/olap/tablet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2767,7 +2767,7 @@ Status Tablet::lookup_row_key(const Slice& encoded_key, bool with_seq_col,
1;
}
size_t rowid_length = 0;
if (with_rowid && !_schema->cluster_key_idxes().empty()) {
if (with_rowid && !_tablet_meta->tablet_schema()->cluster_key_idxes().empty()) {
rowid_length = sizeof(uint32_t) + 1;
}
Slice key_without_seq =
Expand All @@ -2783,7 +2783,7 @@ Status Tablet::lookup_row_key(const Slice& encoded_key, bool with_seq_col,
for (int i = num_segments - 1; i >= 0; i--) {
// If mow table has cluster keys, the key bounds is short keys, not primary keys
// use PrimaryKeyIndexMetaPB in primary key index?
if (_schema->cluster_key_idxes().empty()) {
if (_tablet_meta->tablet_schema()->cluster_key_idxes().empty()) {
if (key_without_seq.compare(segments_key_bounds[i].max_key()) > 0 ||
key_without_seq.compare(segments_key_bounds[i].min_key()) < 0) {
continue;
Expand Down Expand Up @@ -2950,10 +2950,14 @@ Status Tablet::calc_segment_delete_bitmap(RowsetSharedPtr rowset,
Slice key = Slice(index_column->get_data_at(i).data, index_column->get_data_at(i).size);
RowLocation loc;
// calculate row id
if (!_schema->cluster_key_idxes().empty()) {
if (!_tablet_meta->tablet_schema()->cluster_key_idxes().empty()) {
size_t seq_col_length = 0;
if (_schema->has_sequence_col()) {
seq_col_length = _schema->column(_schema->sequence_col_idx()).length() + 1;
if (_tablet_meta->tablet_schema()->has_sequence_col()) {
seq_col_length =
_tablet_meta->tablet_schema()
->column(_tablet_meta->tablet_schema()->sequence_col_idx())
.length() +
1;
}
size_t rowid_length = sizeof(uint32_t) + 1;
Slice key_without_seq =
Expand Down