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

16
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -74,9 +74,6 @@ using namespace rowgroup;
#include <boost/thread/mutex.hpp>
#include <boost/version.hpp>
#ifdef _MSC_VER
#include "idbregistry.h"
#endif
#undef BAIL_IF_0
#if 1
@ -861,11 +858,7 @@ void CalpontSystemCatalog::getSysData_EC(CalpontSelectExecutionPlan& csep, NJLSy
if (retryNum >= 6)
throw runtime_error("Error occured when calling makeJobList");
#ifdef _MSC_VER
Sleep(1 * 1000);
#else
sleep(1);
#endif
jl = JobListFactory::makeJobList(&csep, rm, dummyPrimitiveServerThreadPools, true);
retryNum++;
}
@ -1948,16 +1941,7 @@ CalpontSystemCatalog::CalpontSystemCatalog() : fExeMgr(new ClientRotator(0, "Exe
string localModuleType;
const char* p = 0;
// see if env is set to override identity lookup
#ifdef _MSC_VER
p = "EC";
string cfStr = IDBreadRegistry("SyscatIdent");
if (!cfStr.empty())
p = cfStr.c_str();
#else
p = getenv("CALPONT_CSC_IDENT");
#endif
if (p && *p)
{