forked from Mirrors/privacore-open-source-search-engine
Remove unused niceness args
This commit is contained in:
2
Msg5.cpp
2
Msg5.cpp
@ -1134,7 +1134,7 @@ void Msg5::mergeLists() {
|
||||
// Rdb::addRecord() NOT to do the annihilation, therefore it's good
|
||||
// to do the merge to do the annihilation
|
||||
//else
|
||||
m_list->merge_r ( m_listPtrs, m_numListPtrs, m_startKey, m_minEndKey, m_minRecSizes, m_removeNegRecs, m_rdbId, niceness );
|
||||
m_list->merge_r(m_listPtrs, m_numListPtrs, m_startKey, m_minEndKey, m_minRecSizes, m_removeNegRecs, m_rdbId);
|
||||
m_list->resetListPtr(); //merge_r() doesn't rewind the list iterator/pointer (?)
|
||||
|
||||
// maintain this info for truncation purposes
|
||||
|
25
RdbList.cpp
25
RdbList.cpp
@ -1819,14 +1819,7 @@ bool RdbList::posdbConstrain(const char *startKey, char *endKey, int32_t minRecS
|
||||
// before calling this
|
||||
// . CAUTION: you should call constrain() on all "lists" before calling this
|
||||
// so we don't have to do boundary checks on the keys here
|
||||
void RdbList::merge_r ( RdbList **lists ,
|
||||
int32_t numLists ,
|
||||
const char *startKey ,
|
||||
const char *endKey ,
|
||||
int32_t minRecSizes ,
|
||||
bool removeNegRecs ,
|
||||
char rdbId ,
|
||||
int32_t niceness ) {
|
||||
void RdbList::merge_r(RdbList **lists, int32_t numLists, const char *startKey, const char *endKey, int32_t minRecSizes, bool removeNegRecs, char rdbId) {
|
||||
// sanity
|
||||
if ( ! m_ownData ) {
|
||||
log("list: merge_r data not owned");
|
||||
@ -1906,8 +1899,8 @@ void RdbList::merge_r ( RdbList **lists ,
|
||||
return;
|
||||
}
|
||||
|
||||
if ( rdbId == RDB_POSDB ) {
|
||||
posdbMerge_r ( lists, numLists, startKey, endKey, m_mergeMinListSize, removeNegRecs, niceness );
|
||||
if (rdbId == RDB_POSDB) {
|
||||
posdbMerge_r(lists, numLists, startKey, endKey, m_mergeMinListSize, removeNegRecs);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -2329,23 +2322,13 @@ skip:
|
||||
*/
|
||||
}
|
||||
|
||||
#include "Msg3.h" // #define for MAX_RDB_FILES
|
||||
|
||||
////////
|
||||
//
|
||||
// SPECIALTY MERGE FOR POSDB
|
||||
//
|
||||
///////
|
||||
|
||||
|
||||
|
||||
bool RdbList::posdbMerge_r ( RdbList **lists ,
|
||||
int32_t numLists ,
|
||||
const char *startKey ,
|
||||
const char *endKey ,
|
||||
int32_t minRecSizes ,
|
||||
bool removeNegKeys ,
|
||||
int32_t niceness ) {
|
||||
bool RdbList::posdbMerge_r(RdbList **lists, int32_t numLists, const char *startKey, const char *endKey, int32_t minRecSizes, bool removeNegKeys) {
|
||||
// sanity
|
||||
if ( m_ks != sizeof(key144_t) ) { g_process.shutdownAbort(true); }
|
||||
//no-op check
|
||||
|
18
RdbList.h
18
RdbList.h
@ -200,22 +200,8 @@ class RdbList {
|
||||
// . merge the lists into this list
|
||||
// . set our startKey/endKey to "startKey"/"endKey"
|
||||
// . exclude any records from lists not in that range
|
||||
void merge_r ( RdbList **lists ,
|
||||
int32_t numLists ,
|
||||
const char *startKey ,
|
||||
const char *endKey ,
|
||||
int32_t minRecSizes ,
|
||||
bool removeNegRecs ,
|
||||
char rdbId ,
|
||||
int32_t niceness );
|
||||
|
||||
bool posdbMerge_r ( RdbList **lists ,
|
||||
int32_t numLists ,
|
||||
const char *startKey ,
|
||||
const char *endKey ,
|
||||
int32_t minRecSizes ,
|
||||
bool removeNegKeys ,
|
||||
int32_t niceness ) ;
|
||||
void merge_r(RdbList **lists, int32_t numLists, const char *startKey, const char *endKey, int32_t minRecSizes, bool removeNegRecs, char rdbId);
|
||||
bool posdbMerge_r(RdbList **lists, int32_t numLists, const char *startKey, const char *endKey, int32_t minRecSizes, bool removeNegKeys);
|
||||
|
||||
|
||||
// returns false if we skipped into a black hole (end of list)
|
||||
|
Reference in New Issue
Block a user