From 9ef717146849b5ff2229ad2bd81c4e24f4c14269 Mon Sep 17 00:00:00 2001
From: TotaJ <totaj@qq.com>
Date: Mon, 8 Mar 2021 19:16:22 +0800
Subject: [PATCH] Set enable_adio_function to PGC_INTERNAL.

---
 src/bin/gs_guc/cluster_guc.conf                      | 1 -
 src/common/backend/utils/misc/guc.cpp                | 4 ++--
 src/common/backend/utils/misc/postgresql.conf.sample | 1 -
 src/test/regress/output/alter_system_set.source      | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/bin/gs_guc/cluster_guc.conf b/src/bin/gs_guc/cluster_guc.conf
index 50b3c692b..8516f14e9 100755
--- a/src/bin/gs_guc/cluster_guc.conf
+++ b/src/bin/gs_guc/cluster_guc.conf
@@ -576,7 +576,6 @@ cstore_backwrite_max_threshold|int|4096,1073741823|kB|NULL|
 cstore_backwrite_quantity|int|1024,1048576|kB|NULL|
 cstore_prefetch_quantity|int|1024,1048576|kB|NULL|
 enable_adio_debug|bool|0,0|NULL|NULL|
-enable_adio_function|bool|0,0|NULL|NULL|
 enable_fast_allocate|bool|0,0|NULL|NULL|
 enable_stream_replication|bool|0,0|NULL|NULL|
 fast_extend_file_size|int|1024,1048576|kB|NULL|
diff --git a/src/common/backend/utils/misc/guc.cpp b/src/common/backend/utils/misc/guc.cpp
index 6a0f6f22f..f4d35251b 100644
--- a/src/common/backend/utils/misc/guc.cpp
+++ b/src/common/backend/utils/misc/guc.cpp
@@ -3059,8 +3059,8 @@ static void InitConfigureNamesBool()
             check_adio_debug_guc,
             NULL,
             NULL},
-
-        {{"enable_adio_function", PGC_POSTMASTER, DEVELOPER_OPTIONS, gettext_noop("Enable adio function."), NULL},
+        /* This is a beta feature, set it to PGC_INTERNAL, so user can't configure it */
+        {{"enable_adio_function", PGC_INTERNAL, DEVELOPER_OPTIONS, gettext_noop("Enable adio function."), NULL},
             &g_instance.attr.attr_storage.enable_adio_function,
             false,
             check_adio_function_guc,
diff --git a/src/common/backend/utils/misc/postgresql.conf.sample b/src/common/backend/utils/misc/postgresql.conf.sample
index 35aabe661..315b307bf 100755
--- a/src/common/backend/utils/misc/postgresql.conf.sample
+++ b/src/common/backend/utils/misc/postgresql.conf.sample
@@ -810,7 +810,6 @@ audit_enabled = on
 #------------------------------------------------------------------------------
 # ADIO 
 #------------------------------------------------------------------------------
-#enable_adio_function = off
 #enable_fast_allocate = off
 #prefetch_quantity = 32MB
 #backwrite_quantity = 8MB
diff --git a/src/test/regress/output/alter_system_set.source b/src/test/regress/output/alter_system_set.source
index 97a7a3ed5..ecf832d7b 100644
--- a/src/test/regress/output/alter_system_set.source
+++ b/src/test/regress/output/alter_system_set.source
@@ -439,7 +439,7 @@ SHOW io_control_unit;
 \! echo "io_control_unIt = 60000" >> @abs_srcdir@/tmp_check/datanode1/postgresql.conf
 \! echo "# io_control_uniT = 80000" >> @abs_srcdir@/tmp_check/datanode1/postgresql.conf
 ALTER SYSTEM SET "io_control_UNit" TO 90000;
-NOTICE:  There are 3 "io_control_UNit" not commented in "postgresql.conf", and only the last one in 916th line will be set and used.
+NOTICE:  There are 3 "io_control_UNit" not commented in "postgresql.conf", and only the last one in 915th line will be set and used.
 \! grep "io_control_" @abs_srcdir@/tmp_check/datanode1/postgresql.conf
 io_control_unit = 10000
 # io_control_Unit = 50000
@@ -465,7 +465,7 @@ SHOW io_control_unit;
 -------------------------------------------------------
 \! rm @abs_srcdir@/tmp_check/datanode1/postgresql.conf
 ALTER SYSTEM SET "io_control_unIT" TO 6000;
-NOTICE:  There are 3 "io_control_unIT" not commented in "postgresql.conf", and only the last one in 916th line will be set and used.
+NOTICE:  There are 3 "io_control_unIT" not commented in "postgresql.conf", and only the last one in 915th line will be set and used.
 select pg_sleep(1);
  pg_sleep 
 ----------