database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

实现dolphin插件基于cmakelists.txt的轻量版安装包编译

Browse Source
This commit is contained in:
WangXiuqiang
2023-04-27 18:32:14 +08:00
parent d965db7c5e
commit b611b67bf5
6 changed files with 110 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@ -96,3 +96,28 @@ execute_process(COMMAND mkdir ${CMAKE_BINARY_DIR}/libsimsearch)
install(DIRECTORY ${CMAKE_BINARY_DIR}/proc_srclib DESTINATION lib/postgresql)
install(DIRECTORY ${CMAKE_BINARY_DIR}/pg_plugin DESTINATION lib/postgresql)
install(DIRECTORY ${CMAKE_BINARY_DIR}/libsimsearch DESTINATION lib)
if(EXISTS ${CMAKE_SOURCE_DIR}/contrib/dolphin)
install(CODE "execute_process(COMMAND bash cmake.sh WORKING_DIRECTORY ${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
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
DESTINATION share/postgresql/extension/
)
install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/rollback_script/dolphin--1.1--1.0.sql
DESTINATION share/postgresql/extension/
)
install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/openGauss_expr_dolphin.ir
DESTINATION share/postgresql/extension/
)
install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/tmp_build/lib/dolphin.so
DESTINATION lib/postgresql
)
endif()

7
build/script/aarch64_lite_list
View File

@ -32,6 +32,12 @@
./share/postgresql/extension/hstore.control
./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--1.0.sql
./share/postgresql/extension/dolphin--1.0--1.1.sql
./share/postgresql/extension/dolphin--1.1--1.0.sql
./share/postgresql/extension/openGauss_expr_dolphin.ir
./share/postgresql/extension/file_fdw--1.0.sql
./share/postgresql/extension/plpgsql.control
./share/postgresql/extension/dist_fdw.control
@ -724,6 +730,7 @@
./lib/postgresql/pg_plugin
./lib/postgresql/proc_srclib
./lib/postgresql/security_plugin.so
./lib/postgresql/dolphin.so
./lib/postgresql/pg_upgrade_support.so
./lib/postgresql/latin2_and_win1250.so
./lib/postgresql/euc2004_sjis2004.so

1
build/script/cmake_package_mini.sh
View File

@ -483,7 +483,6 @@ function install_gaussdb()
if [ $? -ne 0 ]; then
die "make install failed."
fi
## check build specification
spec="gaussdbkernel"
if ( cat $SCRIPT_DIR/gauss.spec | grep 'PRODUCT' | grep 'GaussDB Kernel' >/dev/null 2>&1 ); then

7
build/script/x86_64_lite_list
View File

@ -32,6 +32,12 @@
./share/postgresql/extension/hstore.control
./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--1.0.sql
./share/postgresql/extension/dolphin--1.0--1.1.sql
./share/postgresql/extension/dolphin--1.1--1.0.sql
./share/postgresql/extension/openGauss_expr_dolphin.ir
./share/postgresql/extension/file_fdw--1.0.sql
./share/postgresql/extension/plpgsql.control
./share/postgresql/extension/dist_fdw.control
@ -723,6 +729,7 @@
./lib/postgresql/pg_plugin
./lib/postgresql/proc_srclib
./lib/postgresql/security_plugin.so
./lib/postgresql/dolphin.so
./lib/postgresql/pg_upgrade_support.so
./lib/postgresql/latin2_and_win1250.so
./lib/postgresql/euc2004_sjis2004.so

1
src/test/regress/CMakeLists.txt
View File

@ -43,6 +43,7 @@ endfunction(add_func_target_withargs_fastcheck)
MESSAGE(STATUS ${PROJECT_TRUNK_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_INSTALL_PREFIX})
add_func_target_withargs_fastcheck(fastcheck_single fastcheck_single)
add_func_target_withargs_fastcheck(plugin_check plugin_check)
add_func_target_withargs_fastcheck(fastcheck_single_audit fastcheck_single_audit)
add_func_target_withargs_fastcheck(fastcheck_single_ss fastcheck_single_ss)
add_func_target_withargs_fastcheck(fastcheck_gs_probackup fastcheck_gs_probackup)

70
src/test/regress/single_check.sh
View File

@ -108,6 +108,14 @@ function real_regresscheck_single()
$pg_regress_check --dlpath=$DL_PATH $EXTRA_REGRESS_OPTS $3 -b $TEMP_INSTALL --abs_gausshome=\'$PREFIX_HOME\' --single_node --schedule=$SCHEDULE -w --keep_last_data=$keep_last_data --temp-config=$TEMP_CONFIG $MAXCONNOPT --regconf=$REGCONF
}
function real_regresscheck_plugin()
{
set_common_env_plugin $1 $2
echo ..........
echo "$pg_regress_check --dlpath=$DL_PATH $EXTRA_REGRESS_OPTS $3 -b $TEMP_INSTALL --abs_gausshome=\'$PREFIX_HOME\' --single_node --schedule=$SCHEDULE -w --keep_last_data=$keep_last_data --temp-config=$TEMP_CONFIG $MAXCONNOPT --regconf=$REGCONF --dbname=contrib_regression --dbcmpt=B dummy"
$pg_regress_check --dlpath=$DL_PATH $EXTRA_REGRESS_OPTS $3 --abs_gausshome=\'$PREFIX_HOME\' --single_node --schedule=$SCHEDULE -w --keep_last_data=$keep_last_data --temp-config=$TEMP_CONFIG $MAXCONNOPT --regconf=$REGCONF --dbname=contrib_regression --dbcmpt=B
}
function real_regresscheck_single_audit()
{
set_hotpatch_env
@ -369,6 +377,65 @@ function set_common_env()
UPGRADE_FROM=92497
}
function set_common_env_plugin()
{
export CODE_BASE=$ROOT_CODE_PATH/${OPENGS}
export CODE_BASE_SRC=$CODE_BASE/src
export GAUSSHOME=$PREFIX_HOME
REGRESS_PATH=$ROOT_CODE_PATH/contrib/dolphin
cp $ROOT_CODE_PATH/src/test/regress/check_enum.py $REGRESS_PATH
check_enum
REGRESS_PATH=$(cd ${REGRESS_PATH}/; pwd)
PGREGRESS_BIN=./${OPENGS}/src/test/regress/pg_regress_single
if [ "${ENABLE_MEMORY_CHECK}" = "ON" ];then
export ASAN_OPTIONS="unmap_shadow_on_exit=1:abort_on_error=1:detect_leaks=1:force_check_leak=1:halt_on_error=0:alloc_dealloc_mismatch=0:fast_unwind_on_fatal=1:log_path=/home/$(whoami)/memchk/asan/runlog"
export LSAN_OPTIONS="exitcode=0:suppressions=${CODE_BASE}/Tools/memory_check/memleak_ignore"
EXTRA_REGRESS_OPTS="--ignore-exitcode --keep-run"
fi
MAXCONNOPT=""
if [ ! "${MAX_CONNECTIONS}" = "" ];then
MAXCONNOPT="--max-connections=$(MAX_CONNECTIONS)"
fi
echo ..........$REGRESS_PATH
cp $THIRD_PATH/kernel/dependency/event/comm/lib/* $PREFIX_HOME/lib
cp -r $REGRESS_PATH/expected .
cp -r $REGRESS_PATH/data .
cp ./lib/regress.so $PREFIX_HOME/lib
cp ./lib/refint.so $PREFIX_HOME/lib
cp ./lib/autoinc.so $PREFIX_HOME/lib
rm $PREFIX_HOME/lib/libstdc++.so.6
DL_PATH=${GAUSSHOME}/lib
TOP_DIR=$ROOT_CODE_PATH
INPUT_DIR=${REGRESS_PATH}
TEMP_INSTALL=${REGRESS_PATH}/tmp_check
REGCONF=$INPUT_DIR/regress.conf
SCHEDULE=$INPUT_DIR/$1
TEMP_CONFIG=$INPUT_DIR/$2
DATA_BASE_DIR=$INPUT_DIR/../../../../privategauss/test/grayscale_upgrade
UPGRADE_SCRIPT_DIR=$INPUT_DIR/../grayscale_upgrade
OLD_BIN_DIR=$TEMP_INSTALL/bin
UPGRADE_SCHEDULE=$INPUT_DIR/upgrade_schedule
exception_arm_cases ${ROOT_CODE_PATH} parallel_schedule
pg_regress_locale_flags=""
pg_regress_check="${PGREGRESS_BIN} --inputdir=${INPUT_DIR} --temp-install=${TEMP_INSTALL} --top-builddir=${TOP_DIR} ${pg_regress_locale_flags}"
chmod +x ${REGRESS_PATH}/smartmatch.pl
rm -rf ./testtablespace && mkdir ./testtablespace
test -d /home/$(whoami)/memchk/asan || mkdir -p /home/$(whoami)/memchk/asan
#端口
if [ "X$p" = "X" ]; then
p=35000
fi
echo "--------------------LD_LIBRARY_PATH----------------------------------------------------"
echo $LD_LIBRARY_PATH
export
UPGRADE_FROM=92497
}
function parse_args()
{
#the args start from $8, only aacept args flags is *=[0-9]*|*=true|*=false
@ -418,6 +485,9 @@ case $DO_CMD in
--fastcheck_single|fastcheck_single)
args_val="-d 1 -c 0 -p $p -r 1 "
real_regresscheck_single parallel_schedule0$part make_fastcheck_postgresql.conf "${args_val}" ;;
--plugin_check|plugin_check)
args_val="-d 1 -c 0 -p $p -r 1 "
real_regresscheck_plugin parallel_schedule_dolphin$part make_check_postgresql.conf "${args_val}" ;;
--fastcheck_single_audit|fastcheck_single_audit)
args_val="-d 1 -c 0 -p $p -r 1 "
real_regresscheck_single_audit security_audit_schedule0$part make_fastcheck_audit_postgresql.conf "${args_val}" ;;