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

Remove windows ifdefs

Browse Source
This commit is contained in:
Leonid Fedorov
2023-03-02 15:59:42 +00:00
parent 123c345b40
commit 56f2346083
328 changed files with 9 additions and 19602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
writeengine/bulk/we_workers.cpp
View File

@ -41,9 +41,6 @@ void BulkLoad::sleepMS(long ms)
rm_ts.tv_sec = ms / 1000;
rm_ts.tv_nsec = ms % 1000 * 1000000;
#ifdef _MSC_VER
Sleep(ms);
#else
struct timespec abs_ts;
do
@ -52,7 +49,6 @@ void BulkLoad::sleepMS(long ms)
abs_ts.tv_nsec = rm_ts.tv_nsec;
} while (nanosleep(&abs_ts, &rm_ts) < 0);
#endif
}
//------------------------------------------------------------------------------
@ -274,11 +270,7 @@ void BulkLoad::parse(int id)
<< endl
<< timeString << ": BulkLoad::parse(" << id << "); "
<<
#ifdef _MSC_VER
" Worker Thread " << GetCurrentThreadId() <<
#else
" Worker Thread " << pthread_self() <<
#endif
":" << endl
<< "---------------------------------------"
"-------------------"
@ -444,11 +436,7 @@ bool BulkLoad::lockColumnForParse(int thrdId, int& tableId, int& columnId, int&
std::string bufStatusStr;
Status stat = fTableInfo[i].getStatusTI();
ColumnInfo::convertStatusToString(stat, bufStatusStr);
#ifdef _MSC_VER
oss << " - " << GetCurrentThreadId() <<
#else
oss << " - " << pthread_self() <<
#endif
":fTableInfo[" << i << "]" << bufStatusStr << " (" << stat << ")";
if (stat != WriteEngine::PARSE_COMPLETE)