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

MCOL-537, cleanup compiler warnings. Checkpointing a bunch of fixes.

Browse Source 
Work in progress...
This commit is contained in:
Patrick LeBlanc
2018-11-19 13:19:15 -06:00
committed by Roman Nozdrin
parent f4f053dd8c
commit cbbf267e88
24 changed files with 85 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writeengine/wrapper/we_colop.cpp
View File

@ -238,7 +238,7 @@ int ColumnOp::allocRowId(const TxnID& txnid, bool useStartingExtent,
for (i = 0; i < dbRootExtentTrackers.size(); i++)
{
if (i != column.colNo)
if (i != (int) column.colNo)
dbRootExtentTrackers[i]->nextSegFile(dbRoot, partition, segment, newHwm, startLbid);
// Round up HWM to the end of the current extent

10
writeengine/xml/we_xmlgenproc.cpp
View File

@ -442,6 +442,9 @@ void XMLGenProc::getColumnsForTable(
//------------------------------------------------------------------------------
// Generate Job XML File Name
//------------------------------------------------------------------------------
// This isn't used currently, commenting it out
#if 0
std::string XMLGenProc::genJobXMLFileName( ) const
{
std::string xmlFileName;
@ -465,7 +468,10 @@ std::string XMLGenProc::genJobXMLFileName( ) const
if (!p.has_root_path())
{
char cwdPath[4096];
getcwd(cwdPath, sizeof(cwdPath));
char *buf;
buf = getcwd(cwdPath, sizeof(cwdPath));
if (buf == NULL)
throw runtime_error("Failed to get the current working directory!");
boost::filesystem::path p2(cwdPath);
p2 /= p;
xmlFileName = p2.string();
@ -479,6 +485,8 @@ std::string XMLGenProc::genJobXMLFileName( ) const
return xmlFileName;
}
#endif
//------------------------------------------------------------------------------
// writeXMLFile

2
writeengine/xml/we_xmlgenproc.h
View File

@ -90,7 +90,7 @@ public:
/** @brief Generate Job XML file name
*/
EXPORT std::string genJobXMLFileName( ) const;
//EXPORT std::string genJobXMLFileName( ) const;
/** @brief Write xml file document to the destination Job XML file.
*

8
writeengine/xml/we_xmljob.cpp
View File

@ -1301,7 +1301,13 @@ int XMLJob::genJobXMLFileName(
// nothing else to do
#else
char cwdPath[4096];
getcwd(cwdPath, sizeof(cwdPath));
char *err;
err = getcwd(cwdPath, sizeof(cwdPath));
if (err == NULL)
{
errMsg = "Failed to get the current working directory.";
return -1;
}
string trailingPath(xmlFilePath.string());
xmlFilePath = cwdPath;
xmlFilePath /= trailingPath;