From 0a118292eb0f3759b38e1949593c9fe820e960f5 Mon Sep 17 00:00:00 2001 From: Denis Khalikov Date: Thu, 16 May 2024 17:47:46 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(datatypes,cpimport)!:=20MCOL-5746?= =?UTF-8?q?=20Do=20not=20convert=20ascii=20to=20binary=20fo=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f75baa8a40a95ce7f1bf91aa61c51768de4adc9a. --- writeengine/bulk/we_columninfo.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/writeengine/bulk/we_columninfo.cpp b/writeengine/bulk/we_columninfo.cpp index fde1f617f..a3c47d1cd 100644 --- a/writeengine/bulk/we_columninfo.cpp +++ b/writeengine/bulk/we_columninfo.cpp @@ -1661,8 +1661,7 @@ int ColumnInfo::closeDctnryStore(bool bAbort) // Update dictionary store file with string column parquet data, and return the assigned // tokens (tokenbuf) to be stored in the corresponding column token file. //-------------------------------------------------------------------------------------- -int ColumnInfo::updateDctnryStoreParquet(std::shared_ptr columnData, int tokenPos, - const int totalRow, char* tokenBuf) +int ColumnInfo::updateDctnryStoreParquet(std::shared_ptr columnData, int tokenPos, const int totalRow, char* tokenBuf) { long long truncCount = 0; @@ -1674,8 +1673,7 @@ int ColumnInfo::updateDctnryStoreParquet(std::shared_ptr columnDat Stats::stopParseEvent(WE_STATS_WAIT_TO_PARSE_DCT); #endif - int rc = fStore->insertDctnryParquet(columnData, tokenPos, totalRow, id, tokenBuf, truncCount, column.cs, - column.weType); + int rc = fStore->insertDctnryParquet(columnData, tokenPos, totalRow, id, tokenBuf, truncCount, column.cs, column.weType); if (rc != NO_ERROR) { @@ -1690,7 +1688,7 @@ int ColumnInfo::updateDctnryStoreParquet(std::shared_ptr columnDat } incSaturatedCnt(truncCount); - + return NO_ERROR; } @@ -1709,7 +1707,8 @@ int ColumnInfo::updateDctnryStore(char* buf, ColPosPair** pos, const int totalRo // column. // This only applies to default text mode. This step is bypassed for // binary imports, because in that case, the data is already true binary. - if (((curCol.colType == WR_VARBINARY)) && (fpTableInfo->getImportDataMode() == IMPORT_DATA_TEXT)) + if (((curCol.colType == WR_VARBINARY) || (curCol.colType == WR_BLOB)) && + (fpTableInfo->getImportDataMode() == IMPORT_DATA_TEXT)) { #ifdef PROFILE Stats::startParseEvent(WE_STATS_COMPACT_VARBINARY);