From 4ee1db2e829cbcb18efebbecb8b9c021ff99829d Mon Sep 17 00:00:00 2001 From: akaError Date: Thu, 11 May 2023 09:21:09 +0000 Subject: [PATCH] fix sys var position --- .../system_variable/ob_sys_var_class_type.h | 4 +- .../ob_system_variable_alias.h | 2 +- .../ob_system_variable_factory.cpp | 44 +++++++++---------- .../ob_system_variable_factory.h | 14 +++--- .../ob_system_variable_init.cpp | 28 ++++++------ .../ob_system_variable_init.json | 26 +++++------ 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/share/system_variable/ob_sys_var_class_type.h b/src/share/system_variable/ob_sys_var_class_type.h index 1eacbf4094..5807455233 100644 --- a/src/share/system_variable/ob_sys_var_class_type.h +++ b/src/share/system_variable/ob_sys_var_class_type.h @@ -243,8 +243,8 @@ enum ObSysVarClassType SYS_VAR_OB_MAX_READ_STALE_TIME = 10137, SYS_VAR__OPTIMIZER_GATHER_STATS_ON_LOAD = 10138, SYS_VAR__SET_REVERSE_DBLINK_INFOS = 10139, - SYS_VAR__SHOW_DDL_IN_COMPAT_MODE = 10140, - SYS_VAR__FORCE_ORDER_PRESERVE_SET = 10141, + SYS_VAR__FORCE_ORDER_PRESERVE_SET = 10140, + SYS_VAR__SHOW_DDL_IN_COMPAT_MODE = 10141, SYS_VAR_PARALLEL_DEGREE_POLICY = 10142, SYS_VAR_PARALLEL_DEGREE_LIMIT = 10143, SYS_VAR_PARALLEL_MIN_SCAN_TIME_THRESHOLD = 10144, diff --git a/src/share/system_variable/ob_system_variable_alias.h b/src/share/system_variable/ob_system_variable_alias.h index cad679dd07..752f399e28 100644 --- a/src/share/system_variable/ob_system_variable_alias.h +++ b/src/share/system_variable/ob_system_variable_alias.h @@ -238,8 +238,8 @@ namespace share static const char* const OB_SV_MAX_READ_STALE_TIME = "ob_max_read_stale_time"; static const char* const OB_SV__OPTIMIZER_GATHER_STATS_ON_LOAD = "_optimizer_gather_stats_on_load"; static const char* const OB_SV__SET_REVERSE_DBLINK_INFOS = "_set_reverse_dblink_infos"; - static const char* const OB_SV__SHOW_DDL_IN_COMPAT_MODE = "_show_ddl_in_compat_mode"; static const char* const OB_SV__FORCE_ORDER_PRESERVE_SET = "_force_order_preserve_set"; + static const char* const OB_SV__SHOW_DDL_IN_COMPAT_MODE = "_show_ddl_in_compat_mode"; static const char* const OB_SV_PARALLEL_DEGREE_POLICY = "parallel_degree_policy"; static const char* const OB_SV_PARALLEL_DEGREE_LIMIT = "parallel_degree_limit"; static const char* const OB_SV_PARALLEL_MIN_SCAN_TIME_THRESHOLD = "parallel_min_scan_time_threshold"; diff --git a/src/share/system_variable/ob_system_variable_factory.cpp b/src/share/system_variable/ob_system_variable_factory.cpp index d17be4e19f..9855c3e091 100644 --- a/src/share/system_variable/ob_system_variable_factory.cpp +++ b/src/share/system_variable/ob_system_variable_factory.cpp @@ -815,8 +815,8 @@ const char *ObSysVarFactory::SYS_VAR_NAMES_SORTED_BY_ID[] = { "ob_max_read_stale_time", "_optimizer_gather_stats_on_load", "_set_reverse_dblink_infos", - "_show_ddl_in_compat_mode", "_force_order_preserve_set", + "_show_ddl_in_compat_mode", "parallel_degree_policy", "parallel_degree_limit", "parallel_min_scan_time_threshold", @@ -1214,8 +1214,8 @@ int ObSysVarFactory::create_all_sys_vars() + sizeof(ObSysVarObMaxReadStaleTime) + sizeof(ObSysVarOptimizerGatherStatsOnLoad) + sizeof(ObSysVarSetReverseDblinkInfos) - + sizeof(ObSysVarShowDdlInCompatMode) + sizeof(ObSysVarForceOrderPreserveSet) + + sizeof(ObSysVarShowDdlInCompatMode) + sizeof(ObSysVarParallelDegreePolicy) + sizeof(ObSysVarParallelDegreeLimit) + sizeof(ObSysVarParallelMinScanTimeThreshold) @@ -3230,15 +3230,6 @@ int ObSysVarFactory::create_all_sys_vars() ptr = (void *)((char *)ptr + sizeof(ObSysVarSetReverseDblinkInfos)); } } - if (OB_SUCC(ret)) { - if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarShowDdlInCompatMode())) { - ret = OB_ALLOCATE_MEMORY_FAILED; - LOG_ERROR("fail to new ObSysVarShowDdlInCompatMode", K(ret)); - } else { - store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast(SYS_VAR__SHOW_DDL_IN_COMPAT_MODE))] = sys_var_ptr; - ptr = (void *)((char *)ptr + sizeof(ObSysVarShowDdlInCompatMode)); - } - } if (OB_SUCC(ret)) { if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarForceOrderPreserveSet())) { ret = OB_ALLOCATE_MEMORY_FAILED; @@ -3248,6 +3239,15 @@ int ObSysVarFactory::create_all_sys_vars() ptr = (void *)((char *)ptr + sizeof(ObSysVarForceOrderPreserveSet)); } } + if (OB_SUCC(ret)) { + if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarShowDdlInCompatMode())) { + ret = OB_ALLOCATE_MEMORY_FAILED; + LOG_ERROR("fail to new ObSysVarShowDdlInCompatMode", K(ret)); + } else { + store_buf_[ObSysVarsToIdxMap::get_store_idx(static_cast(SYS_VAR__SHOW_DDL_IN_COMPAT_MODE))] = sys_var_ptr; + ptr = (void *)((char *)ptr + sizeof(ObSysVarShowDdlInCompatMode)); + } + } if (OB_SUCC(ret)) { if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarParallelDegreePolicy())) { ret = OB_ALLOCATE_MEMORY_FAILED; @@ -5772,17 +5772,6 @@ int ObSysVarFactory::create_sys_var(ObIAllocator &allocator_, ObSysVarClassType } break; } - case SYS_VAR__SHOW_DDL_IN_COMPAT_MODE: { - void *ptr = NULL; - if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarShowDdlInCompatMode)))) { - ret = OB_ALLOCATE_MEMORY_FAILED; - LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarShowDdlInCompatMode))); - } else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarShowDdlInCompatMode())) { - ret = OB_ALLOCATE_MEMORY_FAILED; - LOG_ERROR("fail to new ObSysVarShowDdlInCompatMode", K(ret)); - } - break; - } case SYS_VAR__FORCE_ORDER_PRESERVE_SET: { void *ptr = NULL; if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarForceOrderPreserveSet)))) { @@ -5794,6 +5783,17 @@ int ObSysVarFactory::create_sys_var(ObIAllocator &allocator_, ObSysVarClassType } break; } + case SYS_VAR__SHOW_DDL_IN_COMPAT_MODE: { + void *ptr = NULL; + if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarShowDdlInCompatMode)))) { + ret = OB_ALLOCATE_MEMORY_FAILED; + LOG_ERROR("fail to alloc memory", K(ret), K(sizeof(ObSysVarShowDdlInCompatMode))); + } else if (OB_ISNULL(sys_var_ptr = new (ptr)ObSysVarShowDdlInCompatMode())) { + ret = OB_ALLOCATE_MEMORY_FAILED; + LOG_ERROR("fail to new ObSysVarShowDdlInCompatMode", K(ret)); + } + break; + } case SYS_VAR_PARALLEL_DEGREE_POLICY: { void *ptr = NULL; if (OB_ISNULL(ptr = allocator_.alloc(sizeof(ObSysVarParallelDegreePolicy)))) { diff --git a/src/share/system_variable/ob_system_variable_factory.h b/src/share/system_variable/ob_system_variable_factory.h index 119544a578..bb598fc54d 100644 --- a/src/share/system_variable/ob_system_variable_factory.h +++ b/src/share/system_variable/ob_system_variable_factory.h @@ -1605,18 +1605,18 @@ public: inline virtual ObSysVarClassType get_type() const { return SYS_VAR__SET_REVERSE_DBLINK_INFOS; } inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(221); } }; -class ObSysVarShowDdlInCompatMode : public ObBoolSysVar -{ -public: - ObSysVarShowDdlInCompatMode() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {} - inline virtual ObSysVarClassType get_type() const { return SYS_VAR__SHOW_DDL_IN_COMPAT_MODE; } - inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(222); } -}; class ObSysVarForceOrderPreserveSet : public ObBoolSysVar { public: ObSysVarForceOrderPreserveSet() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {} inline virtual ObSysVarClassType get_type() const { return SYS_VAR__FORCE_ORDER_PRESERVE_SET; } + inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(222); } +}; +class ObSysVarShowDdlInCompatMode : public ObBoolSysVar +{ +public: + ObSysVarShowDdlInCompatMode() : ObBoolSysVar(NULL, NULL, NULL, NULL, NULL) {} + inline virtual ObSysVarClassType get_type() const { return SYS_VAR__SHOW_DDL_IN_COMPAT_MODE; } inline virtual const common::ObObj &get_global_default_value() const { return ObSysVariables::get_default_value(223); } }; class ObSysVarParallelDegreePolicy : public ObEnumSysVar diff --git a/src/share/system_variable/ob_system_variable_init.cpp b/src/share/system_variable/ob_system_variable_init.cpp index b1040ef930..cf294f7cd5 100644 --- a/src/share/system_variable/ob_system_variable_init.cpp +++ b/src/share/system_variable/ob_system_variable_init.cpp @@ -2916,27 +2916,27 @@ static struct VarsInit{ }(); [&] (){ - ObSysVars[222].info_ = "When enabled, show create table will show the strict compatible results with the compatibility mode." ; - ObSysVars[222].name_ = "_show_ddl_in_compat_mode" ; + ObSysVars[222].info_ = "can control the behavior of set query, when true, set query will generate a serial plan, which ensure the output order of result set is ordered " ; + ObSysVars[222].name_ = "_force_order_preserve_set" ; ObSysVars[222].data_type_ = ObIntType ; ObSysVars[222].value_ = "0" ; - ObSysVars[222].flags_ = ObSysVarFlag::SESSION_SCOPE ; - ObSysVars[222].id_ = SYS_VAR__SHOW_DDL_IN_COMPAT_MODE ; - cur_max_var_id = MAX(cur_max_var_id, static_cast(SYS_VAR__SHOW_DDL_IN_COMPAT_MODE)) ; - ObSysVarsIdToArrayIdx[SYS_VAR__SHOW_DDL_IN_COMPAT_MODE] = 222 ; - ObSysVars[222].alias_ = "OB_SV__SHOW_DDL_IN_COMPAT_MODE" ; + ObSysVars[222].flags_ = ObSysVarFlag::GLOBAL_SCOPE | ObSysVarFlag::SESSION_SCOPE | ObSysVarFlag::INFLUENCE_PLAN | ObSysVarFlag::NEED_SERIALIZE | ObSysVarFlag::ORACLE_ONLY | ObSysVarFlag::INVISIBLE ; + ObSysVars[222].id_ = SYS_VAR__FORCE_ORDER_PRESERVE_SET ; + cur_max_var_id = MAX(cur_max_var_id, static_cast(SYS_VAR__FORCE_ORDER_PRESERVE_SET)) ; + ObSysVarsIdToArrayIdx[SYS_VAR__FORCE_ORDER_PRESERVE_SET] = 222 ; + ObSysVars[222].alias_ = "OB_SV__FORCE_ORDER_PRESERVE_SET" ; }(); [&] (){ - ObSysVars[223].info_ = "can control the behavior of set query, when true, set query will generate a serial plan, which ensure the output order of result set is ordered " ; - ObSysVars[223].name_ = "_force_order_preserve_set" ; + ObSysVars[223].info_ = "When enabled, show create table will show the strict compatible results with the compatibility mode." ; + ObSysVars[223].name_ = "_show_ddl_in_compat_mode" ; ObSysVars[223].data_type_ = ObIntType ; ObSysVars[223].value_ = "0" ; - ObSysVars[223].flags_ = ObSysVarFlag::GLOBAL_SCOPE | ObSysVarFlag::SESSION_SCOPE | ObSysVarFlag::INFLUENCE_PLAN | ObSysVarFlag::NEED_SERIALIZE | ObSysVarFlag::ORACLE_ONLY | ObSysVarFlag::INVISIBLE ; - ObSysVars[223].id_ = SYS_VAR__FORCE_ORDER_PRESERVE_SET ; - cur_max_var_id = MAX(cur_max_var_id, static_cast(SYS_VAR__FORCE_ORDER_PRESERVE_SET)) ; - ObSysVarsIdToArrayIdx[SYS_VAR__FORCE_ORDER_PRESERVE_SET] = 223 ; - ObSysVars[223].alias_ = "OB_SV__FORCE_ORDER_PRESERVE_SET" ; + ObSysVars[223].flags_ = ObSysVarFlag::SESSION_SCOPE ; + ObSysVars[223].id_ = SYS_VAR__SHOW_DDL_IN_COMPAT_MODE ; + cur_max_var_id = MAX(cur_max_var_id, static_cast(SYS_VAR__SHOW_DDL_IN_COMPAT_MODE)) ; + ObSysVarsIdToArrayIdx[SYS_VAR__SHOW_DDL_IN_COMPAT_MODE] = 223 ; + ObSysVars[223].alias_ = "OB_SV__SHOW_DDL_IN_COMPAT_MODE" ; }(); [&] (){ diff --git a/src/share/system_variable/ob_system_variable_init.json b/src/share/system_variable/ob_system_variable_init.json index 7fd0cd6ab1..6728ced6a2 100644 --- a/src/share/system_variable/ob_system_variable_init.json +++ b/src/share/system_variable/ob_system_variable_init.json @@ -2945,20 +2945,8 @@ "background_cn": "", "ref_url": "" }, - "_show_ddl_in_compat_mode": { - "id": 10140, - "name": "_show_ddl_in_compat_mode", - "value": "0", - "data_type": "bool", - "info": "When enabled, show create table will show the strict compatible results with the compatibility mode.", - "flags": "SESSION", - "publish_version": "324", - "info_cn": "启用后, show create table 将展示与兼容模式严格兼容的结果", - "background_cn": "", - "ref_url": "/" - }, "_force_order_preserve_set": { - "id": 10141, + "id": 10140, "name": "_force_order_preserve_set", "value": "0", "data_type": "bool", @@ -2969,6 +2957,18 @@ "background_cn": "", "ref_url": "" }, + "_show_ddl_in_compat_mode": { + "id": 10141, + "name": "_show_ddl_in_compat_mode", + "value": "0", + "data_type": "bool", + "info": "When enabled, show create table will show the strict compatible results with the compatibility mode.", + "flags": "SESSION", + "publish_version": "324", + "info_cn": "启用后, show create table 将展示与兼容模式严格兼容的结果", + "background_cn": "", + "ref_url": "/" + }, "parallel_degree_policy": { "id": 10142, "name": "parallel_degree_policy",