diff --git a/src/bin/gs_guc/cluster_guc.conf b/src/bin/gs_guc/cluster_guc.conf index f3bd3ca7e..384e2612f 100755 --- a/src/bin/gs_guc/cluster_guc.conf +++ b/src/bin/gs_guc/cluster_guc.conf @@ -111,21 +111,15 @@ checkpoint_warning|int|0,2147483647|s|NULL| check_implicit_conversions|bool|0,0|NULL|NULL| client_encoding|string|0,0|NULL|It is not recommended to set this parameter in postgresql.conf and it will not take effect even if it is set in postgresql.conf.| client_min_messages|enum|debug,debug5,debug4,debug3,debug2,debug1,log,info,notice,warning,error,fatal,panic|NULL|When client_min_messages and log_min_messages take the same value, the value represented by the different levels.| -comm_ackchk_time|int|0,20000|ms|NULL| cn_send_buffer_size|int|8,128|kB|NULL| comm_proxy_attr|string|0,0|NULL|NULL| -comm_client_bind|bool|0,0|NULL|NULL| comm_control_port|int|0,65535|NULL|NULL| -comm_debug_mode|bool|0,0|NULL|When comm_debug_mode set to on, printing large amount of log, and it will add extra overhead, reduce database performance. Please Open it only when debugging.| comm_max_datanode|int|1,8192|NULL|NULL| comm_max_receiver|int|1,50|NULL|NULL| comm_max_stream|int|1,60000|NULL|NULL| -comm_no_delay|bool|0,0|NULL|NULL| comm_quota_size|int|0,2048000|kB|NULL| comm_sctp_port|int|0,65535|NULL|NULL| comm_stat_mode|bool|0,0|NULL|When comm_stat_mode set to on, printing large amount of log, and it will add extra overhead, reduce database performance. Please Open it only when debugging.| -comm_tcp_mode|bool|0,0|NULL|If the CN set comm_tcp_mode is off, DN set comm_tcp_mode is on. The cluster can not communicate properly. Please in global configuration mode to set CN and DN, then restart the cluster effect.| -comm_timer_mode|bool|0,0|NULL|When comm_timer_mode set to on, printing large amount of log, and it will add extra overhead, reduce database performance. Please Open it only when debugging.| comm_usable_memory|int|102400,1073741823|kB|This parameter is required according to the specific configuration and deployment environment memory, over the General Assembly cause OOM, too small will reduce the performance of SCTP communication library.| comm_memory_pool|int|102400,1073741823|kB|This parameter is the memory pool size for communication.| comm_memory_pool_percent|int|0,100|NULL|NULL| @@ -214,7 +208,6 @@ enable_logical_io_statistics|bool|0,0|NULL|NULL| instance_metric_retention_time|int|0,3650|day|NULL| enable_compress_hll|bool|0,0|NULL|NULL| enable_fast_numeric|bool|0,0|NULL|Enable numeric optimize.| -enable_force_reuse_connections|bool|0,0|NULL|NULL| enable_force_vector_engine|bool|0,0|NULL|NULL| enable_global_plancache|bool|0,0|NULL|NULL| enable_cachedplan_mgr|bool|0,0|NULL|NULL| @@ -246,7 +239,6 @@ enable_prevent_job_task_startup|bool|0,0|NULL|It is not recommended to enable th enable_security_policy|bool|0,0|NULL|NULL| use_elastic_search|bool|0,0|NULL|NULL| elastic_search_ip_addr|string|0,0|NULL|NULL -enable_stateless_pooler_reuse|bool|0,0|NULL|NULL| enable_resource_track|bool|0,0|NULL|NULL| enable_resource_record|bool|0,0|NULL|NULL| enable_roach_standby_cluster|bool|0,0|NULL|NULL| @@ -389,7 +381,6 @@ max_files_per_process|int|25,2147483647|NULL|NULL| max_io_capacity|int|30720,10485760|kB|NULL| max_loaded_cudesc|int|100,1073741823|NULL|NULL| max_locks_per_transaction|int|10,2147483647|NULL|NULL| -max_pool_size|int|1,65535|NULL|max_pool_size should be greater or equal to max_connections| max_pred_locks_per_transaction|int|10,2147483647|NULL|NULL| max_prepared_transactions|int|0,262143|NULL|NULL| max_process_memory|int|2097152,2147483647|kB|NULL| @@ -415,7 +406,6 @@ memory_detail_tracking|string|0,0|NULL|This parameter memory_detail_tracking onl memory_tracking_mode|enum|none,normal,executor,fullexec|NULL|NULL| memory_trace_level|enum|none,level1,level2|NULL|NULL| resilience_memory_reject_percent|string|0,0|NULL|NULL| -minimum_pool_size|int|1,65535|NULL|NULL| modify_initial_password|bool|0,0|NULL|NULL| most_available_sync|bool|0,0|NULL|NULL| ngram_gram_size|int|1,4|NULL|NULL| @@ -444,11 +434,8 @@ password_reuse_time|real|0,3650|NULL|Checks the configuration parameters passwor pgxc_node_name|string|0,0|NULL|NULL| plan_mode_seed|int|-1,2147483647|NULL|NULL| pooler_timeout|int|0,7200|s|NULL| -pooler_connect_max_loops|int|0,20|NULL|NULL| -pooler_connect_interval_time|int|0,7200|s|NULL| pooler_connect_timeout|int|0,7200|s|NULL| pooler_cancel_timeout|int|0,7200|s|NULL| -pooler_maximum_idle_time|int|0,2147483647|s|NULL| port|int|1,65535|NULL|NULL| post_auth_delay|int|0,2147|s|NULL| pre_auth_delay|int|0,60|s|NULL| @@ -499,7 +486,6 @@ show_fdw_remote_plan|bool|0,0|NULL|NULL| skew_option|enum|normal,lazy,off|NULL|NULL| sql_inheritance|bool|0,0|NULL|NULL| ssl|bool|0,0|NULL|NULL| -comm_ssl|bool|0,0|NULL|NULL| ssl_ca_file|string|0,0|NULL|NULL| ssl_cert_file|string|0,0|NULL|NULL| ssl_ciphers|string|0,0|NULL|NULL| diff --git a/src/common/backend/utils/misc/guc/guc_network.cpp b/src/common/backend/utils/misc/guc/guc_network.cpp index 312ba781c..7fa274aca 100755 --- a/src/common/backend/utils/misc/guc/guc_network.cpp +++ b/src/common/backend/utils/misc/guc/guc_network.cpp @@ -237,11 +237,7 @@ static void InitNetworkConfigureNamesBool() struct config_bool localConfigureNamesBool[] = { {{"enable_stateless_pooler_reuse", PGC_POSTMASTER, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DEVELOPER_OPTIONS, gettext_noop("Pooler stateless reuse mode."), NULL, @@ -254,11 +250,7 @@ static void InitNetworkConfigureNamesBool() // Stream communication {{"comm_tcp_mode", PGC_POSTMASTER, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif CLIENT_CONN, gettext_noop("Whether use tcp commucation mode for stream"), NULL, @@ -270,11 +262,7 @@ static void InitNetworkConfigureNamesBool() NULL}, {{"comm_debug_mode", PGC_USERSET, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DEVELOPER_OPTIONS, gettext_noop("Whether use libcomm debug mode for print debug information"), NULL, @@ -310,11 +298,7 @@ static void InitNetworkConfigureNamesBool() NULL}, {{"comm_timer_mode", PGC_USERSET, -#ifdef USE_SPQ NODE_ALL, -#else - NODE_DISTRIBUTE, -#endif DEVELOPER_OPTIONS, gettext_noop("Whether use libcomm timer debug mode for print timer data"), NULL, @@ -330,11 +314,7 @@ static void InitNetworkConfigureNamesBool() NULL}, {{"comm_no_delay", PGC_USERSET, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DEVELOPER_OPTIONS, gettext_noop("Whether set NO_DELAY option for libcomm socket"), NULL, @@ -346,11 +326,7 @@ static void InitNetworkConfigureNamesBool() NULL}, {{"enable_force_reuse_connections", PGC_BACKEND, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DEVELOPER_OPTIONS, gettext_noop("Session force reuse pooler connections."), NULL, @@ -362,11 +338,7 @@ static void InitNetworkConfigureNamesBool() NULL}, {{"comm_client_bind", PGC_USERSET, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DEVELOPER_OPTIONS, gettext_noop("Whether client use bind function"), NULL, @@ -378,11 +350,7 @@ static void InitNetworkConfigureNamesBool() NULL}, {{"comm_ssl", PGC_POSTMASTER, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif CONN_AUTH_SECURITY, gettext_noop("Enables libcomm SSL connections."), NULL}, @@ -500,11 +468,7 @@ static void InitNetworkConfigureNamesInt() show_unix_socket_permissions}, {{"pooler_maximum_idle_time", PGC_USERSET, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DATA_NODES, gettext_noop("Maximum idle time of the pooler links."), NULL, @@ -519,11 +483,7 @@ static void InitNetworkConfigureNamesInt() {{"minimum_pool_size", PGC_USERSET, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DATA_NODES, gettext_noop("Initial pool size."), gettext_noop("If number of active connections decreased below this value, " @@ -649,11 +609,7 @@ static void InitNetworkConfigureNamesInt() {{"comm_ackchk_time", PGC_USERSET, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif QUERY_TUNING, gettext_noop("Send ack check package to stream sender periodically."), NULL, @@ -813,11 +769,7 @@ static void InitNetworkConfigureNamesInt() NULL}, {{"max_pool_size", PGC_POSTMASTER, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DATA_NODES, gettext_noop("Max pool size."), gettext_noop("If number of active connections reaches this value, " @@ -865,11 +817,7 @@ static void InitNetworkConfigureNamesInt() {{"pooler_connect_max_loops", PGC_USERSET, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DATA_NODES, gettext_noop("Max retries of the Pooler Connecting to Other Nodes."), NULL}, @@ -883,11 +831,7 @@ static void InitNetworkConfigureNamesInt() {{"pooler_connect_interval_time", PGC_USERSET, -#ifdef USE_SPQ - NODE_ALL, -#else NODE_DISTRIBUTE, -#endif DATA_NODES, gettext_noop("Indicates the interval for each retry."), NULL, diff --git a/src/gausskernel/optimizer/util/optcommon.cpp b/src/gausskernel/optimizer/util/optcommon.cpp index 95041f77e..0330f915e 100755 --- a/src/gausskernel/optimizer/util/optcommon.cpp +++ b/src/gausskernel/optimizer/util/optcommon.cpp @@ -148,13 +148,13 @@ void GetPlanNodePlainText( } break; case T_AssertOp: - *pname = *sname = "Assert"; + *pname = *sname = *pt_operation = "Assert"; break; case T_ShareInputScan: - *pname = *sname = *pt_options = "ShareInputScan"; + *pname = *sname = *pt_operation = "ShareInputScan"; break; case T_Sequence: - *pname = *sname = *pt_options = "Sequence"; + *pname = *sname = *pt_operation = "Sequence"; break; #endif case T_CStoreScan: diff --git a/src/gausskernel/storage/access/common/printtup.cpp b/src/gausskernel/storage/access/common/printtup.cpp index fd8371c29..c0aef1b43 100644 --- a/src/gausskernel/storage/access/common/printtup.cpp +++ b/src/gausskernel/storage/access/common/printtup.cpp @@ -638,7 +638,7 @@ static void SendRowDescriptionCols_3(StringInfo buf, TupleDesc typeinfo, List *t * This preserves from OID inconsistencies as architecture is shared nothing. */ /* Description: unified cn/dn cn/client tupledesc data format under normal type. */ - if (IsConnFromCoord() && atttypid >= FirstBootstrapObjectId) { + if ((IsConnFromCoord() || IS_SPQ_EXECUTOR) && atttypid >= FirstBootstrapObjectId) { char *typenameVar = ""; typenameVar = get_typename_with_namespace(atttypid); pq_writestring(buf, typenameVar); @@ -689,7 +689,7 @@ static void SendRowDescriptionCols_2(StringInfo buf, TupleDesc typeinfo, List *t * This preserves from OID inconsistencies as architecture is shared nothing. */ /* Description: unified cn/dn cn/client tupledesc data format under normal type. */ - if (IsConnFromCoord() && atttypid >= FirstBootstrapObjectId) { + if ((IsConnFromCoord() || IS_SPQ_EXECUTOR) && atttypid >= FirstBootstrapObjectId) { char *typenameVar = ""; typenameVar = get_typename_with_namespace(atttypid); pq_sendstring(buf, typenameVar); diff --git a/src/test/regress/output/recovery_2pc_tools.source b/src/test/regress/output/recovery_2pc_tools.source index 677e32caa..ebfe0be38 100644 --- a/src/test/regress/output/recovery_2pc_tools.source +++ b/src/test/regress/output/recovery_2pc_tools.source @@ -115,10 +115,7 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c codegen_cost_threshold | integer | | 0 | 2147483647 codegen_strategy | enum | | | collation_connection | string | | | - comm_ackchk_time | integer | ms | 0 | 20000 - comm_client_bind | bool | | | comm_control_port | integer | | 0 | 65535 - comm_debug_mode | bool | | | commit_delay | integer | | 0 | 100000 commit_siblings | integer | | 0 | 1000 comm_max_datanode | integer | | 1 | 8192 @@ -126,15 +123,11 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c comm_max_stream | integer | | 1 | 60000 comm_memory_pool | integer | kB | 102400 | 1073741823 comm_memory_pool_percent | integer | | 0 | 100 - comm_no_delay | bool | | | comm_proxy_attr | string | | | comm_quota_size | integer | kB | 0 | 2048000 comm_sctp_port | integer | | 0 | 65535 comm_sender_buffer_size | integer | | 1 | 1024 - comm_ssl | bool | | | comm_stat_mode | bool | | | - comm_tcp_mode | bool | | | - comm_timer_mode | bool | | | comm_usable_memory | integer | kB | 102400 | 1073741823 config_file | string | | | connection_alarm_rate | real | | 0 | 1 @@ -279,7 +272,6 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c enable_fast_allocate | bool | | | enable_fast_numeric | bool | | | enable_ffic_log | bool | | | - enable_force_reuse_connections | bool | | | enable_force_vector_engine | bool | | | enable_functional_dependency | bool | | | enable_global_plancache | bool | | | @@ -347,7 +339,6 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c enable_sortgroup_agg | bool | | | ss_enable_dorado | bool | | | enable_startwith_debug | bool | | | - enable_stateless_pooler_reuse | bool | | | enable_stmt_track | bool | | | enable_stream_replication | bool | | | enable_tde | bool | | | @@ -499,7 +490,6 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c max_loaded_cudesc | integer | | 100 | 1073741823 max_locks_per_transaction | integer | | 10 | 2147483647 max_logical_replication_workers | integer | | 0 | 262143 - max_pool_size | integer | | 1 | 65535 max_pred_locks_per_transaction | integer | | 10 | 2147483647 max_prepared_transactions | integer | | 0 | 262143 max_process_memory | integer | kB | 2097152 | 2147483647 @@ -523,7 +513,6 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c memorypool_size | integer | kB | 131072 | 1073741823 memory_trace_level | enum | | | memory_tracking_mode | enum | | | - minimum_pool_size | integer | | 1 | 65535 modify_initial_password | bool | | | most_available_sync | bool | | | multi_stats_type | enum | | | @@ -573,10 +562,7 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c plsql_compile_check_options | string | | | plsql_show_all_error | bool | | | pooler_cancel_timeout | integer | s | 0 | 7200 - pooler_connect_interval_time | integer | s | 0 | 7200 - pooler_connect_max_loops | integer | | 0 | 20 pooler_connect_timeout | integer | s | 0 | 7200 - pooler_maximum_idle_time | integer | s | 0 | 2147483647 pooler_timeout | integer | s | 0 | 7200 port | integer | | 1 | 65535 post_auth_delay | integer | s | 0 | 2147