5.1.0 版本适配 openEuler RISC-V 22.03 v2

CMakeLists.txt

@@ -111,16 +111,22 @@ 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.1.sql
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--2.0.sql
         DESTINATION share/postgresql/extension/
     )
     install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--1.0.sql
         DESTINATION share/postgresql/extension/
     )
-    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/upgrade_script/dolphin--1.0--1.1.sql
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--1.0--2.0.sql
         DESTINATION share/postgresql/extension/
     )
-    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/rollback_script/dolphin--1.1--1.0.sql
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--2.0--1.0.sql
+        DESTINATION share/postgresql/extension/
+    )
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--1.1--2.0.sql
+        DESTINATION share/postgresql/extension/
+    )
+    install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin--2.0--1.1.sql
         DESTINATION share/postgresql/extension/
     )
     install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/openGauss_expr_dolphin.ir

GNUmakefile.in

@@ -96,6 +96,7 @@ install:
 	$(MAKE) -C contrib/dblink $@
 	$(MAKE) -C contrib/ndpplugin $@
 	@if test -d contrib/dolphin; then $(MAKE) -C contrib/dolphin $@; fi
+	@if test -d contrib/whale; then $(MAKE) -C contrib/whale $@; fi
 	+@echo "openGauss installation complete."
 endif
 endif

build/script/aarch64_lite_list

@@ -33,10 +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--1.1.sql
+./share/postgresql/extension/dolphin--2.0.sql
 ./share/postgresql/extension/dolphin--1.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.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--1.1--2.0.sql
+./share/postgresql/extension/dolphin--2.0--1.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
 ./share/postgresql/extension/plpgsql.control

build/script/aarch64_opengauss_list

@@ -45,6 +45,9 @@
 ./bin/server.key.cipher
 ./bin/server.key.rand
 ./bin/gs_plan_simulator.sh
+./bin/pg_xlogdump
+./bin/pagehack
+./bin/gs_assessment
 ./etc/kerberos/kadm5.acl  
 ./etc/kerberos/kdc.conf  
 ./etc/kerberos/krb5.conf  
@@ -69,11 +72,19 @@
 ./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.1.sql
-./share/postgresql/extension/dolphin--1.0--1.1.sql
-./share/postgresql/extension/dolphin--1.1--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--1.1--2.0.sql
+./share/postgresql/extension/dolphin--2.0--1.1.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
 ./share/postgresql/extension/file_fdw--1.0.sql
 ./share/postgresql/extension/plpgsql.control
 ./share/postgresql/extension/dist_fdw.control
@@ -764,11 +775,13 @@
 ./lib/postgresql/proc_srclib
 ./lib/postgresql/security_plugin.so
 ./lib/postgresql/dolphin.so
+./lib/postgresql/whale.so
 ./lib/postgresql/pg_upgrade_support.so
 ./lib/postgresql/java/pljava.jar
 ./lib/postgresql/postgres_fdw.so
 ./lib/postgresql/dblink.so
 ./lib/postgresql/pgoutput.so
+./lib/postgresql/assessment.so
 ./lib/libpljava.so
 ./lib/libpq.a
 ./lib/libpq.so

build/script/cmake_package_mini.sh

@@ -48,6 +48,8 @@ elif [ X"$kernel" == X"centos" ]; then
     dist_version="CentOS"
 elif [ X"$kernel" == X"openeuler" ]; then
     dist_version="openEuler"
+elif [ X"$kernel" == X"kylin" ]; then
+    dist_version="kylin"
 else
     dist_version="Platform"
 fi
@@ -271,6 +273,13 @@ read_mpp_version
 
 if [ "$gcc_version" == "7.3.0" ]; then
     gcc_version=${gcc_version:0:3}
+elif [ "$gcc_version" == "8.3.0" ]; then
+    if [ $PLATFORM_ARCH == "loongarch64" ];then 
+        gcc_version=${gcc_version:0:3}
+    else
+        echo "Only loongarch model use gcc8.3"
+        exit 1
+    fi 
 elif [ "$gcc_version" == "10.3.0" ] || [ "$gcc_version" == "10.3.1" ]; then
     gcc_version=${gcc_version:0:4}
 else
@@ -462,6 +471,15 @@ function install_gaussdb()
     if [[ -e "/etc/openEuler-release" && "$(cat /etc/openEuler-release | awk '{print $3}')" == "22.03" ]]; then
         CMAKE_OPT="$CMAKE_OPT -DENABLE_OPENEULER_MAJOR=ON"
     fi
+
+    if [ "${PLATFORM_ARCH}"x == "loongarch64"x ]; then
+       CMAKE_OPT="$CMAKE_OPT -DENABLE_BBOX=OFF -DENABLE_JEMALLOC=OFF"
+    fi
+
+    if [ "${PLATFORM_ARCH}"x == "riscv64"x ]; then
+       CMAKE_OPT="$CMAKE_OPT -DENABLE_BBOX=OFF"
+    fi
+
     echo "CMAKE_OPT----> $CMAKE_OPT"
     echo "Begin run cmake for gaussdb server" >> "$LOG_FILE" 2>&1
     echo "CMake options: ${CMAKE_OPT}" >> "$LOG_FILE" 2>&1