diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_799.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_799.sql
index fb5ef3df3c6e56b85013fc30bd630a3663ae1f8b..d8ab85face6ce18cdcc43dc35bff036917ace3a2 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_799.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_799.sql
@@ -1,10 +1,12 @@
+DO $upgrade$
+BEGIN
+IF working_version_num() < 92608 then
 DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
 DROP FUNCTION IF EXISTS pg_catalog.pg_ls_tmpdir() CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.pg_ls_tmpdir(oid) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.pg_ls_waldir() CASCADE;
 
 ------------------------------------------------------------------------------------------------------------------------------------
-DO $DO$
 DECLARE
 ans boolean;
 BEGIN
@@ -41,9 +43,8 @@ SELECT sampleid, sample_time, need_flush_sample, databaseid, thread_id, sessioni
        user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, final_block_sessionid, wait_status, global_sessionid FROM tt
 WHERE level = (SELECT MAX(level) FROM tt t1 WHERE t1.sampleid =  tt.sampleid AND t1.sessionid = tt.sessionid);
 end if;
-END$DO$;
+END;
 
-DO $DO$
 DECLARE
 ans boolean;
   user_name text;
@@ -53,8 +54,6 @@ select case when count(*)=1 then true else false end as ans from (select nspname
 if ans = true then
 SELECT SESSION_USER INTO user_name;
 
-
-
 query_str := 'GRANT INSERT,SELECT,UPDATE,DELETE,TRUNCATE,REFERENCES,TRIGGER ON TABLE DBE_PERF.local_active_session TO ' || quote_ident(user_name) || ';';
 EXECUTE IMMEDIATE query_str;
 GRANT SELECT ON TABLE DBE_PERF.local_active_session TO PUBLIC;
@@ -62,10 +61,8 @@ GRANT SELECT ON TABLE DBE_PERF.local_active_session TO PUBLIC;
 GRANT SELECT ON TABLE pg_catalog.gs_asp TO PUBLIC;
 
 end if;
-END$DO$;
-
+END;
 
-DO $DO$
 DECLARE
   ans boolean;
 BEGIN
@@ -334,7 +331,7 @@ BEGIN
           END; $$
         LANGUAGE 'plpgsql' NOT FENCED;
     end if;
-END$DO$;
+END;
 
 DROP FUNCTION IF EXISTS pg_catalog.gs_stack() CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_stack(INT8) CASCADE;
@@ -369,7 +366,7 @@ SELECT
 FROM pg_stat_activity_ng AS S, pg_catalog.pg_stat_get_wlm_realtime_session_info(NULL) AS T
 WHERE S.sessionid = T.threadid;
 GRANT SELECT ON TABLE pg_catalog.gs_session_cpu_statistics TO PUBLIC;
-do $$DECLARE ans boolean;
+DECLARE ans boolean;
 BEGIN
     for ans in select case when count(*)=1 then true else false end as ans  from (select nspname from pg_namespace where nspname='dbe_sql_util' limit 1)
     LOOP
@@ -383,7 +380,7 @@ BEGIN
         end if;
         exit;
     END LOOP;
-END$$;
+END;
 
 DROP SCHEMA IF EXISTS dbe_sql_util cascade;
 
@@ -483,3 +480,5 @@ BEGIN
 END; $$
 LANGUAGE plpgsql NOT FENCED;DROP FUNCTION IF EXISTS pg_catalog.gs_get_history_memory_detail() cascade;DROP FUNCTION IF EXISTS gs_is_dw_io_blocked() CASCADE;
 DROP FUNCTION IF EXISTS gs_block_dw_io(integer, text) CASCADE;
+END IF;
+END $upgrade$;
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_799.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_799.sql
index 8d1e3e3903610242b10904ef0a187f6c43f8114e..d8ab85face6ce18cdcc43dc35bff036917ace3a2 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_799.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_799.sql
@@ -1,10 +1,12 @@
+DO $upgrade$
+BEGIN
+IF working_version_num() < 92608 then
 DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
 DROP FUNCTION IF EXISTS pg_catalog.pg_ls_tmpdir() CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.pg_ls_tmpdir(oid) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.pg_ls_waldir() CASCADE;
 
 ------------------------------------------------------------------------------------------------------------------------------------
-DO $DO$
 DECLARE
 ans boolean;
 BEGIN
@@ -41,9 +43,8 @@ SELECT sampleid, sample_time, need_flush_sample, databaseid, thread_id, sessioni
        user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, final_block_sessionid, wait_status, global_sessionid FROM tt
 WHERE level = (SELECT MAX(level) FROM tt t1 WHERE t1.sampleid =  tt.sampleid AND t1.sessionid = tt.sessionid);
 end if;
-END$DO$;
+END;
 
-DO $DO$
 DECLARE
 ans boolean;
   user_name text;
@@ -53,8 +54,6 @@ select case when count(*)=1 then true else false end as ans from (select nspname
 if ans = true then
 SELECT SESSION_USER INTO user_name;
 
-
-
 query_str := 'GRANT INSERT,SELECT,UPDATE,DELETE,TRUNCATE,REFERENCES,TRIGGER ON TABLE DBE_PERF.local_active_session TO ' || quote_ident(user_name) || ';';
 EXECUTE IMMEDIATE query_str;
 GRANT SELECT ON TABLE DBE_PERF.local_active_session TO PUBLIC;
@@ -62,10 +61,8 @@ GRANT SELECT ON TABLE DBE_PERF.local_active_session TO PUBLIC;
 GRANT SELECT ON TABLE pg_catalog.gs_asp TO PUBLIC;
 
 end if;
-END$DO$;
+END;
 
-
-DO $DO$
 DECLARE
   ans boolean;
 BEGIN
@@ -334,7 +331,8 @@ BEGIN
           END; $$
         LANGUAGE 'plpgsql' NOT FENCED;
     end if;
-END$DO$;
+END;
+
 DROP FUNCTION IF EXISTS pg_catalog.gs_stack() CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_stack(INT8) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_stack(pid bigint) CASCADE;
@@ -368,7 +366,7 @@ SELECT
 FROM pg_stat_activity_ng AS S, pg_catalog.pg_stat_get_wlm_realtime_session_info(NULL) AS T
 WHERE S.sessionid = T.threadid;
 GRANT SELECT ON TABLE pg_catalog.gs_session_cpu_statistics TO PUBLIC;
-do $$DECLARE ans boolean;
+DECLARE ans boolean;
 BEGIN
     for ans in select case when count(*)=1 then true else false end as ans  from (select nspname from pg_namespace where nspname='dbe_sql_util' limit 1)
     LOOP
@@ -382,7 +380,7 @@ BEGIN
         end if;
         exit;
     END LOOP;
-END$$;
+END;
 
 DROP SCHEMA IF EXISTS dbe_sql_util cascade;
 
@@ -482,3 +480,5 @@ BEGIN
 END; $$
 LANGUAGE plpgsql NOT FENCED;DROP FUNCTION IF EXISTS pg_catalog.gs_get_history_memory_detail() cascade;DROP FUNCTION IF EXISTS gs_is_dw_io_blocked() CASCADE;
 DROP FUNCTION IF EXISTS gs_block_dw_io(integer, text) CASCADE;
+END IF;
+END $upgrade$;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_799.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_799.sql
index 0f8c17db39664095c5c03d6f435a1d090cf4f2d3..8c4e538aa933ba45e3032f85651867de77359b24 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_799.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_799.sql
@@ -1,3 +1,6 @@
+DO $upgrade$
+BEGIN
+IF working_version_num() < 92608 THEN
 DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 7732;
 CREATE OR REPLACE FUNCTION pg_catalog.get_client_info()
@@ -51,7 +54,6 @@ comment on function PG_CATALOG.pg_ls_waldir() is 'list of files in the WAL direc
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
 
 ------------------------------------------------------------------------------------------------------------------------------------
-DO $DO$
 DECLARE
 ans boolean;
 BEGIN
@@ -87,9 +89,8 @@ BEGIN
 			 user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, final_block_sessionid, wait_status, global_sessionid, xact_start_time, query_start_time, state FROM tt
 		WHERE level = (SELECT MAX(level) FROM tt t1 WHERE t1.sampleid =  tt.sampleid AND t1.sessionid = tt.sessionid);
   end if;
-END$DO$;
+END;
 
-DO $DO$
 DECLARE
   ans boolean;
   user_name text;
@@ -105,12 +106,11 @@ BEGIN
     GRANT SELECT ON TABLE pg_catalog.gs_asp TO PUBLIC;
 
   end if;
-END$DO$;
+END;
 
 DROP EXTENSION IF EXISTS security_plugin CASCADE;
 
 CREATE EXTENSION IF NOT EXISTS security_plugin;
-DO $DO$
 DECLARE
   ans boolean;
 BEGIN
@@ -379,7 +379,7 @@ BEGIN
           END; $$
         LANGUAGE 'plpgsql' NOT FENCED;
     end if;
-END$DO$;
+END;
 
 
 -- gs_stack_int8
@@ -416,7 +416,6 @@ CREATE OR REPLACE FUNCTION pg_catalog.gs_stack(OUT tid bigint, OUT lwtid bigint,
 AS $function$gs_stack$function$;
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
 ------------------------------------------------------------------------------------------------------------------------------------
-DO $DO$
 DECLARE
   ans boolean;
   user_name text;
@@ -504,7 +503,7 @@ END IF;
 GRANT SELECT ON pg_catalog.pg_replication_slots TO PUBLIC;
 
 -----------------------------------------------------------------------------
-END$DO$;
+END;
 DROP VIEW IF EXISTS pg_catalog.gs_session_cpu_statistics cascade;
 CREATE VIEW pg_catalog.gs_session_cpu_statistics AS
 SELECT
@@ -706,3 +705,5 @@ AS $function$gs_block_dw_io$function$;
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
 
 DROP EXTENSION IF EXISTS hdfs_fdw;
+END IF;
+END$upgrade$;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_799.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_799.sql
index 0f8c17db39664095c5c03d6f435a1d090cf4f2d3..8c4e538aa933ba45e3032f85651867de77359b24 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_799.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_799.sql
@@ -1,3 +1,6 @@
+DO $upgrade$
+BEGIN
+IF working_version_num() < 92608 THEN
 DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 7732;
 CREATE OR REPLACE FUNCTION pg_catalog.get_client_info()
@@ -51,7 +54,6 @@ comment on function PG_CATALOG.pg_ls_waldir() is 'list of files in the WAL direc
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
 
 ------------------------------------------------------------------------------------------------------------------------------------
-DO $DO$
 DECLARE
 ans boolean;
 BEGIN
@@ -87,9 +89,8 @@ BEGIN
 			 user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, final_block_sessionid, wait_status, global_sessionid, xact_start_time, query_start_time, state FROM tt
 		WHERE level = (SELECT MAX(level) FROM tt t1 WHERE t1.sampleid =  tt.sampleid AND t1.sessionid = tt.sessionid);
   end if;
-END$DO$;
+END;
 
-DO $DO$
 DECLARE
   ans boolean;
   user_name text;
@@ -105,12 +106,11 @@ BEGIN
     GRANT SELECT ON TABLE pg_catalog.gs_asp TO PUBLIC;
 
   end if;
-END$DO$;
+END;
 
 DROP EXTENSION IF EXISTS security_plugin CASCADE;
 
 CREATE EXTENSION IF NOT EXISTS security_plugin;
-DO $DO$
 DECLARE
   ans boolean;
 BEGIN
@@ -379,7 +379,7 @@ BEGIN
           END; $$
         LANGUAGE 'plpgsql' NOT FENCED;
     end if;
-END$DO$;
+END;
 
 
 -- gs_stack_int8
@@ -416,7 +416,6 @@ CREATE OR REPLACE FUNCTION pg_catalog.gs_stack(OUT tid bigint, OUT lwtid bigint,
 AS $function$gs_stack$function$;
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
 ------------------------------------------------------------------------------------------------------------------------------------
-DO $DO$
 DECLARE
   ans boolean;
   user_name text;
@@ -504,7 +503,7 @@ END IF;
 GRANT SELECT ON pg_catalog.pg_replication_slots TO PUBLIC;
 
 -----------------------------------------------------------------------------
-END$DO$;
+END;
 DROP VIEW IF EXISTS pg_catalog.gs_session_cpu_statistics cascade;
 CREATE VIEW pg_catalog.gs_session_cpu_statistics AS
 SELECT
@@ -706,3 +705,5 @@ AS $function$gs_block_dw_io$function$;
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
 
 DROP EXTENSION IF EXISTS hdfs_fdw;
+END IF;
+END$upgrade$;