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

A fix for MCOL-4174 Review/refactor frontend/connector code

Browse Source 
- The code in ha_mcs_partition.cpp erroneously printed data
  to a temporary ostringstream "oss" instead of "output".

- The left-side adjustfield (applied when printing the range values)
  unintentionally disappeared during MCOL-4174 refactoring.
  Restoring left adjustfield in TypeHandler::PrintPartitionValue*().
This commit is contained in:
Alexander Barkov
2020-11-20 10:23:13 +04:00
parent 820703d2d0
commit 61b55127ac
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
datatypes/mcs_datatype.cpp
View File

@ -791,11 +791,21 @@ TypeHandlerXDecimal::format128(const SimpleValue &v,
/****************************************************************************/ /****************************************************************************/
class ostringstreamL: public ostringstream
{
public:
ostringstreamL()
{
setf(ios::left, ios::adjustfield);
}
};
string TypeHandler::formatPartitionInfoSInt64( string TypeHandler::formatPartitionInfoSInt64(
const SystemCatalog::TypeAttributesStd &attr, const SystemCatalog::TypeAttributesStd &attr,
const MinMaxInfo &pi) const const MinMaxInfo &pi) const
{ {
ostringstream output; ostringstreamL output;
if (pi.isEmptyOrNullSInt64()) if (pi.isEmptyOrNullSInt64())
output << setw(30) << "Empty/Null" output << setw(30) << "Empty/Null"
<< setw(30) << "Empty/Null"; << setw(30) << "Empty/Null";
@ -810,7 +820,7 @@ string TypeHandler::formatPartitionInfoUInt64(
const SystemCatalog::TypeAttributesStd &attr, const SystemCatalog::TypeAttributesStd &attr,
const MinMaxInfo &pi) const const MinMaxInfo &pi) const
{ {
ostringstream output; ostringstreamL output;
if (pi.isEmptyOrNullUInt64()) if (pi.isEmptyOrNullUInt64())
output << setw(30) << "Empty/Null" output << setw(30) << "Empty/Null"
<< setw(30) << "Empty/Null"; << setw(30) << "Empty/Null";
@ -827,7 +837,7 @@ TypeHandlerXDecimal::formatPartitionInfo128(
const SystemCatalog::TypeAttributesStd &attr, const SystemCatalog::TypeAttributesStd &attr,
const MinMaxInfo &pi) const const MinMaxInfo &pi) const
{ {
ostringstream output; ostringstreamL output;
if (pi.isEmptyOrNullSInt128()) if (pi.isEmptyOrNullSInt128())
output << setw(datatypes::Decimal::MAXLENGTH16BYTES) << "Empty/Null" output << setw(datatypes::Decimal::MAXLENGTH16BYTES) << "Empty/Null"
<< setw(datatypes::Decimal::MAXLENGTH16BYTES) << "Empty/Null"; << setw(datatypes::Decimal::MAXLENGTH16BYTES) << "Empty/Null";
@ -843,7 +853,7 @@ TypeHandlerStr::formatPartitionInfoSmallCharVarchar(
const SystemCatalog::TypeAttributesStd &attr, const SystemCatalog::TypeAttributesStd &attr,
const MinMaxInfo &pi) const const MinMaxInfo &pi) const
{ {
ostringstream output; ostringstreamL output;
int64_t maxLimit = numeric_limits<int64_t>::max(); int64_t maxLimit = numeric_limits<int64_t>::max();
int64_t minLimit = numeric_limits<int64_t>::min(); int64_t minLimit = numeric_limits<int64_t>::min();
maxLimit = uint64ToStr(maxLimit); maxLimit = uint64ToStr(maxLimit);
@ -1398,7 +1408,7 @@ string TypeHandler::PrintPartitionValueSInt64(
if (!partInfo.isSuitableSInt64(startVal, rfMin, endVal, rfMax)) if (!partInfo.isSuitableSInt64(startVal, rfMin, endVal, rfMax))
return ""; return "";
ostringstream oss; ostringstreamL oss;
if (partInfo.min > partInfo.max) if (partInfo.min > partInfo.max)
oss << setw(30) << "Empty/Null" << setw(30) << "Empty/Null"; oss << setw(30) << "Empty/Null" << setw(30) << "Empty/Null";
else else
@ -1419,7 +1429,7 @@ string TypeHandler::PrintPartitionValueUInt64(
if (!partInfo.isSuitableUInt64(startVal, rfMin, endVal, rfMax)) if (!partInfo.isSuitableUInt64(startVal, rfMin, endVal, rfMax))
return ""; return "";
ostringstream oss; ostringstreamL oss;
if (static_cast<uint64_t>(partInfo.min) > static_cast<uint64_t>(partInfo.max)) if (static_cast<uint64_t>(partInfo.min) > static_cast<uint64_t>(partInfo.max))
oss << setw(30) << "Empty/Null" << setw(30) << "Empty/Null"; oss << setw(30) << "Empty/Null" << setw(30) << "Empty/Null";
else else
@ -1440,7 +1450,7 @@ string TypeHandlerXDecimal::PrintPartitionValue128(
if (!partInfo.isSuitableSInt128(startVal, rfMin, endVal, rfMax)) if (!partInfo.isSuitableSInt128(startVal, rfMin, endVal, rfMax))
return ""; return "";
ostringstream oss; ostringstreamL oss;
if (partInfo.int128Min > partInfo.int128Max) if (partInfo.int128Min > partInfo.int128Max)
oss << setw(datatypes::Decimal::MAXLENGTH16BYTES) << "Empty/Null" oss << setw(datatypes::Decimal::MAXLENGTH16BYTES) << "Empty/Null"
<< setw(datatypes::Decimal::MAXLENGTH16BYTES) << "Empty/Null"; << setw(datatypes::Decimal::MAXLENGTH16BYTES) << "Empty/Null";

2
dbcon/mysql/ha_mcs_partition.cpp
View File

@ -717,7 +717,7 @@ extern "C"
else else
{ {
const datatypes::TypeHandler *h= ct.typeHandler(); const datatypes::TypeHandler *h= ct.typeHandler();
oss << h->formatPartitionInfo(ct, partIt->second); output << h->formatPartitionInfo(ct, partIt->second);
} }
if (partIt->second.is_disabled()) if (partIt->second.is_disabled())