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

Compilation error fixes for the recent updates in container images

Browse Source
This commit is contained in:
Roman Nozdrin
2022-10-13 09:47:58 +00:00
committed by Leonid Fedorov
parent e7fb790515
commit 878a8ab857
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
primitives/linux-port/column.cpp
View File

@@ -58,7 +58,7 @@ namespace
template <ENUM_KIND KIND, typename VT, typename T> template <ENUM_KIND KIND, typename VT, typename T>
inline typename VT::MaskType getNonEmptyMaskAux(typename VT::MaskType* nonEmptyMaskAux, uint16_t iter) inline typename VT::MaskType getNonEmptyMaskAux(typename VT::MaskType* nonEmptyMaskAux, uint16_t iter)
{ {
VT proc; [[maybe_unused]] VT proc;
if constexpr (sizeof(T) == sizeof(uint8_t)) if constexpr (sizeof(T) == sizeof(uint8_t))
{ {
return nonEmptyMaskAux[iter]; return nonEmptyMaskAux[iter];
@@ -1469,7 +1469,7 @@ void vectorizedFiltering_(NewColRequestHeader* in, ColResultHeader* out, const T
weightsMin = simdSwapedOrderDataLoad<KIND, VT, SimdWrapperType, T>(typeHolder, simdProcessor, simdMin).v; weightsMin = simdSwapedOrderDataLoad<KIND, VT, SimdWrapperType, T>(typeHolder, simdProcessor, simdMin).v;
weightsMax = simdSwapedOrderDataLoad<KIND, VT, SimdWrapperType, T>(typeHolder, simdProcessor, simdMax).v; weightsMax = simdSwapedOrderDataLoad<KIND, VT, SimdWrapperType, T>(typeHolder, simdProcessor, simdMax).v;
} }
MT* nonEmptyMaskAux; [[maybe_unused]] MT* nonEmptyMaskAux;
if constexpr (IS_AUX_COLUMN) if constexpr (IS_AUX_COLUMN)
{ {

4
utils/rwlock/rwlock.h
View File

@@ -45,9 +45,9 @@
namespace rwlock namespace rwlock
{ {
const std::array<const std::string, 7> RWLockNames = { const std::array<const std::string, 7> RWLockNames = {{
"all", "VSS", "ExtentMap", "FreeList", "VBBM", "CopyLocks", "ExtentMapIndex", "all", "VSS", "ExtentMap", "FreeList", "VBBM", "CopyLocks", "ExtentMapIndex",
}; }};
/// the layout of the shmseg /// the layout of the shmseg
struct State struct State