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

Revert [CP] Fix: affected row sync

Browse Source
This commit is contained in:
obdev
2024-02-06 20:02:50 +00:00
committed by ob-robot
parent 01729c848d
commit c44a356b58
10 changed files with 12 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/system_variable/ob_sys_var_class_type.h
View File

@ -264,8 +264,6 @@ enum ObSysVarClassType
SYS_VAR_OB_DEFAULT_LOB_INROW_THRESHOLD = 10158,
SYS_VAR__ENABLE_STORAGE_CARDINALITY_ESTIMATION = 10159,
SYS_VAR_LC_TIME_NAMES = 10160,
SYS_VAR__AFFECTED_ROWS = 10161,
SYS_VAR__FOUND_ROWS = 10162,
};
}

2
src/share/system_variable/ob_system_variable_alias.h
View File

@ -259,8 +259,6 @@ namespace share
static const char* const OB_SV_DEFAULT_LOB_INROW_THRESHOLD = "ob_default_lob_inrow_threshold";
static const char* const OB_SV__ENABLE_STORAGE_CARDINALITY_ESTIMATION = "_enable_storage_cardinality_estimation";
static const char* const OB_SV_LC_TIME_NAMES = "lc_time_names";
static const char* const OB_SV__AFFECTED_ROWS = "_affected_rows";
static const char* const OB_SV__FOUND_ROWS = "_found_rows";
}
}

50
src/share/system_variable/ob_system_variable_factory.cpp
View File

@ -123,7 +123,6 @@ const char *ObSysVarParallelDegreePolicy::PARALLEL_DEGREE_POLICY_NAMES[] = {
};
const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_NAME[] = {
"_affected_rows",
"_aggregation_optimization_settings",
"_clear_last_archive_timestamp",
"_create_audit_purge_job",
@ -137,7 +136,6 @@ const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_NAME[] = {
"_force_parallel_ddl_dop",
"_force_parallel_dml_dop",
"_force_parallel_query_dop",
"_found_rows",
"_groupby_nopushdown_cut_ratio",
"_nlj_batching_enabled",
"_ob_ols_policy_session_labels",
@ -371,7 +369,6 @@ const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_NAME[] = {
};
const ObSysVarClassType ObSysVarFactory::SYS_VAR_IDS_SORTED_BY_NAME[] = {
SYS_VAR__AFFECTED_ROWS,
SYS_VAR__AGGREGATION_OPTIMIZATION_SETTINGS,
SYS_VAR__CLEAR_LAST_ARCHIVE_TIMESTAMP,
SYS_VAR__CREATE_AUDIT_PURGE_JOB,
@ -385,7 +382,6 @@ const ObSysVarClassType ObSysVarFactory::SYS_VAR_IDS_SORTED_BY_NAME[] = {
SYS_VAR__FORCE_PARALLEL_DDL_DOP,
SYS_VAR__FORCE_PARALLEL_DML_DOP,
SYS_VAR__FORCE_PARALLEL_QUERY_DOP,
SYS_VAR__FOUND_ROWS,
SYS_VAR__GROUPBY_NOPUSHDOWN_CUT_RATIO,
SYS_VAR__NLJ_BATCHING_ENABLED,
SYS_VAR__OB_OLS_POLICY_SESSION_LABELS,
@ -861,9 +857,7 @@ const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_ID[] = {
"ob_enable_pl_cache",
"ob_default_lob_inrow_threshold",
"_enable_storage_cardinality_estimation",
"lc_time_names",
"_affected_rows",
"_found_rows"
"lc_time_names"
};
bool ObSysVarFactory::sys_var_name_case_cmp(const char *name1, const ObString &name2)
@ -1275,8 +1269,6 @@ int ObSysVarFactory::create_all_sys_vars()
+ sizeof(ObSysVarObDefaultLobInrowThreshold)
+ sizeof(ObSysVarEnableStorageCardinalityEstimation)
+ sizeof(ObSysVarLcTimeNames)
+ sizeof(ObSysVarAffectedRows)
+ sizeof(ObSysVarFoundRows)
;
void *ptr = NULL;
if (OB_ISNULL(ptr = allocator_.alloc(total_mem_size))) {
@ -3472,24 +3464,6 @@ int ObSysVarFactory::create_all_sys_vars()
ptr = (void *)((char *)ptr + sizeof(ObSysVarLcTimeNames));
}
}
if (OB_SUCC(ret)) {
if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarAffectedRows())) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("fail to new ObSysVarAffectedRows", K(ret));
} else {
store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast<int64_t>(SYS_VAR__AFFECTED_ROWS))] = sys_var_ptr;
ptr = (void *)((char *)ptr + sizeof(ObSysVarAffectedRows));
}
}
if (OB_SUCC(ret)) {
if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarFoundRows())) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("fail to new ObSysVarFoundRows", K(ret));
} else {
store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast<int64_t>(SYS_VAR__FOUND_ROWS))] = sys_var_ptr;
ptr = (void *)((char *)ptr + sizeof(ObSysVarFoundRows));
}
}
}
return ret;
@ -6173,28 +6147,6 @@ int ObSysVarFactory::create_sys_var(ObIAllocator &allocator_, ObSysVarClassType
}
break;
}
case SYS_VAR__AFFECTED_ROWS: {
void *ptr = NULL;
if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarAffectedRows)))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarAffectedRows)));
} else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarAffectedRows())) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("fail to new ObSysVarAffectedRows", K(ret));
}
break;
}
case SYS_VAR__FOUND_ROWS: {
void *ptr = NULL;
if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarFoundRows)))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarFoundRows)));
} else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarFoundRows())) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("fail to new ObSysVarFoundRows", K(ret));
}
break;
}
default: {
ret = OB_ERR_UNEXPECTED;

16
src/share/system_variable/ob_system_variable_factory.h
View File

@ -1754,20 +1754,6 @@ public:
inline virtual ObSysVarClassType get_type() const { return SYS_VAR_LC_TIME_NAMES; }
inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(242); }
};
class ObSysVarAffectedRows : public ObIntSysVar
{
public:
ObSysVarAffectedRows() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
inline virtual ObSysVarClassType get_type() const { return SYS_VAR__AFFECTED_ROWS; }
inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(243); }
};
class ObSysVarFoundRows : public ObIntSysVar
{
public:
ObSysVarFoundRows() : ObIntSysVar(NULL, NULL, NULL, NULL, NULL) {}
inline virtual ObSysVarClassType get_type() const { return SYS_VAR__FOUND_ROWS; }
inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(244); }
};
class ObSysVarFactory
@ -1788,7 +1774,7 @@ public:
static const common::ObString get_sys_var_name_by_id(ObSysVarClassType sys_var_id);
const static int64_t MYSQL_SYS_VARS_COUNT = 97;
const static int64_t OB_SYS_VARS_COUNT = 148;
const static int64_t OB_SYS_VARS_COUNT = 146;
const static int64_t ALL_SYS_VARS_COUNT = MYSQL_SYS_VARS_COUNT + OB_SYS_VARS_COUNT;
const static int64_t INVALID_MAX_READ_STALE_TIME = -1;

32
src/share/system_variable/ob_system_variable_init.cpp
View File

@ -3429,43 +3429,13 @@ static struct VarsInit{
ObSysVars[242].alias_ = "OB_SV_LC_TIME_NAMES" ;
}();
[&] (){
ObSysVars[243].default_value_ = "-1" ;
ObSysVars[243].info_ = "affected rows." ;
ObSysVars[243].name_ = "_affected_rows" ;
ObSysVars[243].data_type_ = ObIntType ;
ObSysVars[243].min_val_ = "-1" ;
ObSysVars[243].max_val_ = "9223372036854775807" ;
ObSysVars[243].flags_ = ObSysVarFlag::SESSION_SCOPE | ObSysVarFlag::INVISIBLE | ObSysVarFlag::NEED_SERIALIZE ;
ObSysVars[243].id_ = SYS_VAR__AFFECTED_ROWS ;
cur_max_var_id = MAX(cur_max_var_id, static_cast<int64_t>(SYS_VAR__AFFECTED_ROWS)) ;
ObSysVarsIdToArrayIdx[SYS_VAR__AFFECTED_ROWS] = 243 ;
ObSysVars[243].base_value_ = "-1" ;
ObSysVars[243].alias_ = "OB_SV__AFFECTED_ROWS" ;
}();
[&] (){
ObSysVars[244].default_value_ = "1" ;
ObSysVars[244].info_ = "found rows." ;
ObSysVars[244].name_ = "_found_rows" ;
ObSysVars[244].data_type_ = ObIntType ;
ObSysVars[244].min_val_ = "-1" ;
ObSysVars[244].max_val_ = "9223372036854775807" ;
ObSysVars[244].flags_ = ObSysVarFlag::SESSION_SCOPE | ObSysVarFlag::INVISIBLE | ObSysVarFlag::NEED_SERIALIZE ;
ObSysVars[244].id_ = SYS_VAR__FOUND_ROWS ;
cur_max_var_id = MAX(cur_max_var_id, static_cast<int64_t>(SYS_VAR__FOUND_ROWS)) ;
ObSysVarsIdToArrayIdx[SYS_VAR__FOUND_ROWS] = 244 ;
ObSysVars[244].base_value_ = "1" ;
ObSysVars[244].alias_ = "OB_SV__FOUND_ROWS" ;
}();
if (cur_max_var_id >= ObSysVarFactory::OB_MAX_SYS_VAR_ID) {
HasInvalidSysVar = true;
}
}
}vars_init;
static int64_t var_amount = 245;
static int64_t var_amount = 243;
int64_t ObSysVariables::get_all_sys_var_count(){ return ObSysVarFactory::ALL_SYS_VARS_COUNT;}
ObSysVarClassType ObSysVariables::get_sys_var_id(int64_t i){ return ObSysVars[i].id_;}

30
src/share/system_variable/ob_system_variable_init.json
View File

@ -3459,35 +3459,5 @@
"info_cn": "",
"background_cn": "",
"ref_url": ""
},
"_affected_rows": {
"id": 10161,
"name": "_affected_rows",
"default_value": "-1",
"base_value": "-1",
"data_type": "int",
"info": "affected rows.",
"flags": "SESSION | INVISIBLE | NEED_SERIALIZE",
"min_val": "-1",
"max_val": "9223372036854775807",
"publish_version": "",
"info_cn": "",
"background_cn": "",
"ref_url": ""
},
"_found_rows": {
"id": 10162,
"name": "_found_rows",
"default_value": "1",
"base_value": "1",
"data_type": "int",
"info": "found rows.",
"flags": "SESSION | INVISIBLE | NEED_SERIALIZE",
"min_val": "-1",
"max_val": "9223372036854775807",
"publish_version": "",
"info_cn": "",
"background_cn": "",
"ref_url": ""
}
}