forked from Mirrors/privacore-open-source-search-engine
Removed unused 'supportLists' parameter+member from RdbCache
This commit is contained in:
3
Dns.cpp
3
Dns.cpp
@ -163,7 +163,6 @@ bool Dns::init ( uint16_t clientPort ) {
|
||||
// set the cache
|
||||
if ( ! m_rdbCache.init ( maxMem ,
|
||||
4 , // fixed data size of rec
|
||||
false , // support lists of recs?
|
||||
maxCacheNodes ,
|
||||
false , // use half keys?
|
||||
"dns" , // dbname
|
||||
@ -178,7 +177,6 @@ bool Dns::init ( uint16_t clientPort ) {
|
||||
int32_t maxMemLocal = 100000;
|
||||
if ( ! m_rdbCacheLocal.init ( maxMemLocal ,
|
||||
4 , // fixed data size of rec
|
||||
false , // support lists of recs?
|
||||
maxMemLocal/25,
|
||||
false , // use half keys?
|
||||
"dnsLocal" , // dbname
|
||||
@ -221,7 +219,6 @@ bool Dns::init ( uint16_t clientPort ) {
|
||||
maxCacheNodes = maxCacheMem / 25;
|
||||
g_timedoutCache.init ( maxCacheMem ,
|
||||
4 , // fixed data size of rec
|
||||
false , // support lists of recs?
|
||||
maxCacheNodes ,
|
||||
false , // use half keys?
|
||||
"dnstimedout" , // dbname
|
||||
|
@ -128,7 +128,6 @@ bool Msg13::registerHandler ( ) {
|
||||
|
||||
if ( ! s_httpCacheRobots.init ( memRobots ,
|
||||
-1 , // fixedDataSize
|
||||
false , // lists o recs?
|
||||
maxCacheNodesRobots ,
|
||||
false , // use half keys
|
||||
"robots.txt" , // dbname
|
||||
@ -137,7 +136,6 @@ bool Msg13::registerHandler ( ) {
|
||||
|
||||
if ( ! s_httpCacheOthers.init ( memOthers ,
|
||||
-1 , // fixedDataSize
|
||||
false , // lists o recs?
|
||||
maxCacheNodesOthers ,
|
||||
false , // use half keys
|
||||
"htmlPages" , // dbname
|
||||
@ -563,7 +561,6 @@ void handleRequest13 ( UdpSlot *slot , int32_t niceness ) {
|
||||
s_flag = true;
|
||||
s_hammerCache.init ( 15000 , // maxcachemem,
|
||||
8 , // fixed data size
|
||||
false , // support lists?
|
||||
500 , // max nodes
|
||||
false , // use half keys?
|
||||
"hamcache" , // dbname
|
||||
|
1
Msg3.cpp
1
Msg3.cpp
@ -180,7 +180,6 @@ class RdbCache *getDiskPageCache ( rdbid_t rdbId ) {
|
||||
// re-init or init for the first time here
|
||||
if ( ! rpc->init ( maxMem ,
|
||||
-1 , // fixedDataSize. -1 since we are lists
|
||||
false , // support lists?
|
||||
maxRecs ,
|
||||
false , // use half keys?
|
||||
dbname ,
|
||||
|
@ -406,7 +406,6 @@ void Msg51::gotClusterRec(Slot *slot) {
|
||||
if(!s_cacheInit &&
|
||||
s_clusterdbQuickCache.init(200*1024, // maxMem
|
||||
sizeof(key96_t), // fixedDataSize (clusterdb rec)
|
||||
false, // support lists
|
||||
10000, // max recs
|
||||
false, // use half keys?
|
||||
"clusterdbQuickCache" ,
|
||||
|
@ -265,7 +265,6 @@ static void initializeCaches() {
|
||||
int32_t maxNodes = maxMem / 17; // 8+8+1
|
||||
if( ! g_termFreqCache.init ( maxMem , // maxmem 20MB
|
||||
8 , // fixed data size
|
||||
false , // supportlists?
|
||||
maxNodes ,
|
||||
false , // use half keys?
|
||||
"tfcache", // dbname
|
||||
@ -277,7 +276,6 @@ static void initializeCaches() {
|
||||
mstrerror(g_errno));
|
||||
if(!g_termListSize.init(maxMem , // maxmem 20MB
|
||||
8 , // fixed data size
|
||||
false , // supportlists?
|
||||
maxNodes ,
|
||||
false , // use half keys?
|
||||
"tscache", // dbname
|
||||
|
18
RdbCache.cpp
18
RdbCache.cpp
@ -37,7 +37,6 @@ RdbCache::RdbCache() : m_dbname(NULL) {
|
||||
m_memoryLabelPtrs[0] = '\0';
|
||||
m_memoryLabelBufs[0] = '\0';
|
||||
m_fixedDataSize = 0;
|
||||
m_supportLists = false;
|
||||
m_useHalfKeys = false;
|
||||
m_useDisk = false;
|
||||
m_wrapped = 0;
|
||||
@ -92,7 +91,6 @@ void RdbCache::reset ( ) {
|
||||
|
||||
bool RdbCache::init ( int32_t maxMem ,
|
||||
int32_t fixedDataSize ,
|
||||
bool supportLists ,
|
||||
int32_t maxRecs ,
|
||||
bool useHalfKeys ,
|
||||
const char *dbname ,
|
||||
@ -139,7 +137,6 @@ bool RdbCache::init ( int32_t maxMem ,
|
||||
// this is the fixed dataSize of all records in a list, not the
|
||||
// fixed dataSize of a list itself. Note that.
|
||||
m_fixedDataSize = fixedDataSize;
|
||||
m_supportLists = supportLists;
|
||||
m_useHalfKeys = useHalfKeys;
|
||||
m_useDisk = loadFromDisk;
|
||||
m_dbname = dbname;
|
||||
@ -479,7 +476,7 @@ bool RdbCache::getRecord ( collnum_t collnum ,
|
||||
p += 4;
|
||||
// store data size if our recs are var length or we cache lists of
|
||||
// fixed length recs, and those lists need a dataSize
|
||||
if ( m_fixedDataSize == -1 || m_supportLists ) {
|
||||
if ( m_fixedDataSize == -1 ) {
|
||||
*recSize = *(int32_t *)p; p += 4; }
|
||||
else
|
||||
*recSize = m_fixedDataSize;
|
||||
@ -626,7 +623,7 @@ bool RdbCache::addRecord ( collnum_t collnum ,
|
||||
int32_t need = recSize1 + recSize2;
|
||||
|
||||
// are we bad?
|
||||
if (m_fixedDataSize>=0 && ! m_supportLists && need != m_fixedDataSize){
|
||||
if (m_fixedDataSize>=0 && need != m_fixedDataSize){
|
||||
log(LOG_LOGIC,"db: cache: addRecord: %" PRId32" != %" PRId32".", need,m_fixedDataSize);
|
||||
gbshutdownLogicError();
|
||||
}
|
||||
@ -647,7 +644,7 @@ bool RdbCache::addRecord ( collnum_t collnum ,
|
||||
// . this DELIMETER tells us to go to the next buf
|
||||
need += sizeof(collnum_t) + m_cks + 4 ;
|
||||
// and size, if not fixed or we support lists
|
||||
if ( m_fixedDataSize == -1 || m_supportLists ) need += 4;
|
||||
if ( m_fixedDataSize == -1 ) need += 4;
|
||||
// watch out
|
||||
if ( need >= m_totalBufSize ) {
|
||||
log(LOG_INFO, "db: Could not fit record of %" PRId32" bytes into %s cache. Max size is %" PRId32".",
|
||||
@ -736,7 +733,7 @@ bool RdbCache::addRecord ( collnum_t collnum ,
|
||||
*(int32_t *)p = timestamp; p += 4;
|
||||
|
||||
// then dataSize if we need to
|
||||
if ( m_fixedDataSize == -1 || m_supportLists ) {
|
||||
if ( m_fixedDataSize == -1 ) {
|
||||
*(int32_t *)p = recSize1+recSize2; p +=4; //datasize
|
||||
// sanity : check if the recSizes add up right
|
||||
} else if ( m_fixedDataSize != recSize1 + recSize2 ){
|
||||
@ -855,7 +852,7 @@ bool RdbCache::deleteRec ( ) {
|
||||
// get data size
|
||||
int32_t dataSize;
|
||||
// get dataSize and data
|
||||
if ( m_fixedDataSize == -1 || m_supportLists ) {
|
||||
if ( m_fixedDataSize == -1 ) {
|
||||
dataSize = *(int32_t *)p; p += 4; }
|
||||
else
|
||||
dataSize = m_fixedDataSize;
|
||||
@ -900,7 +897,7 @@ bool RdbCache::deleteRec ( ) {
|
||||
void RdbCache::markDeletedRecord(char *ptr){
|
||||
int32_t dataSize = sizeof(collnum_t)+m_cks+sizeof(int32_t);
|
||||
// get dataSize and data
|
||||
if ( m_fixedDataSize == -1 || m_supportLists ) {
|
||||
if ( m_fixedDataSize == -1 ) {
|
||||
dataSize += 4 + // size
|
||||
*(int32_t*)(ptr+
|
||||
sizeof(collnum_t)+ // collnum
|
||||
@ -1378,7 +1375,6 @@ bool RdbCache::convertCache ( int32_t numPtrsMax , int32_t maxMem ) {
|
||||
RdbCache tmp;
|
||||
if ( ! tmp.init ( maxMem ,
|
||||
m_fixedDataSize ,
|
||||
m_supportLists ,
|
||||
maxRecs ,
|
||||
m_useHalfKeys ,
|
||||
m_dbname ,
|
||||
@ -1478,7 +1474,7 @@ void RdbCache::verify(){
|
||||
// get data size
|
||||
int32_t dataSize;
|
||||
// get dataSize and data
|
||||
if ( m_fixedDataSize == -1 || m_supportLists ) {
|
||||
if ( m_fixedDataSize == -1 ) {
|
||||
dataSize = *(int32_t *)p; p += 4; }
|
||||
else
|
||||
dataSize = m_fixedDataSize;
|
||||
|
@ -76,7 +76,6 @@ class RdbCache {
|
||||
// . can only do this if fixedDataSize is not -1
|
||||
bool init ( int32_t maxCacheMem ,
|
||||
int32_t fixedDataSize ,
|
||||
bool supportLists ,
|
||||
int32_t maxCacheNodes ,
|
||||
bool useHalfKeys ,
|
||||
const char *dbname ,
|
||||
@ -309,7 +308,6 @@ private:
|
||||
GbMutex mtx_hits_misses; //mutex protecting just hits&misses
|
||||
|
||||
int32_t m_fixedDataSize;
|
||||
bool m_supportLists;
|
||||
bool m_useHalfKeys;
|
||||
bool m_useDisk; // load/save from disk?
|
||||
|
||||
|
@ -162,7 +162,6 @@ bool SpiderColl::load ( ) {
|
||||
|
||||
if ( ! m_lastDownloadCache.init ( maxMem , // maxcachemem,
|
||||
8 , // fixed data size (MS)
|
||||
false , // support lists?
|
||||
maxNodes , // max nodes
|
||||
false , // use half keys?
|
||||
"downcache", // dbname
|
||||
@ -572,7 +571,6 @@ bool SpiderColl::isInDupCache(const SpiderRequest *sreq, bool addToCache) {
|
||||
// use 50k i guess of 64bit numbers and linked list info
|
||||
m_dupCache.init ( 90000,
|
||||
4 , // fixeddatasize (don't really need this)
|
||||
false, // list support?
|
||||
5000, // maxcachenodes
|
||||
false, // usehalfkeys?
|
||||
"urldups", // dbname
|
||||
|
@ -118,7 +118,6 @@ void SpiderLoop::init() {
|
||||
|
||||
if ( ! m_winnerListCache.init ( 20000000 , // maxcachemem, 20MB
|
||||
-1 , // fixedatasize
|
||||
false , // supportlists?
|
||||
10000 , // maxcachenodes
|
||||
false , // use half keys
|
||||
"winnerspidercache", // dbname
|
||||
|
2
main.cpp
2
main.cpp
@ -4779,7 +4779,6 @@ static bool cacheTest() {
|
||||
// set the cache
|
||||
if ( ! c.init ( maxMem ,
|
||||
4 , // fixed data size of rec
|
||||
false , // support lists of recs?
|
||||
maxCacheNodes ,
|
||||
false , // use half keys?
|
||||
"cachetest" , // dbname
|
||||
@ -4856,7 +4855,6 @@ static bool cacheTest() {
|
||||
// set the cache
|
||||
if ( ! c.init ( maxMem ,
|
||||
-1 , // fixed data size of rec
|
||||
false , // support lists of recs?
|
||||
maxCacheNodes ,
|
||||
false , // use half keys?
|
||||
"cachetest" , // dbname
|
||||
|
Reference in New Issue
Block a user