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

MCOL-4839: Fix clang build (#2100)

* Fix clang build

* Extern C returned to plugin_instance

Co-authored-by: Leonid Fedorov <l.fedorov@mail.corp.ru>
This commit is contained in:
Leonid Fedorov
2021-08-23 18:45:10 +03:00
committed by GitHub
parent 923bbf4033
commit 5c5f103f98
59 changed files with 422 additions and 600 deletions

View File

@@ -102,9 +102,9 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h,
retTokens = reinterpret_cast<PrimToken*>(&niceRet[rdvOffset]);
retDataValues = reinterpret_cast<DataValue*>(&niceRet[rdvOffset]);
{
void *retp = static_cast<void*>(ret);
void *retp = static_cast<void*>(ret);
memcpy(retp, h, sizeof(PrimitiveHeader) + sizeof(ISMPacketHeader));
}
ret->NVALS = 0;
@@ -405,14 +405,12 @@ again:
dict_OffsetIndex++;
}
const char backslash = '\\';
void PrimitiveProcessor::p_Dictionary(const DictInput* in,
void PrimitiveProcessor::p_Dictionary(const DictInput* in,
vector<uint8_t>* out,
bool skipNulls,
bool skipNulls,
uint32_t charsetNumber,
boost::shared_ptr<DictEqualityFilter> eqFilter,
boost::shared_ptr<DictEqualityFilter> eqFilter,
uint8_t eqOp)
{
PrimToken* outToken;