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

MCOL-5153 This increases the size of the multiplier in the guarding check in RowAggStorage::increaseSize() so that it doesn't throw w/o a reason (#2463)

Browse Source
This commit is contained in:
Roman Nozdrin
2022-07-22 18:19:36 +03:00
committed by GitHub
parent 63047aa8ef
commit 6b17c358c0
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/rowgroup/rowstorage.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2021 MariaDB Corporation /* Copyright (C) 2021-2022 MariaDB Corporation
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@@ -1814,7 +1814,10 @@ void RowAggStorage::increaseSize()
if (fCurData->fSize < maxSize && tryIncreaseInfo()) if (fCurData->fSize < maxSize && tryIncreaseInfo())
return; return;
if (fCurData->fSize * 2 < calcMaxSize(fCurData->fMask + 1)) constexpr size_t maxMaskMultiplierWoRehashing = 1U << (INIT_INFO_INC - 1);
// We don't check for the overflow here b/c it is impractical to has fSize so that multiplication
// overflows.
if (fCurData->fSize * maxMaskMultiplierWoRehashing < calcMaxSize(fCurData->fMask + 1))
{ {
// something strange happens... // something strange happens...
throw logging::IDBExcept(logging::IDBErrorInfo::instance()->errorMsg(logging::ERR_DISKAGG_ERROR), throw logging::IDBExcept(logging::IDBErrorInfo::instance()->errorMsg(logging::ERR_DISKAGG_ERROR),

2
utils/rowgroup/rowstorage.h
View File

@@ -320,6 +320,8 @@ class RowAggStorage
{ {
RowPosHashStoragePtr fHashes; RowPosHashStoragePtr fHashes;
std::unique_ptr<uint8_t[]> fInfo; std::unique_ptr<uint8_t[]> fInfo;
// This is a power of 2 that controls a potential number of hash buckets
// w/o rehashing
size_t fSize{0}; size_t fSize{0};
size_t fMask{0}; size_t fMask{0};
size_t fMaxSize{0}; size_t fMaxSize{0};