database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-09 10:41:14 +03:00
Code Activity

Merge pull request #857 from pleblanc1976/develop

Browse Source 
MCOL-3488.  Writeengine getting IDB-FS an odd way
This commit is contained in:
Patrick LeBlanc
2019-09-09 15:17:09 -05:00
committed by GitHub
parent f3ae87a1ca b0e934dd2d
commit b727e37b98
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
writeengine/redistribute/we_redistributeworkerthread.cpp
View File

@@ -486,8 +486,9 @@ int RedistributeWorkerThread::sendData()
int16_t source = fPlanEntry.source; int16_t source = fPlanEntry.source;
int16_t dest = fPlanEntry.destination; int16_t dest = fPlanEntry.destination;
IDBDataFile::Types fileType = IDBDataFile::Types fileType = (IDBPolicy::useHdfs() ? IDBDataFile::HDFS :
(IDBPolicy::useHdfs() ? IDBDataFile::HDFS : IDBDataFile::UNBUFFERED); IDBPolicy::useCloud() ? IDBDataFile::CLOUD : IDBDataFile::UNBUFFERED);
IDBFileSystem& fs = IDBFileSystem::getFs( fileType ); IDBFileSystem& fs = IDBFileSystem::getFs( fileType );
if ((remotePM) && (fileType != IDBDataFile::HDFS)) if ((remotePM) && (fileType != IDBDataFile::HDFS))
@@ -1049,8 +1050,11 @@ void RedistributeWorkerThread::confirmToPeer()
} }
} }
IDBFileSystem& fs = IDBFileSystem::getFs( IDBFileSystem& fs = (IDBPolicy::useHdfs() ?
(IDBPolicy::useHdfs() ? IDBDataFile::HDFS : IDBDataFile::UNBUFFERED) ); IDBFileSystem::getFs(IDBDataFile::HDFS) :
IDBPolicy::useCloud() ?
IDBFileSystem::getFs(IDBDataFile::CLOUD) :
IDBFileSystem::getFs(IDBDataFile::BUFFERED));
uint32_t confirmCode = RED_DATA_COMMIT; uint32_t confirmCode = RED_DATA_COMMIT;
@@ -1519,8 +1523,11 @@ void RedistributeWorkerThread::handleDataAbort(SBS& sbs, size_t& size)
if (fNewFilePtr != NULL) if (fNewFilePtr != NULL)
closeFile(fNewFilePtr); closeFile(fNewFilePtr);
IDBFileSystem& fs = IDBFileSystem::getFs( IDBFileSystem& fs = (IDBPolicy::useHdfs() ?
(IDBPolicy::useHdfs() ? IDBDataFile::HDFS : IDBDataFile::UNBUFFERED) ); IDBFileSystem::getFs(IDBDataFile::HDFS) :
IDBPolicy::useCloud() ?
IDBFileSystem::getFs(IDBDataFile::CLOUD) :
IDBFileSystem::getFs(IDBDataFile::BUFFERED));
// remove local files // remove local files
for (set<string>::iterator i = fNewDirSet.begin(); i != fNewDirSet.end(); i++) for (set<string>::iterator i = fNewDirSet.begin(); i != fNewDirSet.end(); i++)

2
writeengine/server/we_getfilesizes.cpp
View File

@@ -183,6 +183,8 @@ struct ColumnThread
if (bUsingHdfs) if (bUsingHdfs)
fileType = IDBDataFile::HDFS; fileType = IDBDataFile::HDFS;
else if (IDBPolicy::useCloud())
fileType = IDBDataFile::CLOUD;
else else
fileType = IDBDataFile::UNBUFFERED; fileType = IDBDataFile::UNBUFFERED;

3
writeengine/shared/we_chunkmanager.cpp
View File

@@ -47,6 +47,7 @@ using namespace execplan;
#include "IDBDataFile.h" #include "IDBDataFile.h"
#include "IDBPolicy.h" #include "IDBPolicy.h"
#include "cloudio/SMFileSystem.h"
using namespace idbdatafile; using namespace idbdatafile;
namespace namespace
@@ -96,6 +97,8 @@ ChunkManager::ChunkManager() : fMaxActiveChunkNum(100), fLenCompressed(0), fIsBu
fLocalModuleId(Config::getLocalModuleID()), fLocalModuleId(Config::getLocalModuleID()),
fFs(fIsHdfs ? fFs(fIsHdfs ?
IDBFileSystem::getFs(IDBDataFile::HDFS) : IDBFileSystem::getFs(IDBDataFile::HDFS) :
IDBPolicy::useCloud() ?
IDBFileSystem::getFs(IDBDataFile::CLOUD) :
IDBFileSystem::getFs(IDBDataFile::BUFFERED)) IDBFileSystem::getFs(IDBDataFile::BUFFERED))
{ {
fUserPaddings = Config::getNumCompressedPadBlks() * BYTE_PER_BLOCK; fUserPaddings = Config::getNumCompressedPadBlks() * BYTE_PER_BLOCK;

4
writeengine/shared/we_confirmhdfsdbfile.cpp
View File

@@ -49,8 +49,10 @@ namespace WriteEngine
// on useHdfs() to tell me which FileSystem reference to get. // on useHdfs() to tell me which FileSystem reference to get.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
ConfirmHdfsDbFile::ConfirmHdfsDbFile() : ConfirmHdfsDbFile::ConfirmHdfsDbFile() :
fFs( (idbdatafile::IDBPolicy::useHdfs()) ? fFs(idbdatafile::IDBPolicy::useHdfs() ?
idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::HDFS) : idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::HDFS) :
idbdatafile::IDBPolicy::useCloud() ?
idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::CLOUD) :
idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::BUFFERED)) idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::BUFFERED))
{ {
} }