Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

privatize methods

This commit is contained in:
jsteemann 2016-08-25 10:07:23 +02:00
parent 2e48293c52
commit a71ed2a09d
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/StorageEngine/MMFilesCollection.h
View File

@ -69,10 +69,10 @@ class MMFilesCollection final : public PhysicalCollection {
char*& resultPosition, TRI_datafile_t*& resultDatafile) override;
/// @brief create compactor file
TRI_datafile_t* createCompactor(TRI_voc_fid_t fid, TRI_voc_size_t maximalSize) override;
TRI_datafile_t* createCompactor(TRI_voc_fid_t fid, TRI_voc_size_t maximalSize);
/// @brief close an existing compactor
int closeCompactor(TRI_datafile_t* datafile) override;
int closeCompactor(TRI_datafile_t* datafile);
/// @brief replace a datafile with a compactor
int replaceDatafileWithCompactor(TRI_datafile_t* datafile, TRI_datafile_t* compactor);

4
arangod/StorageEngine/MMFilesCompactorThread.cpp
View File

@ -438,7 +438,7 @@ void MMFilesCompactorThread::compactDatafiles(LogicalCollection* collection,
// now create a new compactor file
// we are re-using the _fid of the first original datafile!
compactor = collection->createCompactor(initial._fid, static_cast<TRI_voc_size_t>(initial._targetSize));
compactor = static_cast<MMFilesCollection*>(collection->getPhysical())->createCompactor(initial._fid, static_cast<TRI_voc_size_t>(initial._targetSize));
if (compactor == nullptr) {
// some error occurred
@ -495,7 +495,7 @@ void MMFilesCompactorThread::compactDatafiles(LogicalCollection* collection,
document->_datafileStatistics.remove(compaction._datafile->_fid);
}
if (collection->closeCompactor(compactor) != TRI_ERROR_NO_ERROR) {
if (static_cast<MMFilesCollection*>(collection->getPhysical())->closeCompactor(compactor) != TRI_ERROR_NO_ERROR) {
LOG_TOPIC(ERR, Logger::COMPACTOR) << "could not close compactor file";
// TODO: how do we recover from this state?
return;

10
arangod/VocBase/LogicalCollection.h
View File

@ -176,16 +176,6 @@ class LogicalCollection {
return getPhysical()->reserveJournalSpace(tick, size, resultPosition, resultDatafile);
}
/// @brief create compactor file
TRI_datafile_t* createCompactor(TRI_voc_fid_t fid, TRI_voc_size_t maximalSize) {
return getPhysical()->createCompactor(fid, maximalSize);
}
/// @brief close an existing compactor
int closeCompactor(TRI_datafile_t* datafile) {
return getPhysical()->closeCompactor(datafile);
}
int applyForTickRange(TRI_voc_tick_t dataMin, TRI_voc_tick_t dataMax,
std::function<bool(TRI_voc_tick_t foundTick, TRI_df_marker_t const* marker)> const& callback) {
return getPhysical()->applyForTickRange(dataMin, dataMax, callback);

6
arangod/VocBase/PhysicalCollection.h
View File

@ -70,12 +70,6 @@ class PhysicalCollection {
virtual int reserveJournalSpace(TRI_voc_tick_t tick, TRI_voc_size_t size,
char*& resultPosition, TRI_datafile_t*& resultDatafile) = 0;
/// @brief create compactor file
virtual TRI_datafile_t* createCompactor(TRI_voc_fid_t fid, TRI_voc_size_t maximalSize) = 0;
/// @brief close an existing compactor
virtual int closeCompactor(TRI_datafile_t* datafile) = 0;
/// @brief seal a datafile
virtual int sealDatafile(TRI_datafile_t* datafile, bool isCompactor) = 0;