forked from Mirrors/privacore-open-source-search-engine
Merge branch 'diffbot' of github.com:gigablast/open-source-search-engine into diffbot
This commit is contained in:
@ -1616,7 +1616,8 @@ void RdbBase::gotTokenForMerge ( ) {
|
||||
return;
|
||||
}
|
||||
// make a log note
|
||||
log(LOG_INFO,"merge: Resuming killed merge for %s.",m_dbname);
|
||||
log(LOG_INFO,"merge: Resuming killed merge for %s coll=%s.",
|
||||
m_dbname,m_coll);
|
||||
// compute the total size of merged file
|
||||
mint = 0;
|
||||
long mm = 0;
|
||||
|
@ -2224,6 +2224,10 @@ long SpiderColl::getNextIpFromWaitingTree ( ) {
|
||||
// current time on host #0
|
||||
uint64_t nowMS = gettimeofdayInMillisecondsGlobal();
|
||||
top:
|
||||
|
||||
// we might have deleted the only node below...
|
||||
if ( m_waitingTree.isEmpty() ) return 0;
|
||||
|
||||
// advance to next
|
||||
//m_waitingTreeKey += 1LL;
|
||||
// assume none
|
||||
|
Reference in New Issue
Block a user