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

DBBuilder: check syscat files instead dirs

Browse Source
This commit is contained in:
Denis Khalikov
2024-11-25 16:02:37 +00:00
committed by Leonid Fedorov
parent 55b09a71fc
commit 80277a5e7d
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/dbbuilder/dbbuilder.cpp
View File

@ -68,7 +68,7 @@ int checkNotThere(WriteEngine::FID fid)
{
WriteEngine::FileOp fileOp;
return (fileOp.existsOIDDir(fid) ? -1 : 0);
return (fileOp.existsDefaultFile(fid) ? -1 : 0);
}
void usage()

26
writeengine/shared/we_fileop.cpp
View File

@ -496,7 +496,6 @@ bool FileOp::existsOIDDir(FID fid) const
{
return false;
}
return exists(fileName);
}
@ -1809,8 +1808,7 @@ void FileOp::initDbRootExtentMutexes()
for (size_t i = 0; i < rootIds.size(); i++)
{
m_DbRootAddExtentMutexes.emplace(std::piecewise_construct,
std::forward_as_tuple(rootIds[i]),
m_DbRootAddExtentMutexes.emplace(std::piecewise_construct, std::forward_as_tuple(rootIds[i]),
std::forward_as_tuple());
}
}
@ -2225,7 +2223,6 @@ int FileOp::oid2DirName(FID fid, char* oidDirName) const
return NO_ERROR;
}
if (oidDirName == nullptr)
{
return ERR_INTERNAL;
@ -2250,6 +2247,26 @@ int FileOp::oid2DirName(FID fid, char* oidDirName) const
return ERR_FILE_NOT_EXIST;
}
bool FileOp::existsDefaultFile(FID fid) const
{
char dbDir[MAX_DB_DIR_LEVEL][MAX_DB_DIR_NAME_SIZE];
char fileName[FILE_NAME_SIZE];
RETURN_ON_ERROR((Convertor::oid2FileName(fid, fileName, dbDir, 0, 0)));
std::vector<std::string> dbRootPathList;
Config::getDBRootPathList(dbRootPathList);
for (unsigned i = 0; i < dbRootPathList.size(); i++)
{
std::stringstream stream;
stream << dbRootPathList[i].c_str() << "/" << fileName;
string fullFileName = stream.str();
if (IDBPolicy::exists(fullFileName.c_str()))
return true;
}
return false;
}
/***********************************************************
* DESCRIPTION:
* Construct directory path for the specified fid (OID), DBRoot, and
@ -2555,7 +2572,6 @@ bool FileOp::isDiskSpaceAvail(const std::string& fileName, int nBlocks) const
//"; pctUsed: " << (((totalBlocks-freeBlocks)/totalBlocks)*100.0) <<
//"; bAvail: " << bSpaceAvail << std::endl;
}
}
return bSpaceAvail;

7
writeengine/shared/we_fileop.h
View File

@ -27,7 +27,6 @@
#include <map>
#include <boost/thread.hpp>
#include "we_blockop.h"
#include "we_brm.h"
#include "we_config.h"
@ -130,6 +129,12 @@ class FileOp : public BlockOp, public WeUIDGID
*/
EXPORT bool existsOIDDir(FID fid) const;
/**
* @brief Check whether a column file exists by the given `fid` in all
* available db roots and default values for `partition` and `segment`.
*/
EXPORT bool existsDefaultFile(FID fid) const;
/**
* @brief Expand current abbreviated extent for this column to a full extent
*