Mirrors/privacore-open-source-search-engine
1
0
Fork 1
mirror of https://github.com/privacore/open-source-search-engine.git synced 2025-07-15 02:36:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

char / bool handling in Rebalance

Browse Source
This commit is contained in:
Brian Rasmusson
2016-10-20 22:32:46 +02:00
parent 2969e28775
commit 53d8a61ce0
2 changed files with 12 additions and 12 deletions

22
Rebalance.cpp

@ -37,7 +37,7 @@ Rebalance::Rebalance ( ) {
KEYMIN ( m_nextKey , MAX_KEY_BYTES );
KEYMAX ( m_endKey , MAX_KEY_BYTES );
m_needsRebalanceValid = false;
m_needsRebalance = false;
m_needsRebalance = (char)false;
m_warnedUser = false;
m_userApproved = false;
m_isScanning = false;
@ -61,7 +61,7 @@ const char *Rebalance::getNeedsRebalance ( ) {
// for simplicty, only gb shards on stripe 0 should run this i guess
if ( g_hostdb.m_myHost->m_stripe != 0 ) {
m_needsRebalanceValid = true;
m_needsRebalance = false;
m_needsRebalance = (char)false;
return &m_needsRebalance;
}
@ -82,7 +82,7 @@ const char *Rebalance::getNeedsRebalance ( ) {
saveRebalanceFile();
// assume we do not need a rebalance
m_needsRebalanceValid = true;
m_needsRebalance = false;
m_needsRebalance = (char)false;
return &m_needsRebalance;
}
@ -90,7 +90,7 @@ const char *Rebalance::getNeedsRebalance ( ) {
if ( sb.length() <= 10 ) {
// we need it!
m_needsRebalanceValid = true;
m_needsRebalance = true;
m_needsRebalance = (char)true;
return &m_needsRebalance;
}
@ -136,16 +136,16 @@ const char *Rebalance::getNeedsRebalance ( ) {
// we are valid now either way
m_needsRebalanceValid = true;
// assume ok
m_needsRebalance = false;
m_needsRebalance = (char)false;
// if hosts.conf is different and we are part of a different
// shard then we must auto scale
if ( x != (int32_t)g_hostdb.m_myHost->m_shardNum) m_needsRebalance = true;
if ( y != g_hostdb.m_numShards ) m_needsRebalance = true;
if ( z != g_hostdb.getNumHostsPerShard()) m_needsRebalance = true;
if ( rebalancing ) m_needsRebalance = true;
if ( x != (int32_t)g_hostdb.m_myHost->m_shardNum) m_needsRebalance = (char)true;
if ( y != g_hostdb.m_numShards ) m_needsRebalance = (char)true;
if ( z != g_hostdb.getNumHostsPerShard()) m_needsRebalance = (char)true;
if ( rebalancing ) m_needsRebalance = (char)true;
// how can this be?
if ( m_numForeignRecs ) m_needsRebalance = true;
if ( m_numForeignRecs ) m_needsRebalance = (char)true;
// and we don't need user consent, they already did last time
if ( rebalancing ) {
@ -276,7 +276,7 @@ void Rebalance::scanLoop ( ) {
// done:
// all done
m_isScanning = false;
m_needsRebalance = false;
m_needsRebalance = (char)false;
// get rid of the 'F' flag in PageHosts.cpp
m_numForeignRecs = 0;

2
Rebalance.h

@ -36,7 +36,7 @@ class Rebalance {
char m_nextKey[MAX_KEY_BYTES];
char m_endKey[MAX_KEY_BYTES];
bool m_needsRebalanceValid;
char m_needsRebalance;
char m_needsRebalance; // may be -1
bool m_warnedUser;
bool m_userApproved;
bool m_isScanning;