database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

chore(build) Rocky8 gcc vanilla build fix

Browse Source
This commit is contained in:
Leonid Fedorov
2024-04-02 18:19:00 +04:00
committed by Leonid Fedorov
parent b79c34b90e
commit a8d3fff79e
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
build/bootstrap_mcs.sh
View File

@ -346,15 +346,16 @@ build()
check_user_and_group() check_user_and_group()
{ {
if [ -z "$(grep mysql /etc/passwd)" ]; then user=$1
message "Adding user mysql into /etc/passwd" if [ -z "$(grep $user /etc/passwd)" ]; then
useradd -r -U mysql -d /var/lib/mysql message "Adding user $user into /etc/passwd"
useradd -r -U $user -d /var/lib/mysql
fi fi
if [ -z "$(grep mysql /etc/group)" ]; then if [ -z "$(grep $user /etc/group)" ]; then
GroupID = `awk -F: '{uid[$3]=1}END{for(x=100; x<=999; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/group` GroupID = `awk -F: '{uid[$3]=1}END{for(x=100; x<=999; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/group`
message "Adding group mysql with id $GroupID" message "Adding group $user with id $GroupID"
groupadd -g GroupID mysql groupadd -g $GroupID $user
fi fi
} }
@ -388,14 +389,12 @@ disable_plugins_for_bootstrap()
{ {
find /etc -type f -exec sed -i 's/plugin-load-add=auth_gssapi.so//g' {} + find /etc -type f -exec sed -i 's/plugin-load-add=auth_gssapi.so//g' {} +
find /etc -type f -exec sed -i 's/plugin-load-add=ha_columnstore.so//g' {} + find /etc -type f -exec sed -i 's/plugin-load-add=ha_columnstore.so//g' {} +
find /etc -type f -exec sed -i 's/columnstore_use_import_for_batchinsert = ON//g' {} +
} }
enable_columnstore_back() enable_columnstore_back()
{ {
echo plugin-load-add=ha_columnstore.so >> $CONFIG_DIR/columnstore.cnf echo plugin-load-add=ha_columnstore.so >> $CONFIG_DIR/columnstore.cnf
sed -i '/\[mysqld\]/a\plugin-load-add=ha_columnstore.so' $CONFIG_DIR/columnstore.cnf sed -i '/\[mysqld\]/a\plugin-load-add=ha_columnstore.so' $CONFIG_DIR/columnstore.cnf
sed -i '/plugin-load-add=ha_columnstore.so/a\columnstore_use_import_for_batchinsert = ON' $CONFIG_DIR/columnstore.cnf
} }
fix_config_files() fix_config_files()
@ -461,7 +460,9 @@ install()
make_dir $REPORT_PATH make_dir $REPORT_PATH
chmod 777 $REPORT_PATH chmod 777 $REPORT_PATH
check_user_and_group check_user_and_group mysql
check_user_and_group syslog
make_dir $CONFIG_DIR make_dir $CONFIG_DIR

2
datatypes/mcs_datatype_basic.h
View File

@ -157,7 +157,7 @@ struct ColTypeToIntegral<SystemCatalog::UBIGINT>
template <SystemCatalog::ColDataType CT> template <SystemCatalog::ColDataType CT>
struct ranges_limits struct ranges_limits
{ {
using T = ColTypeToIntegral<CT>::type; using T = typename ColTypeToIntegral<CT>::type;
static constexpr T min() static constexpr T min()
{ {
if constexpr (std::is_signed_v<T>) if constexpr (std::is_signed_v<T>)

3
dbcon/mysql/columnstore.cnf
View File

@ -1,7 +1,6 @@
[mysqld] [mysqld]
plugin-load-add=ha_columnstore.so plugin-load-add=ha_columnstore.so
collation_server = utf8_general_ci collation_server = utf8_general_ci
character_set_server = utf8 character_set_server = utf8
loose-columnstore_use_import_for_batchinsert = ON
loose-columnstore_use_import_for_batchinsert = ON

11
tools/parquetGen/main.cpp
View File

@ -1099,7 +1099,7 @@ class LargeDataProducer : public arrow::RecordBatchReader
PARQUET_THROW_NOT_OK(doublebuilder_.Reserve(chunkSize)); PARQUET_THROW_NOT_OK(doublebuilder_.Reserve(chunkSize));
} }
virtual std::shared_ptr<arrow::Schema> schema() const virtual std::shared_ptr<arrow::Schema> schema() const override
{ {
return arrow::schema( return arrow::schema(
{arrow::field("col1", arrow::int32()), arrow::field("col2", arrow::timestamp(arrow::TimeUnit::MILLI)), {arrow::field("col1", arrow::int32()), arrow::field("col2", arrow::timestamp(arrow::TimeUnit::MILLI)),
@ -1107,7 +1107,12 @@ class LargeDataProducer : public arrow::RecordBatchReader
arrow::field("col5", arrow::float64()), arrow::field("col6", arrow::utf8())}); arrow::field("col5", arrow::float64()), arrow::field("col6", arrow::utf8())});
} }
virtual arrow::Status ReadNext(std::shared_ptr<arrow::RecordBatch>* batch) virtual arrow::Result<arrow::RecordBatchWithMetadata> ReadNext() override
{
return arrow::Status::NotImplemented("ReadNext with custom metadata");
}
virtual arrow::Status ReadNext(std::shared_ptr<arrow::RecordBatch>* batch) override
{ {
if (restChunkSize() == 0) if (restChunkSize() == 0)
{ {
@ -1350,4 +1355,4 @@ int main(int argc, char** argv)
} }
return 0; return 0;
} }

2
utils/funcexp/func_regexp.cpp
View File

@ -66,7 +66,7 @@ PCREOptions::PCREOptions(execplan::CalpontSystemCatalog::ColType& ct)
jpcre2::Uint defaultFlags = 0; jpcre2::Uint defaultFlags = 0;
flags = (cs != &my_charset_bin ? (PCRE2_UTF | PCRE2_UCP) : 0) | flags = (!(cs == &my_charset_bin) ? (PCRE2_UTF | PCRE2_UCP) : 0) |
((cs.getCharset().state & (MY_CS_BINSORT | MY_CS_CSSORT)) ? 0 : PCRE2_CASELESS) | defaultFlags; ((cs.getCharset().state & (MY_CS_BINSORT | MY_CS_CSSORT)) ? 0 : PCRE2_CASELESS) | defaultFlags;
// Convert text data to utf-8. // Convert text data to utf-8.