diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/session/session_api.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/session/session_api.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/third_party/wiredtiger/src/session/session_api.c b/src/third_party/wiredtiger/src/session/session_api.c index 2aa8e924302..7951b3ff50d 100644 --- a/src/third_party/wiredtiger/src/session/session_api.c +++ b/src/third_party/wiredtiger/src/session/session_api.c @@ -95,7 +95,7 @@ __session_close(WT_SESSION *wt_session, const char *config) WT_UNUSED(cfg); /* Rollback any active transaction. */ - if (F_ISSET(&session->txn, TXN_RUNNING)) + if (F_ISSET(&session->txn, WT_TXN_RUNNING)) WT_TRET(__session_rollback_transaction(wt_session, NULL)); /* @@ -193,7 +193,7 @@ __session_reconfigure(WT_SESSION *wt_session, const char *config) session = (WT_SESSION_IMPL *)wt_session; SESSION_API_CALL(session, reconfigure, config, cfg); - if (F_ISSET(&session->txn, TXN_RUNNING)) + if (F_ISSET(&session->txn, WT_TXN_RUNNING)) WT_ERR_MSG(session, EINVAL, "transaction in progress"); WT_TRET(__wt_session_reset_cursors(session)); @@ -202,9 +202,9 @@ __session_reconfigure(WT_SESSION *wt_session, const char *config) if (cval.len != 0) session->isolation = session->txn.isolation = WT_STRING_MATCH("snapshot", cval.str, cval.len) ? - TXN_ISO_SNAPSHOT : + WT_ISO_SNAPSHOT : WT_STRING_MATCH("read-uncommitted", cval.str, cval.len) ? - TXN_ISO_READ_UNCOMMITTED : TXN_ISO_READ_COMMITTED; + WT_ISO_READ_UNCOMMITTED : WT_ISO_READ_COMMITTED; err: API_END_RET_NOTFOUND_MAP(session, ret); } @@ -757,7 +757,7 @@ __session_begin_transaction(WT_SESSION *wt_session, const char *config) SESSION_API_CALL(session, begin_transaction, config, cfg); WT_STAT_FAST_CONN_INCR(session, txn_begin); - if (F_ISSET(&session->txn, TXN_RUNNING)) + if (F_ISSET(&session->txn, WT_TXN_RUNNING)) WT_ERR_MSG(session, EINVAL, "Transaction already running"); ret = __wt_txn_begin(session, cfg); @@ -781,7 +781,7 @@ __session_commit_transaction(WT_SESSION *wt_session, const char *config) WT_STAT_FAST_CONN_INCR(session, txn_commit); txn = &session->txn; - if (F_ISSET(txn, TXN_ERROR)) { + if (F_ISSET(txn, WT_TXN_ERROR)) { __wt_errx(session, "failed transaction requires rollback"); ret = EINVAL; } @@ -836,7 +836,7 @@ __session_transaction_pinned_range(WT_SESSION *wt_session, uint64_t *prange) /* Assign pinned to the lesser of id or snap_min */ if (txn_state->id != WT_TXN_NONE && - TXNID_LT(txn_state->id, txn_state->snap_min)) + WT_TXNID_LT(txn_state->id, txn_state->snap_min)) pinned = txn_state->id; else pinned = txn_state->snap_min; @@ -880,7 +880,7 @@ __session_checkpoint(WT_SESSION *wt_session, const char *config) * from evicting anything newer than this because we track the oldest * transaction ID in the system that is not visible to all readers. */ - if (F_ISSET(txn, TXN_RUNNING)) + if (F_ISSET(txn, WT_TXN_RUNNING)) WT_ERR_MSG(session, EINVAL, "Checkpoint not permitted in a transaction"); @@ -1066,7 +1066,7 @@ __wt_open_session(WT_CONNECTION_IMPL *conn, } /* Initialize transaction support: default to read-committed. */ - session_ret->isolation = TXN_ISO_READ_COMMITTED; + session_ret->isolation = WT_ISO_READ_COMMITTED; WT_ERR(__wt_txn_init(session_ret)); /* |