database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Justin Swanhart
2016-06-01 17:30:57 -04:00
parent f16c8a63e3 84eeae5a34
commit be45f0a40f
258 changed files with 1875 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
primitives/blockcache/blockrequestprocessor.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -67,7 +67,7 @@ BlockRequestProcessor::BlockRequestProcessor(uint32_t numBlcks,
#ifdef _MSC_VER
brpLogFileName << "C:/Calpont/log/trace/brp." << tid;
#else
brpLogFileName << "/var/log/Columnstore/trace/brp." << tid;
brpLogFileName << "/var/log/mariadb/columnstore/trace/brp." << tid;
#endif
fLogFile.open(brpLogFileName.str().c_str(), ios_base::app | ios_base::ate);
}

4
primitives/blockcache/filebuffermgr.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -71,7 +71,7 @@ FileBufferMgr::FileBufferMgr(const uint32_t numBlcks, const uint32_t blkSz, cons
#ifdef _MSC_VER
fLog.open("C:/Calpont/log/trace/bc", ios_base::app | ios_base::ate);
#else
fLog.open("/var/log/Columnstore/trace/bc", ios_base::app | ios_base::ate);
fLog.open("/var/log/mariadb/columnstore/trace/bc", ios_base::app | ios_base::ate);
#endif
}

6
primitives/blockcache/iomanager.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -489,7 +489,7 @@ void* thr_popper(ioManager *arg) {
iomLogFileName << "C:/Calpont/log/trace/iom." << threadId;
#else
threadId=pthread_self();
iomLogFileName << "/var/log/Columnstore/trace/iom." << threadId;
iomLogFileName << "/var/log/mariadb/columnstore/trace/iom." << threadId;
#endif
lFile.open(iomLogFileName.str().c_str(), ios_base::app | ios_base::ate);
}
@ -1293,7 +1293,7 @@ ioManager::ioManager(FileBufferMgr& fbm,
#ifdef _MSC_VER
FDTraceFile().open("C:/Calpont/log/trace/fdcache", ios_base::ate | ios_base::app);
#else
FDTraceFile().open("/var/log/Columnstore/trace/fdcache", ios_base::ate | ios_base::app);
FDTraceFile().open("/var/log/mariadb/columnstore/trace/fdcache", ios_base::ate | ios_base::app);
#endif
}

4
primitives/blockcache/stats.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -104,7 +104,7 @@ public:
#ifdef _MSC_VER
oss << "C:/Calpont/log/trace/" << outName << '.' << sessionID;
#else
oss << "/var/log/Columnstore/trace/" << outName << '.' << sessionID;
oss << "/var/log/mariadb/columnstore/trace/" << outName << '.' << sessionID;
#endif
oFile.reset(new ofstream());
oFile->open(oss.str().c_str(), ios_base::out | ios_base::ate | ios_base::app);