database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Fix gcc-13 warning and add support for building Fedora (#2845)

Browse Source
This commit is contained in:
Leonid Fedorov
2023-05-26 16:30:53 +03:00
committed by GitHub
parent a90535e1a7
commit f18c556311
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
build/bootstrap_mcs.sh
View File

@ -102,7 +102,7 @@ install_deps()
libsnappy-dev libcurl4-openssl-dev libgtest-dev libcppunit-dev googletest libsnappy-dev libjemalloc-dev \ libsnappy-dev libcurl4-openssl-dev libgtest-dev libcppunit-dev googletest libsnappy-dev libjemalloc-dev \
liblz-dev liblzo2-dev liblzma-dev liblz4-dev libbz2-dev libbenchmark-dev graphviz liblz-dev liblzo2-dev liblzma-dev liblz4-dev libbz2-dev libbenchmark-dev graphviz
elif [[ $OS = 'CentOS' || $OS = 'Rocky' ]]; then elif [[ $OS = 'CentOS' || $OS = 'Rocky' || $OS = 'Fedora' ]]; then
if [[ "$OS_VERSION" == "7" ]]; then if [[ "$OS_VERSION" == "7" ]]; then
yum -y install cmake3 epel-release centos-release-scl yum -y install cmake3 epel-release centos-release-scl
CMAKE_BIN_NAME=cmake3 CMAKE_BIN_NAME=cmake3
@ -114,11 +114,17 @@ install_deps()
yum -y groupinstall "Development Tools" && yum config-manager --set-enabled powertools yum -y groupinstall "Development Tools" && yum config-manager --set-enabled powertools
yum install -y checkpolicy yum install -y checkpolicy
fi fi
yum -y install epel-release \ if [[ $OS != 'Fedora' ]]; then
&& yum -y install bison ncurses-devel readline-devel perl-devel openssl-devel libxml2-devel gperf libaio-devel libevent-devel tree wget pam-devel snappy-devel libicu \ yum -y install epel-release
&& yum -y install vim wget strace ltrace gdb rsyslog net-tools openssh-server expect boost perl-DBI libicu boost-devel initscripts \ fi
&& yum -y install jemalloc-devel libcurl-devel gtest-devel cppunit-devel systemd-devel lzo-devel xz-devel lz4-devel bzip2-devel \
&& yum -y install pcre2-devel flex graphviz yum install -y bison ncurses-devel readline-devel perl-devel openssl-devel libxml2-devel gperf libaio-devel libevent-devel tree wget pam-devel snappy-devel libicu \
vim wget strace ltrace gdb rsyslog net-tools openssh-server expect boost perl-DBI libicu boost-devel initscripts \
jemalloc-devel libcurl-devel gtest-devel cppunit-devel systemd-devel lzo-devel xz-devel lz4-devel bzip2-devel \
pcre2-devel flex graphviz libaio-devel openssl-devel flex
else
error "Unsupported OS $OS"
exit 17
fi fi
} }
@ -261,10 +267,10 @@ build()
if [[ $SKIP_SUBMODULES = true ]] ; then if [[ $SKIP_SUBMODULES = true ]] ; then
warn "Skipping initialization of columnstore submodules" warn "Skipping initialization of columnstore submodules"
else else
message "Initialization of columnstore submodules" message "Initialization of columnstore submodules"
cd storage/columnstore/columnstore cd storage/columnstore/columnstore
git submodule update --init git submodule update --init
cd - > /dev/null cd - > /dev/null
fi fi
if [[ $FORCE_CMAKE_CONFIG = true ]] ; then if [[ $FORCE_CMAKE_CONFIG = true ]] ; then
@ -526,4 +532,4 @@ start_service
smoke smoke
generate_svgs generate_svgs
message_splitted "FINISHED" message_splitted "FINISHED"

3
utils/funcexp/func_between.cpp
View File

@ -243,7 +243,8 @@ inline bool getBool(rowgroup::Row& row, funcexp::FunctionParm& pm, bool& isNull,
case execplan::CalpontSystemCatalog::TEXT: case execplan::CalpontSystemCatalog::TEXT:
{ {
const string& val = pm[0]->data()->getStrVal(row, isNull).safeString(""); const string& val = pm[0]->data()->getStrVal(row, isNull).safeString("");
CHARSET_INFO& cs = datatypes::Charset(ct.charsetNumber).getCharset(); auto charset = datatypes::Charset(ct.charsetNumber);
CHARSET_INFO& cs = charset.getCharset();
if (notBetween) if (notBetween)
{ {