diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c7954a2e..2d47c1382 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,10 +102,7 @@ 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--1.2.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.3.sql DESTINATION share/postgresql/extension/ ) install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/upgrade_script/dolphin--1.0--1.2.sql @@ -114,10 +111,22 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/contrib/dolphin) install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/rollback_script/dolphin--1.2--1.0.sql DESTINATION share/postgresql/extension/ ) - install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/upgrade_script/dolphin--1.2--2.0.sql + install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/upgrade_script/dolphin--1.2--1.3.sql DESTINATION share/postgresql/extension/ ) - install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/rollback_script/dolphin--2.0--1.2.sql + install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/rollback_script/dolphin--1.3--1.2.sql + DESTINATION share/postgresql/extension/ + ) + install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/upgrade_script/dolphin--1.3--2.0.sql + DESTINATION share/postgresql/extension/ + ) + install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/rollback_script/dolphin--2.0--1.3.sql + DESTINATION share/postgresql/extension/ + ) + install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/upgrade_script/dolphin--2.0--3.0.sql + DESTINATION share/postgresql/extension/ + ) + install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/rollback_script/dolphin--3.0--2.0.sql DESTINATION share/postgresql/extension/ ) install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/openGauss_expr_dolphin.ir diff --git a/build/script/aarch64_finance_list b/build/script/aarch64_finance_list index b7b71e975..db322441f 100644 --- a/build/script/aarch64_finance_list +++ b/build/script/aarch64_finance_list @@ -70,12 +70,15 @@ ./share/postgresql/extension/security_plugin.control ./share/postgresql/extension/security_plugin--1.0.sql ./share/postgresql/extension/dolphin.control -./share/postgresql/extension/dolphin--1.0.sql -./share/postgresql/extension/dolphin--1.2.sql +./share/postgresql/extension/dolphin--1.3.sql ./share/postgresql/extension/dolphin--1.0--1.2.sql ./share/postgresql/extension/dolphin--1.2--1.0.sql -./share/postgresql/extension/dolphin--2.0--1.2.sql -./share/postgresql/extension/dolphin--1.2--2.0.sql +./share/postgresql/extension/dolphin--1.2--1.3.sql +./share/postgresql/extension/dolphin--1.3--1.2.sql +./share/postgresql/extension/dolphin--2.0--1.3.sql +./share/postgresql/extension/dolphin--1.3--2.0.sql +./share/postgresql/extension/dolphin--2.0--3.0.sql +./share/postgresql/extension/dolphin--3.0--2.0.sql ./share/postgresql/extension/openGauss_expr_dolphin.ir ./share/postgresql/extension/assessment--1.0.sql ./share/postgresql/extension/assessment.control diff --git a/build/script/aarch64_lite_list b/build/script/aarch64_lite_list index 9c05ad839..97d04b9e4 100644 --- a/build/script/aarch64_lite_list +++ b/build/script/aarch64_lite_list @@ -33,12 +33,15 @@ ./share/postgresql/extension/security_plugin.control ./share/postgresql/extension/security_plugin--1.0.sql ./share/postgresql/extension/dolphin.control -./share/postgresql/extension/dolphin--1.2.sql -./share/postgresql/extension/dolphin--1.0.sql +./share/postgresql/extension/dolphin--1.3.sql ./share/postgresql/extension/dolphin--1.0--1.2.sql ./share/postgresql/extension/dolphin--1.2--1.0.sql -./share/postgresql/extension/dolphin--2.0--1.2.sql -./share/postgresql/extension/dolphin--1.2--2.0.sql +./share/postgresql/extension/dolphin--1.2--1.3.sql +./share/postgresql/extension/dolphin--1.3--1.2.sql +./share/postgresql/extension/dolphin--2.0--1.3.sql +./share/postgresql/extension/dolphin--1.3--2.0.sql +./share/postgresql/extension/dolphin--2.0--3.0.sql +./share/postgresql/extension/dolphin--3.0--2.0.sql ./share/postgresql/extension/openGauss_expr_dolphin.ir ./share/postgresql/extension/file_fdw--1.0.sql ./share/postgresql/extension/plpgsql.control diff --git a/build/script/aarch64_opengauss_list b/build/script/aarch64_opengauss_list index 2688f79cf..fc8390d2b 100644 --- a/build/script/aarch64_opengauss_list +++ b/build/script/aarch64_opengauss_list @@ -71,12 +71,15 @@ ./share/postgresql/extension/security_plugin.control ./share/postgresql/extension/security_plugin--1.0.sql ./share/postgresql/extension/dolphin.control -./share/postgresql/extension/dolphin--1.0.sql -./share/postgresql/extension/dolphin--1.2.sql +./share/postgresql/extension/dolphin--1.3.sql ./share/postgresql/extension/dolphin--1.0--1.2.sql ./share/postgresql/extension/dolphin--1.2--1.0.sql -./share/postgresql/extension/dolphin--2.0--1.2.sql -./share/postgresql/extension/dolphin--1.2--2.0.sql +./share/postgresql/extension/dolphin--1.2--1.3.sql +./share/postgresql/extension/dolphin--1.3--1.2.sql +./share/postgresql/extension/dolphin--2.0--1.3.sql +./share/postgresql/extension/dolphin--1.3--2.0.sql +./share/postgresql/extension/dolphin--2.0--3.0.sql +./share/postgresql/extension/dolphin--3.0--2.0.sql ./share/postgresql/extension/openGauss_expr_dolphin.ir ./share/postgresql/extension/assessment--1.0.sql ./share/postgresql/extension/assessment.control diff --git a/build/script/opengauss_release_list_ubuntu_single b/build/script/opengauss_release_list_ubuntu_single index ebee9e73e..b78ec77c1 100644 --- a/build/script/opengauss_release_list_ubuntu_single +++ b/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--1.0.sql -./share/postgresql/extension/dolphin--1.2.sql +./share/postgresql/extension/dolphin--1.3.sql ./share/postgresql/extension/dolphin--1.0--1.2.sql ./share/postgresql/extension/dolphin--1.2--1.0.sql -./share/postgresql/extension/dolphin--2.0--1.2.sql -./share/postgresql/extension/dolphin--1.2--2.0.sql +./share/postgresql/extension/dolphin--1.2--1.3.sql +./share/postgresql/extension/dolphin--1.3--1.2.sql +./share/postgresql/extension/dolphin--2.0--1.3.sql +./share/postgresql/extension/dolphin--1.3--2.0.sql +./share/postgresql/extension/dolphin--2.0--3.0.sql +./share/postgresql/extension/dolphin--3.0--2.0.sql ./share/postgresql/extension/openGauss_expr_dolphin.ir ./share/postgresql/extension/file_fdw--1.0.sql ./share/postgresql/extension/plpgsql.control diff --git a/build/script/x86_64_finance_list b/build/script/x86_64_finance_list index 6d9b53b78..87589c297 100644 --- a/build/script/x86_64_finance_list +++ b/build/script/x86_64_finance_list @@ -70,12 +70,15 @@ ./share/postgresql/extension/security_plugin.control ./share/postgresql/extension/security_plugin--1.0.sql ./share/postgresql/extension/dolphin.control -./share/postgresql/extension/dolphin--1.0.sql -./share/postgresql/extension/dolphin--1.2.sql +./share/postgresql/extension/dolphin--1.3.sql ./share/postgresql/extension/dolphin--1.0--1.2.sql ./share/postgresql/extension/dolphin--1.2--1.0.sql -./share/postgresql/extension/dolphin--2.0--1.2.sql -./share/postgresql/extension/dolphin--1.2--2.0.sql +./share/postgresql/extension/dolphin--1.2--1.3.sql +./share/postgresql/extension/dolphin--1.3--1.2.sql +./share/postgresql/extension/dolphin--2.0--1.3.sql +./share/postgresql/extension/dolphin--1.3--2.0.sql +./share/postgresql/extension/dolphin--2.0--3.0.sql +./share/postgresql/extension/dolphin--3.0--2.0.sql ./share/postgresql/extension/openGauss_expr_dolphin.ir ./share/postgresql/extension/assessment--1.0.sql ./share/postgresql/extension/assessment.control diff --git a/build/script/x86_64_lite_list b/build/script/x86_64_lite_list index b8418d324..3a838f313 100644 --- a/build/script/x86_64_lite_list +++ b/build/script/x86_64_lite_list @@ -33,12 +33,15 @@ ./share/postgresql/extension/security_plugin.control ./share/postgresql/extension/security_plugin--1.0.sql ./share/postgresql/extension/dolphin.control -./share/postgresql/extension/dolphin--1.2.sql -./share/postgresql/extension/dolphin--1.0.sql +./share/postgresql/extension/dolphin--1.3.sql ./share/postgresql/extension/dolphin--1.0--1.2.sql ./share/postgresql/extension/dolphin--1.2--1.0.sql -./share/postgresql/extension/dolphin--2.0--1.2.sql -./share/postgresql/extension/dolphin--1.2--2.0.sql +./share/postgresql/extension/dolphin--1.2--1.3.sql +./share/postgresql/extension/dolphin--1.3--1.2.sql +./share/postgresql/extension/dolphin--2.0--1.3.sql +./share/postgresql/extension/dolphin--1.3--2.0.sql +./share/postgresql/extension/dolphin--2.0--3.0.sql +./share/postgresql/extension/dolphin--3.0--2.0.sql ./share/postgresql/extension/openGauss_expr_dolphin.ir ./share/postgresql/extension/file_fdw--1.0.sql ./share/postgresql/extension/plpgsql.control diff --git a/build/script/x86_64_opengauss_list b/build/script/x86_64_opengauss_list index a52d65c4c..cc1b91a70 100644 --- a/build/script/x86_64_opengauss_list +++ b/build/script/x86_64_opengauss_list @@ -71,12 +71,15 @@ ./share/postgresql/extension/security_plugin.control ./share/postgresql/extension/security_plugin--1.0.sql ./share/postgresql/extension/dolphin.control -./share/postgresql/extension/dolphin--1.0.sql -./share/postgresql/extension/dolphin--1.2.sql +./share/postgresql/extension/dolphin--1.3.sql ./share/postgresql/extension/dolphin--1.0--1.2.sql ./share/postgresql/extension/dolphin--1.2--1.0.sql -./share/postgresql/extension/dolphin--2.0--1.2.sql -./share/postgresql/extension/dolphin--1.2--2.0.sql +./share/postgresql/extension/dolphin--1.2--1.3.sql +./share/postgresql/extension/dolphin--1.3--1.2.sql +./share/postgresql/extension/dolphin--2.0--1.3.sql +./share/postgresql/extension/dolphin--1.3--2.0.sql +./share/postgresql/extension/dolphin--2.0--3.0.sql +./share/postgresql/extension/dolphin--3.0--2.0.sql ./share/postgresql/extension/openGauss_expr_dolphin.ir ./share/postgresql/extension/assessment--1.0.sql ./share/postgresql/extension/assessment.control diff --git a/src/common/backend/utils/init/globals.cpp b/src/common/backend/utils/init/globals.cpp index faf4ed6cf..cc23f3387 100644 --- a/src/common/backend/utils/init/globals.cpp +++ b/src/common/backend/utils/init/globals.cpp @@ -74,7 +74,7 @@ bool will_shutdown = false; * NEXT | 92899 | ? | ? * ********************************************/ -const uint32 GRAND_VERSION_NUM = 92854; +const uint32 GRAND_VERSION_NUM = 92855; /******************************************** * 2.VERSION NUM FOR EACH FEATURE diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_855.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_855.sql new file mode 100644 index 000000000..d30885ae0 --- /dev/null +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_855.sql @@ -0,0 +1,12 @@ +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 '1.2'; + end if; + exit; + END LOOP; +END$$; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_855.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_855.sql new file mode 100644 index 000000000..d30885ae0 --- /dev/null +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_855.sql @@ -0,0 +1,12 @@ +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 '1.2'; + end if; + exit; + END LOOP; +END$$; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_855.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_855.sql new file mode 100644 index 000000000..dbf6eee1f --- /dev/null +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_855.sql @@ -0,0 +1,12 @@ +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 '1.3'; + end if; + exit; + END LOOP; +END$$; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_855.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_855.sql new file mode 100644 index 000000000..dbf6eee1f --- /dev/null +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_855.sql @@ -0,0 +1,12 @@ +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 '1.3'; + end if; + exit; + END LOOP; +END$$; \ No newline at end of file