diff --git a/src/share/compaction/ob_compaction_time_guard.h b/src/share/compaction/ob_compaction_time_guard.h index b6c832709..dd17ddbae 100644 --- a/src/share/compaction/ob_compaction_time_guard.h +++ b/src/share/compaction/ob_compaction_time_guard.h @@ -18,7 +18,8 @@ namespace compaction class ObCompactionTimeGuard : public common::occam::ObOccamTimeGuard { 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), add_time_(0) {} diff --git a/src/share/schema/ob_table_schema.h b/src/share/schema/ob_table_schema.h index d9e3fb651..f7e77d947 100644 --- a/src/share/schema/ob_table_schema.h +++ b/src/share/schema/ob_table_schema.h @@ -1921,10 +1921,10 @@ inline bool ObSimpleTableSchemaV2::should_check_major_merge_progress() const { // 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 - return is_sys_table() + return is_normal_schema() && (is_sys_table() || is_user_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