firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 18:03:04 +01:00
Code Issues

Vlad asked for this assertion but I think it should be runtime check for the release version, too.

Browse Source
This commit is contained in:
robocop 2012-05-19 12:20:11 +00:00
parent 642d506cd9
commit 02e2fdedcb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jrd/tpc.cpp
View File

@ -95,6 +95,7 @@ int TipCache::cacheState(thread_db* tdbb, TraNumber number)
tip_cache = m_cache[pos]; tip_cache = m_cache[pos];
fb_assert(number >= tip_cache->tpc_base); fb_assert(number >= tip_cache->tpc_base);
fb_assert(tip_cache->tpc_base < MAX_TRA_NUMBER - trans_per_tip);
fb_assert(number < (tip_cache->tpc_base + trans_per_tip)); fb_assert(number < (tip_cache->tpc_base + trans_per_tip));
return TRA_state(tip_cache->tpc_transactions, tip_cache->tpc_base, number); return TRA_state(tip_cache->tpc_transactions, tip_cache->tpc_base, number);
@ -137,6 +138,7 @@ void TipCache::initializeTpc(thread_db* tdbb, TraNumber number)
const TxPage* tip_cache = m_cache[m_cache.getCount() - 1]; const TxPage* tip_cache = m_cache[m_cache.getCount() - 1];
fb_assert(tip_cache->tpc_base < MAX_TRA_NUMBER - trans_per_tip);
if (number < (tip_cache->tpc_base + trans_per_tip)) if (number < (tip_cache->tpc_base + trans_per_tip))
return; return;
@ -178,6 +180,7 @@ void TipCache::setState(TraNumber number, SSHORT state)
TxPage* tip_cache = m_cache[pos]; TxPage* tip_cache = m_cache[pos];
fb_assert(number >= tip_cache->tpc_base); fb_assert(number >= tip_cache->tpc_base);
fb_assert(tip_cache->tpc_base < MAX_TRA_NUMBER - trans_per_tip);
fb_assert(number < (tip_cache->tpc_base + trans_per_tip)); fb_assert(number < (tip_cache->tpc_base + trans_per_tip));
UCHAR* address = tip_cache->tpc_transactions + byte; UCHAR* address = tip_cache->tpc_transactions + byte;
@ -241,6 +244,7 @@ int TipCache::snapshotState(thread_db* tdbb, TraNumber number)
tip_cache = m_cache[pos]; tip_cache = m_cache[pos];
fb_assert(number >= tip_cache->tpc_base); fb_assert(number >= tip_cache->tpc_base);
fb_assert(tip_cache->tpc_base < MAX_TRA_NUMBER - trans_per_tip);
fb_assert(number < (tip_cache->tpc_base + trans_per_tip)); fb_assert(number < (tip_cache->tpc_base + trans_per_tip));
const int state = TRA_state(tip_cache->tpc_transactions, tip_cache->tpc_base, number); const int state = TRA_state(tip_cache->tpc_transactions, tip_cache->tpc_base, number);
@ -320,6 +324,7 @@ void TipCache::updateCache(const Ods::tx_inv_page* tip_page, ULONG sequence)
{ {
tip_cache = m_cache[0]; tip_cache = m_cache[0];
fb_assert(tip_cache->tpc_base < MAX_TRA_NUMBER - trans_per_tip);
if (m_dbb->dbb_oldest_transaction >= (tip_cache->tpc_base + trans_per_tip)) if (m_dbb->dbb_oldest_transaction >= (tip_cache->tpc_base + trans_per_tip))
{ {
m_cache.remove((size_t) 0); m_cache.remove((size_t) 0);
@ -426,6 +431,7 @@ TraNumber TipCache::cacheTransactions(thread_db* tdbb, TraNumber oldest)
{ {
TxPage* tip_cache = m_cache[0]; TxPage* tip_cache = m_cache[0];
fb_assert(tip_cache->tpc_base < MAX_TRA_NUMBER - trans_per_tip);
if ((tip_cache->tpc_base + trans_per_tip) < hdr_oldest) if ((tip_cache->tpc_base + trans_per_tip) < hdr_oldest)
{ {
m_cache.remove((size_t) 0); m_cache.remove((size_t) 0);
@ -506,6 +512,7 @@ int TipCache::extendCache(thread_db* tdbb, TraNumber number)
tip_cache = m_cache[pos]; tip_cache = m_cache[pos];
fb_assert(number >= tip_cache->tpc_base); fb_assert(number >= tip_cache->tpc_base);
fb_assert(tip_cache->tpc_base < MAX_TRA_NUMBER - trans_per_tip);
fb_assert(number < (tip_cache->tpc_base + trans_per_tip)); fb_assert(number < (tip_cache->tpc_base + trans_per_tip));
return TRA_state(tip_cache->tpc_transactions, tip_cache->tpc_base, number); return TRA_state(tip_cache->tpc_transactions, tip_cache->tpc_base, number);