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

Fix for a behavior change + additional logging

Browse Source
This commit is contained in:
Roman Nozdrin
2020-12-04 09:38:34 +00:00
parent dd8289d4fd
commit 160d243d6e
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dbcon/joblist/batchprimitiveprocessor-jl.cpp
View File

@ -705,11 +705,7 @@ bool BatchPrimitiveProcessorJL::countThisMsg(messageqcpp::ByteStream& in) const
ISMPacketHeader* hdr = (ISMPacketHeader*)(data); ISMPacketHeader* hdr = (ISMPacketHeader*)(data);
// Exit early if PrimProc has thrown an exception if (_hasScan && in.length() > offset)
if (hdr->Status > 0)
return true;
if (_hasScan)
{ {
if (data[offset] != 0) if (data[offset] != 0)
offset += (data[offset + CP_FLAG_AND_LBID] * 2) + CP_FLAG_AND_LBID + 1; // skip the CP data with wide min/max values (16/32 bytes each) offset += (data[offset + CP_FLAG_AND_LBID] * 2) + CP_FLAG_AND_LBID + 1; // skip the CP data with wide min/max values (16/32 bytes each)
@ -717,7 +713,19 @@ bool BatchPrimitiveProcessorJL::countThisMsg(messageqcpp::ByteStream& in) const
offset += CP_FLAG_AND_LBID; // skip only the "valid CP data" & LBID bytes offset += CP_FLAG_AND_LBID; // skip only the "valid CP data" & LBID bytes
} }
idbassert(in.length() > offset); // Throw b/c PP throws and sends here error msg.
// See BatchPrimitiveProcessor::writeErrorMsg() for details.
// The inversion of the assert used here previously.
if (in.length() <= offset)
{
if (hdr->Status > 0)
{
throw std::runtime_error(" an exception originally thrown by PrimProc: ");
}
throw std::runtime_error(" an exception because there is not enough \
data in the Primitive message from PrimProc.");
}
return (data[offset] != 0); return (data[offset] != 0);
} }