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

skip hidden schema in rs major check & fix default time guard warning threshold

Browse Source
This commit is contained in:
yangqise7en
2023-12-06 12:42:31 +00:00
committed by ob-robot
parent 8641152e4e
commit 1516b54e92
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/share/compaction/ob_compaction_time_guard.h
View File

@ -18,7 +18,8 @@ namespace compaction
class ObCompactionTimeGuard : public common::occam::ObOccamTimeGuard class ObCompactionTimeGuard : public common::occam::ObOccamTimeGuard
{ {
public: public:
ObCompactionTimeGuard(const uint64_t warn_threshold = 0, const char *mod = "") const static uint64_t WARN_THRESHOLD = 30L * 1000 * 1000; // 30s
ObCompactionTimeGuard(const uint64_t warn_threshold = WARN_THRESHOLD, const char *mod = "")
: ObOccamTimeGuard(warn_threshold, nullptr, nullptr, mod), : ObOccamTimeGuard(warn_threshold, nullptr, nullptr, mod),
add_time_(0) add_time_(0)
{} {}

4
src/share/schema/ob_table_schema.h
View File

@ -1921,10 +1921,10 @@ inline bool ObSimpleTableSchemaV2::should_check_major_merge_progress() const
{ {
// only include primary table except aux lob tables // only include primary table except aux lob tables
// aux lob tables only need to perform replicas verification, but don't need to be verified with primary table // aux lob tables only need to perform replicas verification, but don't need to be verified with primary table
return is_sys_table() return is_normal_schema() && (is_sys_table()
|| is_user_table() || is_user_table()
|| is_tmp_table() || is_tmp_table()
|| is_aux_lob_table(); || is_aux_lob_table());
} }
inline int64_t ObTableSchema::get_id_hash_array_mem_size(const int64_t column_cnt) const inline int64_t ObTableSchema::get_id_hash_array_mem_size(const int64_t column_cnt) const