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 fallthrough compilation warnings

Browse Source
This commit is contained in:
Roman Nozdrin
2020-11-08 14:57:28 +00:00
parent 3eb26c0d4a
commit 15b1bfa709
11 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dbcon/execplan/simplecolumn_decimal.h
View File

@ -144,6 +144,7 @@ void SimpleColumn_Decimal<len>::setNullVal()
break; break;
case 16: case 16:
std::cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << std::endl; std::cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << std::endl;
//fallthrough
default: default:
fNullVal = joblist::BIGINTNULL; fNullVal = joblist::BIGINTNULL;
} }

1
dbcon/execplan/simplecolumn_uint.h
View File

@ -144,6 +144,7 @@ void SimpleColumn_UINT<len>::setNullVal()
break; break;
case 16: case 16:
std::cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << std::endl; std::cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << std::endl;
//fallthrough
default: default:
fNullVal = joblist::UBIGINTNULL; fNullVal = joblist::UBIGINTNULL;
} }

1
dbcon/execplan/windowfunctioncolumn.cpp
View File

@ -491,6 +491,7 @@ void WindowFunctionColumn::evaluate(Row& row, bool& isNull)
break; break;
case 16: case 16:
cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << endl; cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << endl;
//fallthrough
default: default:
if (row.equals(CPNULLSTRMARK, fInputIndex)) if (row.equals(CPNULLSTRMARK, fInputIndex))
isNull = true; isNull = true;

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

@ -681,7 +681,8 @@ void BatchPrimitiveProcessorJL::getTuples(messageqcpp::ByteStream& in,
pos++; pos++;
break; break;
case 16: case 16:
cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << endl; cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << endl;
//fallthrough
default: default:
cout << "BPP::getTuples(): bad column width of " << colWidths[j] cout << "BPP::getTuples(): bad column width of " << colWidths[j]
<< endl; << endl;

3
dbcon/joblist/columncommand-jl.cpp
View File

@ -270,7 +270,8 @@ uint8_t ColumnCommandJL::getTableColumnType()
case 1: case 1:
return TableColumn::UINT8; return TableColumn::UINT8;
case 16: case 16:
cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << endl; cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << endl;
//fallthrough
default: default:
throw logic_error("ColumnCommandJL: bad column width"); throw logic_error("ColumnCommandJL: bad column width");
} }

4
dbcon/joblist/rowestimator.cpp
View File

@ -384,8 +384,8 @@ float RowEstimator::estimateRowReturnFactor(const BRM::EMEntry& emEntry,
bigValue = static_cast<int128_t>(val); bigValue = static_cast<int128_t>(val);
break; break;
} }
/* fall through */
} }
// fallthrough
case 8: case 8:
default: default:
@ -430,8 +430,8 @@ float RowEstimator::estimateRowReturnFactor(const BRM::EMEntry& emEntry,
bigValue = static_cast<int128_t>(val); bigValue = static_cast<int128_t>(val);
break; break;
} }
/* fall through */
} }
// fallthrough
case 8: case 8:
default: default:

6
primitives/linux-port/column.cpp
View File

@ -766,8 +766,8 @@ inline void store(const NewColRequestHeader* in,
default: default:
std::cout << __func__ << " WARNING!!! unspecified column width." << std::endl; std::cout << __func__ << " WARNING!!! unspecified column width." << std::endl;
[[fallthrough]]; // fallthrough
case 8: case 8:
ptr2 += (rid << 3); ptr2 += (rid << 3);
memcpy(ptr1, ptr2, 8); memcpy(ptr1, ptr2, 8);
@ -1840,7 +1840,7 @@ void PrimitiveProcessor::p_Col(NewColRequestHeader* in, NewColResultHeader* out,
case 32: case 32:
std::cout << __func__ << " WARNING!!! Not implemented for 32 byte data types." << std::endl; std::cout << __func__ << " WARNING!!! Not implemented for 32 byte data types." << std::endl;
[[fallthrough]]; // fallthrough
default: default:
idbassert(0); idbassert(0);

4
utils/rowgroup/rowgroup.cpp
View File

@ -648,7 +648,7 @@ string Row::toString() const
os << buf << " "; os << buf << " ";
break; break;
} }
// fallthrough if the legacy DECIMAL //fallthrough
default: default:
os << getIntField(i) << " "; os << getIntField(i) << " ";
break; break;
@ -712,6 +712,7 @@ string Row::toCSV() const
} }
case CalpontSystemCatalog::BINARY: case CalpontSystemCatalog::BINARY:
std::cout << __FILE__<< __LINE__ << ":" << "toCSV"<< std::endl; std::cout << __FILE__<< __LINE__ << ":" << "toCSV"<< std::endl;
//fallthrough
default: default:
os << getIntField(i); os << getIntField(i);
@ -1789,6 +1790,7 @@ void RowGroup::addToSysDataList(execplan::CalpontSystemCatalog::NJLSysDataList&
case CalpontSystemCatalog::BINARY: case CalpontSystemCatalog::BINARY:
std::cout << __FILE__<< __LINE__ << __func__<< std::endl; std::cout << __FILE__<< __LINE__ << __func__<< std::endl;
//fallthrough
default: default:
cr->PutData(row.getIntField<8>(j)); cr->PutData(row.getIntField<8>(j));
} }

11
utils/windowfunction/wf_udaf.cpp
View File

@ -492,7 +492,8 @@ bool WF_udaf::dropValues(int64_t b, int64_t e)
break; break;
} }
case CalpontSystemCatalog::BINARY: case CalpontSystemCatalog::BINARY:
cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << endl; cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << endl;
//fallthrough
default: default:
{ {
string errStr = "(" + colType2String[(int)datum.dataType] + ")"; string errStr = "(" + colType2String[(int)datum.dataType] + ")";
@ -767,8 +768,9 @@ void WF_udaf::SetUDAFValue(static_any::any& valOut, int64_t colOut,
setValue(colDataType, b, e, c, &strOut); setValue(colDataType, b, e, c, &strOut);
} }
break; break;
case CalpontSystemCatalog::BINARY: case CalpontSystemCatalog::BINARY:
cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << endl; cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << endl;
//fallthrough
default: default:
{ {
std::ostringstream errmsg; std::ostringstream errmsg;
@ -1149,7 +1151,8 @@ void WF_udaf::operator()(int64_t b, int64_t e, int64_t c)
break; break;
} }
case CalpontSystemCatalog::BINARY: case CalpontSystemCatalog::BINARY:
cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << endl; cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << endl;
//fallthrough
default: default:
{ {
string errStr = "(" + colType2String[(int)datum.dataType] + ")"; string errStr = "(" + colType2String[(int)datum.dataType] + ")";

3
utils/windowfunction/windowfunctiontype.cpp
View File

@ -801,7 +801,8 @@ void* WindowFunctionType::getNullValueByType(int ct, int pos)
v = &longDoubleNull; v = &longDoubleNull;
break; break;
case CalpontSystemCatalog::BINARY: case CalpontSystemCatalog::BINARY:
cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << endl; cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << endl;
//fallthrough
case CalpontSystemCatalog::VARBINARY: case CalpontSystemCatalog::VARBINARY:
default: default:
std::ostringstream oss; std::ostringstream oss;

2
writeengine/server/we_dmlcommandproc.cpp
View File

@ -3006,7 +3006,6 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs,
break; break;
} }
[[fallthrough]];
} }
/* fall through */ /* fall through */
@ -3369,7 +3368,6 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs,
break; break;
} }
[[fallthrough]];
} }
/* fall through */ /* fall through */