database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2026-01-06 08:21:10 +03:00
Code Activity

Merge branch 'develop-1.1' into merge-up-dev

Browse Source
This commit is contained in:
Andrew Hutchings
2017-11-24 11:10:09 +02:00
parent a347a8f5aa 573d465a75
commit 932819ba23
50 changed files with 1070 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
writeengine/dictionary/we_dctnry.cpp
View File

@@ -657,6 +657,8 @@ int Dctnry::insertDctnry2(Signature& sig)
int rc = 0;
int write_size;
bool lbid_in_token = false;
size_t origSigSize = sig.size;
unsigned char* origSig = sig.signature;
sig.token.bc = 0;
@@ -751,6 +753,8 @@ int Dctnry::insertDctnry2(Signature& sig)
}
}
sig.size = origSigSize;
sig.signature = origSig;
return NO_ERROR;
}
@@ -860,8 +864,7 @@ int Dctnry::insertDctnry(const char* buf,
//...Search for the string in our string cache
//if it fits into one block (< 8KB)
if ((m_arraySize < MAX_STRING_CACHE_SIZE) &&
(curSig.size <= MAX_SIGNATURE_SIZE))
if (curSig.size <= MAX_SIGNATURE_SIZE)
{
//Stats::startParseEvent("getTokenFromArray");
found = getTokenFromArray(curSig);
@@ -1431,8 +1434,7 @@ int Dctnry::updateDctnry(unsigned char* sigValue, int& sigSize,
// Look for string in cache
// As long as the string <= 8000 bytes
if ((m_arraySize < MAX_STRING_CACHE_SIZE) &&
(sigSize <= MAX_SIGNATURE_SIZE))
if (sigSize <= MAX_SIGNATURE_SIZE)
{
bool found = false;
found = getTokenFromArray(sig);