database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

Fully resolve potentially ambiguous symbols by removing using namespace statements from headers which have a cascading effect. This causes potential behavior changes when switching to c++11 since symbols can be exported from std and boost while both have been imported into the global namespace.

Browse Source
This commit is contained in:
David Mott
2019-04-26 08:21:47 -05:00
parent 1813add162
commit 4b9d046c6e
131 changed files with 600 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writeengine/bulk/we_brmreporter.cpp
View File

@@ -321,7 +321,7 @@ void BRMReporter::sendCPToFile( )
void BRMReporter::reportTotals(
uint64_t totalReadRows,
uint64_t totalInsertedRows,
const std::vector<boost::tuple<CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> >& satCounts)
const std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> >& satCounts)
{
if (fRptFile.is_open())
{

3
writeengine/bulk/we_brmreporter.h
View File

@@ -28,7 +28,6 @@
#include "brmtypes.h"
#include "calpontsystemcatalog.h"
using namespace execplan;
/** @file
* class BRMReporter
*/
@@ -107,7 +106,7 @@ public:
*/
void reportTotals(uint64_t totalReadRows,
uint64_t totalInsertedRows,
const std::vector<boost::tuple<CalpontSystemCatalog::ColDataType,
const std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType,
uint64_t, uint64_t> >& satCounts);
/** @brief Generate report for job that exceeds error limit

2
writeengine/bulk/we_bulkload.cpp
View File

@@ -473,7 +473,7 @@ int BulkLoad::preProcess( Job& job, int tableNo,
int rc = NO_ERROR, minWidth = 9999; // give a big number
HWM minHWM = 999999; // rp 9/25/07 Bug 473
ColStruct curColStruct;
CalpontSystemCatalog::ColDataType colDataType;
execplan::CalpontSystemCatalog::ColDataType colDataType;
// Initialize portions of TableInfo object
tableInfo->setBufferSize(fBufferSize);

16
writeengine/bulk/we_tableinfo.cpp
View File

@@ -957,7 +957,7 @@ void TableInfo::reportTotals(double elapsedTime)
fLog->logMsg(oss2.str(), MSGLVL_INFO2);
// @bug 3504: Loop through columns to print saturation counts
std::vector<boost::tuple<CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> > satCounts;
std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> > satCounts;
for (unsigned i = 0; i < fColumns.size(); ++i)
{
@@ -977,30 +977,28 @@ void TableInfo::reportTotals(double elapsedTime)
ossSatCnt << "Column " << fTableName << '.' <<
fColumns[i].column.colName << "; Number of ";
if (fColumns[i].column.dataType == CalpontSystemCatalog::DATE)
if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::DATE)
{
ossSatCnt <<
"invalid dates replaced with zero value : ";
}
else if (fColumns[i].column.dataType ==
CalpontSystemCatalog::DATETIME)
execplan::CalpontSystemCatalog::DATETIME)
{
//bug5383
ossSatCnt <<
"invalid date/times replaced with zero value : ";
}
else if (fColumns[i].column.dataType == CalpontSystemCatalog::TIME)
else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::TIME)
{
ossSatCnt <<
"invalid times replaced with zero value : ";
}
else if (fColumns[i].column.dataType == CalpontSystemCatalog::CHAR)
ossSatCnt <<
"character strings truncated: ";
else if (fColumns[i].column.dataType ==
CalpontSystemCatalog::VARCHAR)
else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::CHAR)
ossSatCnt <<
"character strings truncated: ";
else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::VARCHAR)
ossSatCnt << "character strings truncated: ";
else
ossSatCnt <<
"rows inserted with saturated values: ";