You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +03:00
MCOL-5746 Cpimport: convert blob data from ascii hex when reads from STDIN (#3217)
Co-authored-by: Denis Khalikov <dennis.khalikov@gmail.com>
This commit is contained in:
@ -1672,7 +1672,7 @@ 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) || (curCol.colType == WR_BLOB)) &&
|
||||
if (((curCol.colType == WR_VARBINARY) || (curCol.colType == WR_BLOB && fpTableInfo->readFromSTDIN())) &&
|
||||
(fpTableInfo->getImportDataMode() == IMPORT_DATA_TEXT))
|
||||
{
|
||||
#ifdef PROFILE
|
||||
|
@ -2381,5 +2381,10 @@ int TableInfo::allocateBRMColumnExtent(OID columnOID, uint16_t dbRoot, uint32_t&
|
||||
return rc;
|
||||
}
|
||||
|
||||
bool TableInfo::readFromSTDIN()
|
||||
{
|
||||
return fReadFromStdin;
|
||||
}
|
||||
|
||||
} // namespace WriteEngine
|
||||
// end of namespace
|
||||
|
@ -77,7 +77,7 @@ class TableInfo : public WeUIDGID
|
||||
FILE* fHandle; // Handle to the input load file
|
||||
int fCurrentReadBuffer; // Id of current buffer being popu-
|
||||
// lated by the read thread
|
||||
RID fTotalReadRows; // Total number of rows read
|
||||
RID fTotalReadRows; // Total number of rows read
|
||||
unsigned fTotalErrRows; // Total error rows among all input
|
||||
// for this table. Is volatile to
|
||||
// insure parser & reader threads
|
||||
@ -459,6 +459,8 @@ class TableInfo : public WeUIDGID
|
||||
|
||||
void setJobUUID(const boost::uuids::uuid& jobUUID);
|
||||
|
||||
bool readFromSTDIN();
|
||||
|
||||
public:
|
||||
friend class BulkLoad;
|
||||
friend class ColumnInfo;
|
||||
|
Reference in New Issue
Block a user