Author: kpvdr Date: 2007-10-12 14:13:33 -0400 (Fri, 12 Oct 2007) New Revision: 1026 Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp store/trunk/cpp/lib/jrnl/wmgr.cpp Log: Integration adjustments Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.cpp 2007-10-12 17:42:24 UTC (rev 1025) +++ store/trunk/cpp/lib/jrnl/jcntl.cpp 2007-10-12 18:13:33 UTC (rev 1026) @@ -511,7 +511,7 @@ _emap.insert_fid(itr->_rid, itr->_fid); else // txn dequeue { - u_int16_t fid = _emap.get_remove_fid(h._rid); + u_int16_t fid = _emap.get_remove_fid(h._rid, true); _wrfc.decr_enqcnt(fid); } } Modified: store/trunk/cpp/lib/jrnl/wmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.cpp 2007-10-12 17:42:24 UTC (rev 1025) +++ store/trunk/cpp/lib/jrnl/wmgr.cpp 2007-10-12 18:13:33 UTC (rev 1026) @@ -262,8 +262,10 @@ dtokp->set_dblocks_written(0); // Reset dblks_written from previous op } + // TODO: Tidy this up! u_int64_t rid = initialize_rid(cont, dtokp); - _deq_rec.reset(rid, dtokp->rid(), xid_ptr, xid_len); + u_int64_t dequeue_rid = dtokp->getSourceMessage() ? dtokp->dequeue_rid() : dtokp->rid(); + _deq_rec.reset(rid, dequeue_rid, xid_ptr, xid_len); if (!cont) { if (xid_len)