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

[mds] Delete mds type and rename mds table merge to mds mini merge

Browse Source
This commit is contained in:
Hooper9973
2024-03-14 12:14:49 +00:00
committed by ob-robot
parent e6ac671233
commit f2928e3715
14 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/compaction/ob_compaction_suggestion.cpp
View File

@ -207,7 +207,7 @@ int64_t ObCompactionDagStatus::to_string(char *buf, const int64_t buf_len) const
J_OBJ_START();
// mini
J_TMP_STRING(ObDagType::DAG_TYPE_MINI_MERGE);
J_TMP_STRING(ObDagType::DAG_TYPE_MDS_TABLE_MERGE);
J_TMP_STRING(ObDagType::DAG_TYPE_MDS_MINI_MERGE);
J_TMP_STRING(ObDagType::DAG_TYPE_TX_TABLE_MERGE);
// minor
J_TMP_STRING(ObDagType::DAG_TYPE_MERGE_EXECUTE);
@ -394,7 +394,7 @@ int ObCompactionSuggestionMgr::analyze_for_suggestion(
"suggest", ObCompactionSuggestionMgr::get_add_thread_suggestion(priority));
if (share::ObDagPrio::DAG_PRIO_COMPACTION_HIGH == priority) {
ADD_COMPACTION_DAG_INFO_PARAM(ObDagType::ObDagTypeEnum::DAG_TYPE_MINI_MERGE);
ADD_COMPACTION_DAG_INFO_PARAM(ObDagType::ObDagTypeEnum::DAG_TYPE_MDS_TABLE_MERGE);
ADD_COMPACTION_DAG_INFO_PARAM(ObDagType::ObDagTypeEnum::DAG_TYPE_MDS_MINI_MERGE);
ADD_COMPACTION_DAG_INFO_PARAM(ObDagType::ObDagTypeEnum::DAG_TYPE_TX_TABLE_MERGE);
} else if (share::ObDagPrio::DAG_PRIO_COMPACTION_MID == priority) {
ADD_COMPACTION_DAG_INFO_PARAM(ObDagType::ObDagTypeEnum::DAG_TYPE_MERGE_EXECUTE);

2
src/storage/compaction/ob_compaction_suggestion.h
View File

@ -184,7 +184,7 @@ struct ObCompactionDagStatus final
DECLARE_TO_STRING;
// max COMPACTION mode dag is DAG_TYPE_MDS_TABLE_MERGE, which is 9
// max COMPACTION mode dag is DAG_TYPE_MDS_MINI_MERGE, which is 9
static const int64_t COMPACTION_DAG_MAX = 10;
// max COMPACTION prio DAG_PRIO_COMPACTION_LOW = 4
static const int64_t COMPACTION_PRIORITY_MAX = 5;

2
src/storage/compaction/ob_compaction_util.cpp
View File

@ -26,7 +26,7 @@ const static char * ObMergeTypeStr[] = {
"MEDIUM_MERGE",
"DDL_KV_MERGE",
"BACKFILL_TX_MERGE",
"MDS_TABLE_MERGE",
"MDS_MINI_MERGE",
"EMPTY_MERGE_TYPE"
};

4
src/storage/compaction/ob_compaction_util.h
View File

@ -28,7 +28,7 @@ enum ObMergeType
MEDIUM_MERGE = 5,
DDL_KV_MERGE = 6, // only use for ddl dag
BACKFILL_TX_MERGE = 7,
MDS_TABLE_MERGE = 8,
MDS_MINI_MERGE = 8,
// add new merge type here
// fix merge_type_to_str & ObPartitionMergePolicy::get_merge_tables
MERGE_TYPE_MAX
@ -88,7 +88,7 @@ inline bool is_backfill_tx_merge(const ObMergeType &merge_type)
}
inline bool is_mds_table_merge(const ObMergeType &merge_type)
{
return MDS_TABLE_MERGE == merge_type;
return MDS_MINI_MERGE == merge_type;
}
enum ObMergeLevel : uint8_t