!4243 master分支适配dolphin3.0升级

Merge pull request !4243 from chenxiaobin/dolphin300

CMakeLists.txt

@@ -111,16 +111,13 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/contrib/dolphin)
     install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin.control
         DESTINATION share/postgresql/extension/
     )
-    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--2.0.sql
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--3.0.sql
         DESTINATION share/postgresql/extension/
     )
-    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--1.0.sql
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--1.0--1.1.sql
         DESTINATION share/postgresql/extension/
     )
-    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--1.0--2.0.sql
-        DESTINATION share/postgresql/extension/
-    )
-    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--2.0--1.0.sql
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--1.1--1.0.sql
         DESTINATION share/postgresql/extension/
     )
     install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--1.1--2.0.sql
@@ -129,6 +126,12 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/contrib/dolphin)
     install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--2.0--1.1.sql
         DESTINATION share/postgresql/extension/
     )
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--2.0--3.0.sql
+        DESTINATION share/postgresql/extension/
+    )
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--3.0--2.0.sql
+        DESTINATION share/postgresql/extension/
+    )
     install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/openGauss_expr_dolphin.ir
         DESTINATION share/postgresql/extension/
     )

build/script/aarch64_lite_list

@@ -33,13 +33,14 @@
 ./share/postgresql/extension/security_plugin.control
 ./share/postgresql/extension/security_plugin--1.0.sql
 ./share/postgresql/extension/dolphin.control
-./share/postgresql/extension/dolphin--2.0.sql
-./share/postgresql/extension/dolphin--1.0.sql
-./share/postgresql/extension/dolphin--1.0--2.0.sql
-./share/postgresql/extension/dolphin--2.0--1.0.sql
-./share/postgresql/extension/dolphin--2.0--2.0.1.sql
+./share/postgresql/extension/dolphin--3.0.sql
+./share/postgresql/extension/dolphin--1.0--1.1.sql
+./share/postgresql/extension/dolphin--1.1--1.0.sql
 ./share/postgresql/extension/dolphin--1.1--2.0.sql
 ./share/postgresql/extension/dolphin--2.0--1.1.sql
+./share/postgresql/extension/dolphin--2.0--3.0.sql
+./share/postgresql/extension/dolphin--3.0--2.0.sql
+./share/postgresql/extension/dolphin--2.0--2.0.1.sql
 ./share/postgresql/extension/dolphin--2.0.1--2.0.sql
 ./share/postgresql/extension/openGauss_expr_dolphin.ir
 ./share/postgresql/extension/file_fdw--1.0.sql

build/script/aarch64_opengauss_list

@@ -72,16 +72,17 @@
 ./share/postgresql/extension/ndpplugin.control
 ./share/postgresql/extension/ndpplugin--1.0.sql
 ./share/postgresql/extension/dolphin.control
-./share/postgresql/extension/dolphin--2.0.sql
-./share/postgresql/extension/dolphin--1.0.sql
-./share/postgresql/extension/dolphin--1.0--2.0.sql
-./share/postgresql/extension/dolphin--2.0--1.0.sql
-./share/postgresql/extension/dolphin--2.0--2.0.1.sql
+./share/postgresql/extension/dolphin--3.0.sql
+./share/postgresql/extension/dolphin--1.0--1.1.sql
+./share/postgresql/extension/dolphin--1.1--1.0.sql
 ./share/postgresql/extension/dolphin--1.1--2.0.sql
 ./share/postgresql/extension/dolphin--2.0--1.1.sql
+./share/postgresql/extension/dolphin--2.0--3.0.sql
+./share/postgresql/extension/dolphin--3.0--2.0.sql
+./share/postgresql/extension/dolphin--2.0--2.0.1.sql
+./share/postgresql/extension/dolphin--2.0.1--2.0.sql
 ./share/postgresql/extension/whale.control
 ./share/postgresql/extension/whale--1.0.sql
-./share/postgresql/extension/dolphin--2.0.1--2.0.sql
 ./share/postgresql/extension/openGauss_expr_dolphin.ir
 ./share/postgresql/extension/assessment--1.0.sql
 ./share/postgresql/extension/assessment.control

build/script/opengauss_release_list_ubuntu_single

@@ -61,12 +61,15 @@
 ./share/postgresql/extension/security_plugin.control
 ./share/postgresql/extension/security_plugin--1.0.sql
 ./share/postgresql/extension/dolphin.control
-./share/postgresql/extension/dolphin--2.0.sql
-./share/postgresql/extension/dolphin--1.0.sql
-./share/postgresql/extension/dolphin--1.0--2.0.sql
-./share/postgresql/extension/dolphin--2.0--1.0.sql
+./share/postgresql/extension/dolphin--3.0.sql
+./share/postgresql/extension/dolphin--1.0--1.1.sql
+./share/postgresql/extension/dolphin--1.1--1.0.sql
 ./share/postgresql/extension/dolphin--1.1--2.0.sql
 ./share/postgresql/extension/dolphin--2.0--1.1.sql
+./share/postgresql/extension/dolphin--2.0--3.0.sql
+./share/postgresql/extension/dolphin--3.0--2.0.sql
+./share/postgresql/extension/dolphin--2.0--2.0.1.sql
+./share/postgresql/extension/dolphin--2.0.1--2.0.sql
 ./share/postgresql/extension/whale.control
 ./share/postgresql/extension/whale--1.0.sql
 ./share/postgresql/extension/openGauss_expr_dolphin.ir

build/script/x86_64_lite_list

@@ -33,13 +33,14 @@
 ./share/postgresql/extension/security_plugin.control
 ./share/postgresql/extension/security_plugin--1.0.sql
 ./share/postgresql/extension/dolphin.control
-./share/postgresql/extension/dolphin--2.0.sql
-./share/postgresql/extension/dolphin--1.0.sql
-./share/postgresql/extension/dolphin--1.0--2.0.sql
-./share/postgresql/extension/dolphin--2.0--1.0.sql
-./share/postgresql/extension/dolphin--2.0--2.0.1.sql
+./share/postgresql/extension/dolphin--3.0.sql
+./share/postgresql/extension/dolphin--1.0--1.1.sql
+./share/postgresql/extension/dolphin--1.1--1.0.sql
 ./share/postgresql/extension/dolphin--1.1--2.0.sql
 ./share/postgresql/extension/dolphin--2.0--1.1.sql
+./share/postgresql/extension/dolphin--2.0--3.0.sql
+./share/postgresql/extension/dolphin--3.0--2.0.sql
+./share/postgresql/extension/dolphin--2.0--2.0.1.sql
 ./share/postgresql/extension/dolphin--2.0.1--2.0.sql
 ./share/postgresql/extension/openGauss_expr_dolphin.ir
 ./share/postgresql/extension/file_fdw--1.0.sql

build/script/x86_64_opengauss_list

@@ -72,16 +72,17 @@
 ./share/postgresql/extension/ndpplugin.control
 ./share/postgresql/extension/ndpplugin--1.0.sql
 ./share/postgresql/extension/dolphin.control
-./share/postgresql/extension/dolphin--2.0.sql
-./share/postgresql/extension/dolphin--1.0.sql
-./share/postgresql/extension/dolphin--1.0--2.0.sql
-./share/postgresql/extension/dolphin--2.0--1.0.sql
-./share/postgresql/extension/dolphin--2.0--2.0.1.sql
+./share/postgresql/extension/dolphin--3.0.sql
+./share/postgresql/extension/dolphin--1.0--1.1.sql
+./share/postgresql/extension/dolphin--1.1--1.0.sql
 ./share/postgresql/extension/dolphin--1.1--2.0.sql
 ./share/postgresql/extension/dolphin--2.0--1.1.sql
+./share/postgresql/extension/dolphin--2.0--3.0.sql
+./share/postgresql/extension/dolphin--3.0--2.0.sql
+./share/postgresql/extension/dolphin--2.0--2.0.1.sql
+./share/postgresql/extension/dolphin--2.0.1--2.0.sql
 ./share/postgresql/extension/whale.control
 ./share/postgresql/extension/whale--1.0.sql
-./share/postgresql/extension/dolphin--2.0.1--2.0.sql
 ./share/postgresql/extension/openGauss_expr_dolphin.ir
 ./share/postgresql/extension/assessment--1.0.sql
 ./share/postgresql/extension/assessment.control

src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_914.sql

@@ -589,4 +589,17 @@ BEGIN
             GRANT SELECT ON TABLE DBE_PERF.statement_history TO PUBLIC;
         END IF;
     END IF;
-END $DO$;
+END $DO$;
+
+do $$
+DECLARE
+ans boolean;
+BEGIN
+    for ans in select case when count(*)=1 then true else false end as ans  from (select extname from pg_extension where extname='dolphin')
+    LOOP
+        if ans = true then
+            ALTER EXTENSION dolphin UPDATE TO '2.0';
+        end if;
+        exit;
+    END LOOP;
+END$$;

src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_914.sql

@@ -589,4 +589,17 @@ EXECUTE IMMEDIATE querystr;
 GRANT SELECT ON TABLE DBE_PERF.statement_history TO PUBLIC;
 END IF;
 END IF;
-END $DO$;
+END $DO$;
+
+do $$
+DECLARE
+ans boolean;
+BEGIN
+    for ans in select case when count(*)=1 then true else false end as ans  from (select extname from pg_extension where extname='dolphin')
+    LOOP
+        if ans = true then
+            ALTER EXTENSION dolphin UPDATE TO '2.0';
+        end if;
+        exit;
+    END LOOP;
+END$$;

src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_914.sql

@@ -595,4 +595,17 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
             GRANT SELECT ON TABLE DBE_PERF.statement_history TO PUBLIC;
         END IF;
     END IF;
-END $DO$;
+END $DO$;
+
+do $$
+DECLARE
+ans boolean;
+BEGIN
+    for ans in select case when count(*)=1 then true else false end as ans  from (select extname from pg_extension where extname='dolphin')
+    LOOP
+        if ans = true then
+            ALTER EXTENSION dolphin UPDATE TO '3.0';
+        end if;
+        exit;
+    END LOOP;
+END$$;

src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_914.sql

@@ -595,4 +595,17 @@ EXECUTE IMMEDIATE querystr;
 GRANT SELECT ON TABLE DBE_PERF.statement_history TO PUBLIC;
 END IF;
 END IF;
-END $DO$;
+END $DO$;
+
+do $$
+DECLARE
+ans boolean;
+BEGIN
+    for ans in select case when count(*)=1 then true else false end as ans  from (select extname from pg_extension where extname='dolphin')
+    LOOP
+        if ans = true then
+            ALTER EXTENSION dolphin UPDATE TO '3.0';
+        end if;
+        exit;
+    END LOOP;
+END$$;