hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Limit max column id in column cluster for sparse row of flat format.

Browse Source
This commit is contained in:
obdev 2022-11-18 04:05:35 +00:00 committed by wangzelin.wzl
parent c8bf4203dc
commit 573889e74a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/storage/blocksstable/ob_block_sstable_struct.h
View File

@ -717,7 +717,7 @@ public:
static int get_serialized_size() { return sizeof(ObColClusterInfoMask); }
static bool is_valid_col_idx_type(const BYTES_LEN col_idx_type)
{
return col_idx_type >= BYTES_ZERO && col_idx_type <= BYTES_UINT16;
return col_idx_type >= BYTES_ZERO && col_idx_type <= BYTES_UINT8;
}
static bool is_valid_offset_type(const BYTES_LEN column_offset_type)
{
@ -885,6 +885,7 @@ public:
static const int64_t CLUSTER_COLUMN_BYTES = 5;
static const int64_t CLUSTER_COLUMN_CNT = 0x1 << CLUSTER_COLUMN_BYTES; // 32
static const int64_t MAX_CLUSTER_COLUMN_CNT = 256;
static const int64_t CLUSTER_COLUMN_CNT_MASK = CLUSTER_COLUMN_CNT - 1;
static const int64_t USE_CLUSTER_COLUMN_COUNT = CLUSTER_COLUMN_CNT * 1.5; // 48
static bool need_rowkey_independent_cluster(const int64_t rowkey_count)

3
src/storage/blocksstable/ob_row_writer.cpp
View File

@ -578,7 +578,8 @@ void ObRowWriter::loop_cells(
total_nop_count += tmp_nop_count;
} // end of while
if ((cell_cnt - total_nop_count) <= ObColClusterInfoMask::MAX_SPARSE_COL_CNT) {
if ((cell_cnt - total_nop_count) <= ObColClusterInfoMask::MAX_SPARSE_COL_CNT
&& cell_cnt < ObRowHeader::MAX_CLUSTER_COLUMN_CNT) {
// only few non-nop columns in whole row
cluster_cnt = 1;
output_sparse_row[0] = true;