Author: kpvdr Date: 2007-10-31 10:31:36 -0400 (Wed, 31 Oct 2007) New Revision: 1191 Modified: store/trunk/cpp/lib/jrnl/wmgr.cpp Log: Minor bugfix - affected write/read pipeline tests only. Modified: store/trunk/cpp/lib/jrnl/wmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.cpp 2007-10-31 13:51:47 UTC (rev 1190) +++ store/trunk/cpp/lib/jrnl/wmgr.cpp 2007-10-31 14:31:36 UTC (rev 1191) @@ -265,7 +265,8 @@ // 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 rid = dtokp->getSourceMessage() ? dtokp->rid() : (cont ? _wrfc.rid() - 1 : _wrfc.get_incr_rid()); + u_int64_t rid = dtokp->getSourceMessage() ? dtokp->rid() : + (cont ? _wrfc.rid() - 1 : _wrfc.get_incr_rid()); u_int64_t dequeue_rid = dtokp->getSourceMessage() ? dtokp->dequeue_rid() : dtokp->rid(); if (!dtokp->getSourceMessage()) { @@ -794,6 +795,7 @@ case data_tok::ABORT_SUBM: assert(dtp->wstate() == data_tok::ABORT_SUBM); dtp->set_wstate(data_tok::ABORTED); +#if !(defined(RHM_WRONLY) || defined(RHM_RDONLY)) it = _txn_pending_set.find(dtp->xid()); if (it == _txn_pending_set.end()) { @@ -802,10 +804,12 @@ throw jexception(jerrno::JERR_MAP_NOTFOUND, ss.str(), "wmgr", "get_events"); } _txn_pending_set.erase(it); +#endif break; case data_tok::COMMIT_SUBM: assert(dtp->wstate() == data_tok::COMMIT_SUBM); dtp->set_wstate(data_tok::COMMITTED); +#if !(defined(RHM_WRONLY) || defined(RHM_RDONLY)) it = _txn_pending_set.find(dtp->xid()); if (it == _txn_pending_set.end()) { @@ -814,6 +818,7 @@ throw jexception(jerrno::JERR_MAP_NOTFOUND, ss.str(), "wmgr", "get_events"); } _txn_pending_set.erase(it); +#endif break; default: std::stringstream ss;