From 08ea70aa710170d91f473b359e03e43c8dffeaa8 Mon Sep 17 00:00:00 2001
From: lin-qiang123 <1667704220@qq.com>
Date: Mon, 23 Jun 2025 16:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=87=E7=BA=A7=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rollback-post_catalog_maindb_92_967.sql   | 24 +++++++++----------
 .../rollback-post_catalog_otherdb_92_967.sql  | 24 +++++++++----------
 .../upgrade-post_catalog_maindb_92_967.sql    |  6 +++++
 .../upgrade-post_catalog_otherdb_92_967.sql   |  6 +++++
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_967.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_967.sql
index 1bd356568..04ab90b94 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_967.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_967.sql
@@ -1,3 +1,7 @@
+DO $upgrade$
+BEGIN
+IF working_version_num() < 92967 then
+
 DROP OPERATOR FAMILY IF EXISTS pg_catalog.vector_ops USING btree CASCADE; 
 DROP OPERATOR CLASS IF EXISTS pg_catalog.vector_ops USING btree CASCADE;
 DROP OPERATOR FAMILY IF EXISTS pg_catalog.vector_ops USING ubtree CASCADE;
@@ -7,7 +11,6 @@ DROP OPERATOR CLASS IF EXISTS pg_catalog.sparsevec_ops USING btree CASCADE;
 DROP OPERATOR FAMILY IF EXISTS pg_catalog.sparsevec_ops USING ubtree CASCADE; 
 DROP OPERATOR CLASS IF EXISTS pg_catalog.sparsevec_ops USING ubtree CASCADE; 
 
-DO $$
 DECLARE
     cnt int;
 BEGIN
@@ -22,9 +25,8 @@ BEGIN
         DROP OPERATOR FAMILY IF EXISTS pg_catalog.bit_hamming_ops USING ivfflat CASCADE; 
         DROP OPERATOR CLASS IF EXISTS pg_catalog.bit_hamming_ops USING ivfflat CASCADE; 
     end if;
-END$$;
+END;
 
-DO $$
 DECLARE
     cnt int;
 BEGIN
@@ -51,9 +53,8 @@ BEGIN
         DROP OPERATOR FAMILY IF EXISTS pg_catalog.sparsevec_l1_ops USING hnsw CASCADE;
         DROP OPERATOR CLASS IF EXISTS pg_catalog.sparsevec_l1_ops USING hnsw CASCADE;
     end if;
-END$$;
+END;
 
-DO $$
 DECLARE
 ans boolean;
 BEGIN
@@ -87,12 +88,11 @@ BEGIN
         DROP OPERATOR IF EXISTS pg_catalog.>=(sparsevec, sparsevec) CASCADE;
         DROP OPERATOR IF EXISTS pg_catalog.>(sparsevec, sparsevec) CASCADE;
     end if;
-END$$;
+END;
 
 DROP FUNCTION IF EXISTS pg_catalog.sparsevec_in(cstring, oid, int4) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.sparsevec_typmod_in(_cstring) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.sparsevec_recv(internal, oid, int4) CASCADE;
-DO $$
 DECLARE
 ans boolean;
 BEGIN
@@ -101,11 +101,10 @@ BEGIN
         DROP FUNCTION IF EXISTS pg_catalog.sparsevec_out(pg_catalog.sparsevec) CASCADE;
         DROP FUNCTION IF EXISTS pg_catalog.sparsevec_send(pg_catalog.sparsevec) CASCADE;
     end if;
-END$$;
+END;
 DROP TYPE IF EXISTS pg_catalog.sparsevec CASCADE;
 DROP TYPE IF EXISTS pg_catalog._sparsevec CASCADE;
 
-DO $$
 DECLARE
 ans boolean;
 BEGIN
@@ -160,12 +159,11 @@ BEGIN
         drop aggregate if exists pg_catalog.avg(vector) CASCADE;
         drop aggregate if exists pg_catalog.sum(vector) CASCADE;
     end if;
-END$$;
+END;
 
 DROP FUNCTION IF EXISTS pg_catalog.vector_in(cstring, oid, int4) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.vector_typmod_in(_cstring) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.vector_recv(internal, oid, int4) CASCADE;
-DO $$
 DECLARE
 ans boolean;
 BEGIN
@@ -174,7 +172,7 @@ BEGIN
         DROP FUNCTION IF EXISTS pg_catalog.vector_out(pg_catalog.vector) CASCADE;
         DROP FUNCTION IF EXISTS pg_catalog.vector_send(pg_catalog.vector) CASCADE;
     end if;
-END$$;
+END;
 DROP TYPE IF EXISTS pg_catalog.vector CASCADE;
 DROP TYPE IF EXISTS pg_catalog._vector CASCADE;
 
@@ -221,3 +219,5 @@ DROP FUNCTION IF EXISTS pg_catalog.hnsw_sparsevec_support(internal) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.hamming_distance(bit, bit) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.jaccard_distance(bit, bit) CASCADE;
 
+END IF;
+END $upgrade$;
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_967.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_967.sql
index 1bd356568..04ab90b94 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_967.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_967.sql
@@ -1,3 +1,7 @@
+DO $upgrade$
+BEGIN
+IF working_version_num() < 92967 then
+
 DROP OPERATOR FAMILY IF EXISTS pg_catalog.vector_ops USING btree CASCADE; 
 DROP OPERATOR CLASS IF EXISTS pg_catalog.vector_ops USING btree CASCADE;
 DROP OPERATOR FAMILY IF EXISTS pg_catalog.vector_ops USING ubtree CASCADE;
@@ -7,7 +11,6 @@ DROP OPERATOR CLASS IF EXISTS pg_catalog.sparsevec_ops USING btree CASCADE;
 DROP OPERATOR FAMILY IF EXISTS pg_catalog.sparsevec_ops USING ubtree CASCADE; 
 DROP OPERATOR CLASS IF EXISTS pg_catalog.sparsevec_ops USING ubtree CASCADE; 
 
-DO $$
 DECLARE
     cnt int;
 BEGIN
@@ -22,9 +25,8 @@ BEGIN
         DROP OPERATOR FAMILY IF EXISTS pg_catalog.bit_hamming_ops USING ivfflat CASCADE; 
         DROP OPERATOR CLASS IF EXISTS pg_catalog.bit_hamming_ops USING ivfflat CASCADE; 
     end if;
-END$$;
+END;
 
-DO $$
 DECLARE
     cnt int;
 BEGIN
@@ -51,9 +53,8 @@ BEGIN
         DROP OPERATOR FAMILY IF EXISTS pg_catalog.sparsevec_l1_ops USING hnsw CASCADE;
         DROP OPERATOR CLASS IF EXISTS pg_catalog.sparsevec_l1_ops USING hnsw CASCADE;
     end if;
-END$$;
+END;
 
-DO $$
 DECLARE
 ans boolean;
 BEGIN
@@ -87,12 +88,11 @@ BEGIN
         DROP OPERATOR IF EXISTS pg_catalog.>=(sparsevec, sparsevec) CASCADE;
         DROP OPERATOR IF EXISTS pg_catalog.>(sparsevec, sparsevec) CASCADE;
     end if;
-END$$;
+END;
 
 DROP FUNCTION IF EXISTS pg_catalog.sparsevec_in(cstring, oid, int4) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.sparsevec_typmod_in(_cstring) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.sparsevec_recv(internal, oid, int4) CASCADE;
-DO $$
 DECLARE
 ans boolean;
 BEGIN
@@ -101,11 +101,10 @@ BEGIN
         DROP FUNCTION IF EXISTS pg_catalog.sparsevec_out(pg_catalog.sparsevec) CASCADE;
         DROP FUNCTION IF EXISTS pg_catalog.sparsevec_send(pg_catalog.sparsevec) CASCADE;
     end if;
-END$$;
+END;
 DROP TYPE IF EXISTS pg_catalog.sparsevec CASCADE;
 DROP TYPE IF EXISTS pg_catalog._sparsevec CASCADE;
 
-DO $$
 DECLARE
 ans boolean;
 BEGIN
@@ -160,12 +159,11 @@ BEGIN
         drop aggregate if exists pg_catalog.avg(vector) CASCADE;
         drop aggregate if exists pg_catalog.sum(vector) CASCADE;
     end if;
-END$$;
+END;
 
 DROP FUNCTION IF EXISTS pg_catalog.vector_in(cstring, oid, int4) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.vector_typmod_in(_cstring) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.vector_recv(internal, oid, int4) CASCADE;
-DO $$
 DECLARE
 ans boolean;
 BEGIN
@@ -174,7 +172,7 @@ BEGIN
         DROP FUNCTION IF EXISTS pg_catalog.vector_out(pg_catalog.vector) CASCADE;
         DROP FUNCTION IF EXISTS pg_catalog.vector_send(pg_catalog.vector) CASCADE;
     end if;
-END$$;
+END;
 DROP TYPE IF EXISTS pg_catalog.vector CASCADE;
 DROP TYPE IF EXISTS pg_catalog._vector CASCADE;
 
@@ -221,3 +219,5 @@ DROP FUNCTION IF EXISTS pg_catalog.hnsw_sparsevec_support(internal) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.hamming_distance(bit, bit) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.jaccard_distance(bit, bit) CASCADE;
 
+END IF;
+END $upgrade$;
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_967.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_967.sql
index e887f391f..b941d7e3b 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_967.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_967.sql
@@ -1,3 +1,7 @@
+DO $upgrade$
+BEGIN
+IF working_version_num() < 92967 then
+
 DROP TYPE IF EXISTS pg_catalog.vector CASCADE;
 SET LOCAL inplace_upgrade_next_system_object_oids=IUO_TYPE, 8305, 8308, b;
 CREATE TYPE pg_catalog.vector;
@@ -1435,3 +1439,5 @@ CREATE OPERATOR CLASS pg_catalog.sparsevec_l1_ops
 	OPERATOR 1 pg_catalog.<+>(sparsevec, sparsevec) FOR ORDER BY float_ops,
 	FUNCTION 1 pg_catalog.l1_distance(sparsevec, sparsevec),
 	FUNCTION 3 pg_catalog.hnsw_sparsevec_support(internal);
+END IF;
+END $upgrade$;
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_967.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_967.sql
index e887f391f..b941d7e3b 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_967.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_967.sql
@@ -1,3 +1,7 @@
+DO $upgrade$
+BEGIN
+IF working_version_num() < 92967 then
+
 DROP TYPE IF EXISTS pg_catalog.vector CASCADE;
 SET LOCAL inplace_upgrade_next_system_object_oids=IUO_TYPE, 8305, 8308, b;
 CREATE TYPE pg_catalog.vector;
@@ -1435,3 +1439,5 @@ CREATE OPERATOR CLASS pg_catalog.sparsevec_l1_ops
 	OPERATOR 1 pg_catalog.<+>(sparsevec, sparsevec) FOR ORDER BY float_ops,
 	FUNCTION 1 pg_catalog.l1_distance(sparsevec, sparsevec),
 	FUNCTION 3 pg_catalog.hnsw_sparsevec_support(internal);
+END IF;
+END $upgrade$;
\ No newline at end of file