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

Fix rocky-8 vanilla compiler build (#2959)

Browse Source 
Co-authored-by: Leonid Fedorov <leonid.fedorov@mariad.com>
This commit is contained in:
Leonid Fedorov
2023-09-20 04:04:08 +03:00
committed by GitHub
parent 70111eba3d
commit 8171e9da07
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build/bootstrap_mcs.sh
View File

@ -68,6 +68,13 @@ if [[ $OS = 'Ubuntu' || $OS = 'Debian' ]]; then
fi fi
disable_git_restore_frozen_revision()
{
cd $MDB_SOURCE_PATH
git config submodule.storage/columnstore/columnstore.update none
cd - > /dev/null
}
select_branch() select_branch()
{ {
cd $SCRIPT_LOCATION cd $SCRIPT_LOCATION
@ -84,9 +91,6 @@ select_branch()
fi fi
message "Turning off Columnstore submodule auto update via gitconfig" message "Turning off Columnstore submodule auto update via gitconfig"
cd $MDB_SOURCE_PATH
git config submodule.storage/columnstore/columnstore.update none
cd - > /dev/null
fi fi
cd - > /dev/null cd - > /dev/null
@ -529,6 +533,8 @@ generate_svgs()
fi fi
} }
disable_git_restore_frozen_revision
select_branch select_branch
if [[ $INSTALL_DEPS = true ]] ; then if [[ $INSTALL_DEPS = true ]] ; then

1
dbcon/joblist/diskjoinstep.h
View File

@ -20,6 +20,7 @@
#include "tuplehashjoin.h" #include "tuplehashjoin.h"
#include "joinpartition.h" #include "joinpartition.h"
#include "threadnaming.h" #include "threadnaming.h"
#include <mutex>
#pragma once #pragma once

2
tests/rewritetest.cpp
View File

@ -593,7 +593,7 @@ TEST_P(ParseTreeComparatorTest, CompareContains)
auto filter = std::make_unique<execplan::ParseTree>(new execplan::SimpleFilter( auto filter = std::make_unique<execplan::ParseTree>(new execplan::SimpleFilter(
GetParam().filter, execplan::SimpleFilter::ForTestPurposesWithoutColumnsOIDS{})); GetParam().filter, execplan::SimpleFilter::ForTestPurposesWithoutColumnsOIDS{}));
ASSERT_EQ(GetParam().contains, container.contains(filter)); ASSERT_EQ(GetParam().contains, container.count(filter)!=0);
} }
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(