Forks/privacore-open-source-search-engine
1
0
Fork 0
forked from Mirrors/privacore-open-source-search-engine
Code Pull Requests Activity

Use 18 instead of m_ks. It's posdb specific function means m_ks will be 18

Browse Source
This commit is contained in:
Ai Lin Chia
2016-08-16 15:51:38 +02:00
parent 0e7d56a361
commit 0f8feda6c1
1 changed files with 12 additions and 12 deletions

24
RdbList.cpp

@ -1602,7 +1602,7 @@ bool RdbList::posdbConstrain(const char *startKey, char *endKey, int32_t minRecS
KEYSET(lastKey,k,m_ks);
#endif
// stop if we are >= startKey
if (KEYCMP(k, startKey, m_ks) >= 0) {
if (KEYCMP(k, startKey, 18) >= 0) {
break;
}
@ -1631,14 +1631,14 @@ bool RdbList::posdbConstrain(const char *startKey, char *endKey, int32_t minRecS
getPosdbKey(p, k);
}
if (p >= m_listEnd || KEYCMP(k, endKey, m_ks) > 0) {
if (p >= m_listEnd || KEYCMP(k, endKey, 18) > 0) {
// make list empty
m_listSize = 0;
m_listEnd = m_list;
// tighten the keys
KEYSET(m_startKey, startKey, m_ks);
KEYSET(m_endKey, endKey, m_ks);
KEYSET(m_startKey, startKey, 18);
KEYSET(m_endKey, endKey, 18);
// reset to set m_listPtr and m_listPtrHi
resetListPtr();
@ -1654,12 +1654,12 @@ bool RdbList::posdbConstrain(const char *startKey, char *endKey, int32_t minRecS
}
// write the full key back into "p"
KEYSET(p, k, m_ks);
KEYSET(p, k, 18);
} else if (p[0] & 0x02) {
// write the key back 6 bytes
p -= 6;
KEYSET(p, k, m_ks);
KEYSET(p, k, 18);
}
// inc m_list , m_alloc should remain where it is
@ -1682,9 +1682,9 @@ bool RdbList::posdbConstrain(const char *startKey, char *endKey, int32_t minRecS
bool resetPtr = false;
// . dont' start looking for the end before our new m_list
// . don't start at m_list+6 either cuz we may have overwritten that with the *(key_t *)p = k above!!!! tricky...
if ( p < m_list + m_ks ) {
if ( p < m_list + 18 ) {
resetPtr = true;
} else if (KEYCMP(k, hintKey, m_ks) != 0 || KEYCMP(hintKey, endKey, m_ks) > 0) {
} else if (KEYCMP(k, hintKey, 18) != 0 || KEYCMP(hintKey, endKey, 18) > 0) {
// . if first key is over endKey that's a bad hint!
// . might it be a corrupt RdbMap?
// . reset "p" to beginning if hint is bad
@ -1720,7 +1720,7 @@ bool RdbList::posdbConstrain(const char *startKey, char *endKey, int32_t minRecS
while ( p < m_listEnd ) {
getPosdbKey(p, k);
if (KEYCMP(k, endKey, m_ks) > 0) {
if (KEYCMP(k, endKey, 18) > 0) {
break;
}
@ -1763,7 +1763,7 @@ bool RdbList::posdbConstrain(const char *startKey, char *endKey, int32_t minRecS
getPosdbKey(p, k);
}
if (p < m_listEnd && KEYCMP(k, endKey, m_ks) <= 0 && p >= maxPtr && recSize > 0) {
if (p < m_listEnd && KEYCMP(k, endKey, 18) <= 0 && p >= maxPtr && recSize > 0) {
// watch out for corruption, let Msg5 fix it
if ( p - recSize < m_alloc ) {
m_list = savelist;
@ -1797,8 +1797,8 @@ bool RdbList::posdbConstrain(const char *startKey, char *endKey, int32_t minRecS
resetListPtr();
// and the keys can be tightened
KEYSET(m_startKey,startKey,m_ks);
KEYSET(m_endKey,endKey,m_ks);
KEYSET(m_startKey,startKey,18);
KEYSET(m_endKey,endKey,18);
return true;
}