gigablast/open-source-search-engine
1
0
Fork 0
mirror of https://github.com/gigablast/open-source-search-engine.git synced 2024-10-04 12:17:35 +03:00
Code Issues Projects Releases Wiki Activity

tight merge during rebalance to save

Browse Source 
disk space, so neg recs annihilate pos recs.
This commit is contained in:
Matt Wells 2014-03-14 23:37:30 -07:00
parent 6c704f6fdf
commit 86147fe22c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RdbBase.cpp
View File

@ -1423,7 +1423,7 @@ void RdbBase::attemptMerge ( long niceness, bool forceMergeAll, bool doLog ,
// if we are reblancing this coll then keep merges tight so all
// the negative recs annihilate with the positive recs to free
// up disk space since we could be short on disk space.
if ( g_rebalance.m_inRebalanceLoop )
if ( g_rebalance.m_isScanning )
// if might have moved on if not able to merge because
// another was merging... so do this anyway...
//g_rebalance.m_collnum == m_collnum )
@ -1770,7 +1770,7 @@ void RdbBase::gotTokenForMerge ( ) {
// if we are reblancing this coll then keep merges tight so all
// the negative recs annihilate with the positive recs to free
// up disk space since we could be short on disk space.
if ( g_rebalance.m_inRebalanceLoop )
if ( g_rebalance.m_isScanning )
// if might have moved on if not able to merge because
// another was merging... so do this anyway...
//g_rebalance.m_collnum == m_collnum )
@ -1826,7 +1826,7 @@ void RdbBase::gotTokenForMerge ( ) {
// but if we are forcing then merge ALL, except one being dumped
if ( m_nextMergeForced ) n = numFiles;
// or if doing relabalncing, merge them all. tight merge
if ( g_rebalance.m_inRebalanceLoop ) n = numFiles;
if ( g_rebalance.m_isScanning ) n = numFiles;
//else if ( m_isTitledb ) {
// RdbBase *base = g_tfndb.getRdb()->m_bases[m_collnum];
// tfndbSize = base->getDiskSpaceUsed();

2
Rebalance.cpp
View File

@ -23,7 +23,7 @@ Rebalance g_rebalance;
Rebalance::Rebalance ( ) {
m_registered = false;
m_allowSave = false;
m_inRebalanceLoop = false;
//m_inRebalanceLoop = false;
m_numForeignRecs = 0;
m_rebalanceCount = 0LL;
m_scannedCount = 0LL;

2
Rebalance.h
View File

@ -23,7 +23,7 @@ class Rebalance {
bool gotList ( ) ;
bool saveRebalanceFile ( ) ;
bool m_inRebalanceLoop;
//bool m_inRebalanceLoop;
long m_numForeignRecs;
long long m_rebalanceCount;
long long m_scannedCount;