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

[ERROR] remove unnecessary error log with too much lock retry

Browse Source
This commit is contained in:
Handora
2024-02-06 03:12:11 +00:00
committed by ob-robot
parent 5d0e7d443f
commit 1d4f2f6f34
16 changed files with 180 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/expr/ob_expr_eval_functions.cpp
View File

@ -1122,6 +1122,11 @@ static ObExpr::EvalFunc g_expr_eval_functions[] = {
ObExprMod::mod_decimalint, /* 678 */
NULL, // ObExprPrivSTGeoHash::eval_priv_st_geohash, /* 679 */
NULL, // ObExprPrivSTMakePoint::eval_priv_st_makepoint, /* 680 */
NULL, // ObExprGetLock::get_lock, /* 681 */
NULL, // ObExprIsFreeLock::is_free_lock, /* 682 */
NULL, // ObExprIsUsedLock::is_used_lock, /* 683 */
NULL, // ObExprReleaseLock::release_lock, /* 684 */
NULL, // ObExprReleaseAllLocks::release_all_locks, /* 685 */
};
static ObExpr::EvalBatchFunc g_expr_eval_batch_functions[] = {

19
src/sql/engine/px/ob_px_bloom_filter.cpp
View File

@ -34,6 +34,7 @@ using namespace obrpc;
#define FIXED_HASH_COUNT 4
#define LOG_HASH_COUNT 2 // = log2(FIXED_HASH_COUNT)
#define WORD_SIZE 64 // WORD_SIZE * FIXED_HASH_COUNT = BF_BLOCK_SIZE
#define HASH_SHIFT_MASK 63
// before assign, please set allocator for channel_ids_ first
int BloomFilterIndex::assign(const BloomFilterIndex &other)
@ -203,11 +204,11 @@ int ObPxBloomFilter::put(uint64_t hash)
LOG_WARN("the px bloom filter is not inited", K(ret));
} else {
uint32_t hash_high = (uint32_t)(hash >> 32);
uint64_t block_begin = (hash & ((bits_count_ >> (LOG_HASH_COUNT + 6)) - 1)) << LOG_HASH_COUNT;
(void)set(block_begin, 1L << hash_high);
(void)set(block_begin + 1, 1L << (hash_high >> 8));
(void)set(block_begin + 2, 1L << (hash_high >> 16));
(void)set(block_begin + 3, 1L << (hash_high >> 24));
uint64_t block_begin = (hash & ((bits_count_ >> (LOG_HASH_COUNT + 6)) - 1)) << LOG_HASH_COUNT;
(void)set(block_begin, 1L << (hash_high & HASH_SHIFT_MASK));
(void)set(block_begin + 1, 1L << ((hash_high >> 8) & HASH_SHIFT_MASK));
(void)set(block_begin + 2, 1L << ((hash_high >> 16) & HASH_SHIFT_MASK));
(void)set(block_begin + 3, 1L << ((hash_high >> 24) & HASH_SHIFT_MASK));
}
return ret;
}
@ -228,13 +229,13 @@ int ObPxBloomFilter::might_contain_nonsimd(uint64_t hash, bool &is_match)
is_match = true;
uint32_t hash_high = (uint32_t)(hash >> 32);
uint64_t block_begin = (hash & ((bits_count_ >> (LOG_HASH_COUNT + 6)) - 1)) << LOG_HASH_COUNT;
if (!get(block_begin, 1L << hash_high)) {
if (!get(block_begin, 1L << (hash_high & HASH_SHIFT_MASK))) {
is_match = false;
} else if (!get(block_begin + 1, 1L << (hash_high >> 8))) {
} else if (!get(block_begin + 1, 1L << ((hash_high >> 8) & HASH_SHIFT_MASK))) {
is_match = false;
} else if (!get(block_begin + 2, 1L << (hash_high >> 16))) {
} else if (!get(block_begin + 2, 1L << ((hash_high >> 16) & HASH_SHIFT_MASK))) {
is_match = false;
} else if (!get(block_begin + 3, 1L << (hash_high >> 24))) {
} else if (!get(block_begin + 3, 1L << ((hash_high >> 24) & HASH_SHIFT_MASK))) {
is_match = false;
}
return ret;

2
src/sql/monitor/ob_exec_stat.h
View File

@ -412,6 +412,8 @@ struct ObAuditRecordData {
bool is_perf_event_closed_;
char flt_trace_id_[OB_MAX_UUID_STR_LENGTH + 1];
char snapshot_source_[OB_MAX_SNAPSHOT_SOURCE_LENGTH + 1];
uint64_t total_memstore_read_row_count_;
uint64_t total_ssstore_read_row_count_;
};
} //namespace sql