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 namespace and class changes

Browse Source
This commit is contained in:
Andrew Hutchings
2019-07-29 13:48:28 +01:00
parent 811909aa72
commit 83a8924229
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/joblist/windowfunctionstep.h
View File

@ -148,7 +148,7 @@ private:
void formatMiniStats(); void formatMiniStats();
void printCalTrace(); void printCalTrace();
static void AddSimplColumn(const vector<SimpleColumn*>& scs, JobInfo& jobInfo); static void AddSimplColumn(const std::vector<execplan::SimpleColumn*>& scs, JobInfo& jobInfo);
class Runner class Runner
{ {

6
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -1594,11 +1594,7 @@ uint32_t doUpdateDelete(THD* thd)
{ {
if (timeStampColumnNames.find(onUpdateTimeStampColumns[i]) == timeStampColumnNames.end()) if (timeStampColumnNames.find(onUpdateTimeStampColumns[i]) == timeStampColumnNames.end())
{ {
columnAssignmentPtr = new ColumnAssignment(); columnAssignmentPtr = new ColumnAssignment(string(onUpdateTimeStampColumns[i]), "=", "");
columnAssignmentPtr->fColumn = string(onUpdateTimeStampColumns[i]);
columnAssignmentPtr->fOperator = "=";
columnAssignmentPtr->fFuncScale = 0;
columnAssignmentPtr->fFromCol = false;
struct timeval tv; struct timeval tv;
char buf[64]; char buf[64];
gettimeofday(&tv, 0); gettimeofday(&tv, 0);

4
dmlproc/dmlproc.cpp
View File

@ -86,7 +86,7 @@ using namespace joblist;
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
ThreadPool DMLServer::fDmlPackagepool(10, 0); threadpool::ThreadPool DMLServer::fDmlPackagepool(10, 0);
namespace namespace
{ {
@ -658,7 +658,7 @@ int main(int argc, char* argv[])
JobStep::jobstepThreadPool.setDebug(true); JobStep::jobstepThreadPool.setDebug(true);
JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&JobStep::jobstepThreadPool)); JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&JobStep::jobstepThreadPool));
DMLServer::fDmlPackagepool.setDebug(true); DMLServer::fDmlPackagepool.setDebug(true);
DMLServer::fDmlPackagepool.invoke(ThreadPoolMonitor(&DMLServer::fDmlPackagepool)); DMLServer::fDmlPackagepool.invoke(threadpool::ThreadPoolMonitor(&DMLServer::fDmlPackagepool));
} }
//set ACTIVE state //set ACTIVE state