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

MCOL-3536 collation

Browse Source
This commit is contained in:
David Hall
2020-05-19 16:22:44 -05:00
parent 8479a87e46
commit 11ba12f6ea
10 changed files with 53 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
primitives/primproc/primitiveserver.cpp
View File

@ -1154,7 +1154,6 @@ int DictScanJob::operator()()
PrimitiveProcessor pproc(gDebugLevel);
TokenByScanResultHeader* output;
QueryContext verInfo;
bool bUtf8;
try
{
@ -1166,25 +1165,6 @@ int DictScanJob::operator()()
*fByteStream >> verInfo;
cmd = (TokenByScanRequestHeader*) fByteStream->buf();
// If charset is one of those that can be representedby standard ascii,
// we can get a performance improvement by using strcmp rather than
// the full charset compare system.
switch (cmd->charsetNumber)
{
case 8: // latin1_swedish_ci
case 9: // latin2_general_ci
case 11: // ascii_general_ci
case 47: // latin1_bin
case 48: // latin1_general_ci
case 49: // latin1_general_cs
case 65: // ascii_bin
case 77: // latin2_bin
bUtf8 = false;
break;
default:
bUtf8 = true;
}
session = cmd->Hdr.SessionID;
uniqueId = cmd->Hdr.UniqueID;
runCount = cmd->Count;
@ -1229,8 +1209,7 @@ int DictScanJob::operator()()
fLBIDTraceOn,
session);
pproc.setBlockPtr((int*) data);
// MCOL-3536 We shouldn't need to pass in utf8 -- maybe??
pproc.p_TokenByScan(cmd, output, output_buf_size, bUtf8, eqFilter);
pproc.p_TokenByScan(cmd, output, output_buf_size, eqFilter);
if (wasBlockInCache)
output->CacheIO++;