From 83a892422925bedcbc22f4f873747d28fc47a299 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Mon, 29 Jul 2019 13:48:28 +0100 Subject: [PATCH] Fix namespace and class changes --- dbcon/joblist/windowfunctionstep.h | 2 +- dbcon/mysql/ha_calpont_impl.cpp | 6 +----- dmlproc/dmlproc.cpp | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dbcon/joblist/windowfunctionstep.h b/dbcon/joblist/windowfunctionstep.h index f0154ae0a..eaa020fc3 100644 --- a/dbcon/joblist/windowfunctionstep.h +++ b/dbcon/joblist/windowfunctionstep.h @@ -148,7 +148,7 @@ private: void formatMiniStats(); void printCalTrace(); - static void AddSimplColumn(const vector& scs, JobInfo& jobInfo); + static void AddSimplColumn(const std::vector& scs, JobInfo& jobInfo); class Runner { diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp index fd0f0fcb8..bb08c6cb9 100644 --- a/dbcon/mysql/ha_calpont_impl.cpp +++ b/dbcon/mysql/ha_calpont_impl.cpp @@ -1594,11 +1594,7 @@ uint32_t doUpdateDelete(THD* thd) { if (timeStampColumnNames.find(onUpdateTimeStampColumns[i]) == timeStampColumnNames.end()) { - columnAssignmentPtr = new ColumnAssignment(); - columnAssignmentPtr->fColumn = string(onUpdateTimeStampColumns[i]); - columnAssignmentPtr->fOperator = "="; - columnAssignmentPtr->fFuncScale = 0; - columnAssignmentPtr->fFromCol = false; + columnAssignmentPtr = new ColumnAssignment(string(onUpdateTimeStampColumns[i]), "=", ""); struct timeval tv; char buf[64]; gettimeofday(&tv, 0); diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp index 5adf9404d..09e5b9128 100644 --- a/dmlproc/dmlproc.cpp +++ b/dmlproc/dmlproc.cpp @@ -86,7 +86,7 @@ using namespace joblist; namespace fs = boost::filesystem; -ThreadPool DMLServer::fDmlPackagepool(10, 0); +threadpool::ThreadPool DMLServer::fDmlPackagepool(10, 0); namespace { @@ -658,7 +658,7 @@ int main(int argc, char* argv[]) JobStep::jobstepThreadPool.setDebug(true); JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&JobStep::jobstepThreadPool)); DMLServer::fDmlPackagepool.setDebug(true); - DMLServer::fDmlPackagepool.invoke(ThreadPoolMonitor(&DMLServer::fDmlPackagepool)); + DMLServer::fDmlPackagepool.invoke(threadpool::ThreadPoolMonitor(&DMLServer::fDmlPackagepool)); } //set ACTIVE state