Removed unused 'useHalfKeys' parameter+member from RdbCache

This commit is contained in:
Ivan Skytte Jørgensen
2017-10-20 15:03:05 +02:00
parent 59b28df56e
commit 96c749d79b
10 changed files with 0 additions and 21 deletions

@ -164,7 +164,6 @@ bool Dns::init ( uint16_t clientPort ) {
if ( ! m_rdbCache.init ( maxMem ,
4 , // fixed data size of rec
maxCacheNodes ,
false , // use half keys?
"dns" , // dbname
true )) { // save cache to disk?
log( LOG_ERROR, "dns: Cache init failed." );
@ -178,7 +177,6 @@ bool Dns::init ( uint16_t clientPort ) {
if ( ! m_rdbCacheLocal.init ( maxMemLocal ,
4 , // fixed data size of rec
maxMemLocal/25,
false , // use half keys?
"dnsLocal" , // dbname
true )) { // save cache?
log( LOG_ERROR, "dns: Cache local init failed." );
@ -220,7 +218,6 @@ bool Dns::init ( uint16_t clientPort ) {
g_timedoutCache.init ( maxCacheMem ,
4 , // fixed data size of rec
maxCacheNodes ,
false , // use half keys?
"dnstimedout" , // dbname
true ); // save cache?
return true;

@ -129,7 +129,6 @@ bool Msg13::registerHandler ( ) {
if ( ! s_httpCacheRobots.init ( memRobots ,
-1 , // fixedDataSize
maxCacheNodesRobots ,
false , // use half keys
"robots.txt" , // dbname
true ))// save to disk
return false;
@ -137,7 +136,6 @@ bool Msg13::registerHandler ( ) {
if ( ! s_httpCacheOthers.init ( memOthers ,
-1 , // fixedDataSize
maxCacheNodesOthers ,
false , // use half keys
"htmlPages" , // dbname
true ))// save to disk
return false;
@ -562,7 +560,6 @@ void handleRequest13 ( UdpSlot *slot , int32_t niceness ) {
s_hammerCache.init ( 15000 , // maxcachemem,
8 , // fixed data size
500 , // max nodes
false , // use half keys?
"hamcache" , // dbname
false , // load from disk?
12 , // key size

@ -181,7 +181,6 @@ class RdbCache *getDiskPageCache ( rdbid_t rdbId ) {
if ( ! rpc->init ( maxMem ,
-1 , // fixedDataSize. -1 since we are lists
maxRecs ,
false , // use half keys?
dbname ,
false , // loadfromdisk
sizeof(key192_t), // cache key size

@ -407,7 +407,6 @@ void Msg51::gotClusterRec(Slot *slot) {
s_clusterdbQuickCache.init(200*1024, // maxMem
sizeof(key96_t), // fixedDataSize (clusterdb rec)
10000, // max recs
false, // use half keys?
"clusterdbQuickCache" ,
false, // load from disk?
sizeof(key96_t), // cache key size

@ -266,7 +266,6 @@ static void initializeCaches() {
if( ! g_termFreqCache.init ( maxMem , // maxmem 20MB
8 , // fixed data size
maxNodes ,
false , // use half keys?
"tfcache", // dbname
false , // load from disk?
8 , // cache key size
@ -277,7 +276,6 @@ static void initializeCaches() {
if(!g_termListSize.init(maxMem , // maxmem 20MB
8 , // fixed data size
maxNodes ,
false , // use half keys?
"tscache", // dbname
false , // load from disk?
8 , // cache key size

@ -37,7 +37,6 @@ RdbCache::RdbCache() : m_dbname(NULL) {
m_memoryLabelPtrs[0] = '\0';
m_memoryLabelBufs[0] = '\0';
m_fixedDataSize = 0;
m_useHalfKeys = false;
m_useDisk = false;
m_wrapped = 0;
m_cks = 0;
@ -92,7 +91,6 @@ void RdbCache::reset ( ) {
bool RdbCache::init ( int32_t maxMem ,
int32_t fixedDataSize ,
int32_t maxRecs ,
bool useHalfKeys ,
const char *dbname ,
bool loadFromDisk ,
char cacheKeySize ,
@ -137,7 +135,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_useHalfKeys = useHalfKeys;
m_useDisk = loadFromDisk;
m_dbname = dbname;
m_dks = dataKeySize;
@ -1376,7 +1373,6 @@ bool RdbCache::convertCache ( int32_t numPtrsMax , int32_t maxMem ) {
if ( ! tmp.init ( maxMem ,
m_fixedDataSize ,
maxRecs ,
m_useHalfKeys ,
m_dbname ,
true , // loadFromDisk
m_cks , // cacheKeySize

@ -77,7 +77,6 @@ class RdbCache {
bool init ( int32_t maxCacheMem ,
int32_t fixedDataSize ,
int32_t maxCacheNodes ,
bool useHalfKeys ,
const char *dbname ,
bool loadFromDisk ,
char cacheKeySize = 12 ,
@ -308,7 +307,6 @@ private:
GbMutex mtx_hits_misses; //mutex protecting just hits&misses
int32_t m_fixedDataSize;
bool m_useHalfKeys;
bool m_useDisk; // load/save from disk?
// have we wrapped yet?

@ -163,7 +163,6 @@ bool SpiderColl::load ( ) {
if ( ! m_lastDownloadCache.init ( maxMem , // maxcachemem,
8 , // fixed data size (MS)
maxNodes , // max nodes
false , // use half keys?
"downcache", // dbname
false , // load from disk?
12 , // key size (firstip)
@ -572,7 +571,6 @@ bool SpiderColl::isInDupCache(const SpiderRequest *sreq, bool addToCache) {
m_dupCache.init ( 90000,
4 , // fixeddatasize (don't really need this)
5000, // maxcachenodes
false, // usehalfkeys?
"urldups", // dbname
false, // loadfromdisk
12, // cachekeysize

@ -119,7 +119,6 @@ void SpiderLoop::init() {
if ( ! m_winnerListCache.init ( 20000000 , // maxcachemem, 20MB
-1 , // fixedatasize
10000 , // maxcachenodes
false , // use half keys
"winnerspidercache", // dbname
false ) )
log(LOG_WARN, "spider: failed to init winnerlist cache. slows down.");

@ -4780,7 +4780,6 @@ static bool cacheTest() {
if ( ! c.init ( maxMem ,
4 , // fixed data size of rec
maxCacheNodes ,
false , // use half keys?
"cachetest" , // dbname
false )) {// save cache to disk?
log(LOG_WARN, "test: Cache init failed.");
@ -4856,7 +4855,6 @@ static bool cacheTest() {
if ( ! c.init ( maxMem ,
-1 , // fixed data size of rec
maxCacheNodes ,
false , // use half keys?
"cachetest" , // dbname
false )) { // save cache to disk?
log(LOG_WARN, "test: Cache init failed.");