diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-07-18 17:00:09 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 17:00:09 +1000 |
| commit | 46975e56566535134f1b3c193d20608f2df53856 (patch) | |
| tree | 9dd6046e4342ea54573fa00bff19690fc9ac41b4 /src/include | |
| parent | fb9e565013a321749f385bfd3c1dba9b462da08e (diff) | |
| download | mongo-46975e56566535134f1b3c193d20608f2df53856.tar.gz | |
Revert "WT-3381 Improve timestamp concurrency. (#3511)" (#3514)
This reverts commit fb9e565013a321749f385bfd3c1dba9b462da08e.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/extern.h | 4 | ||||
| -rw-r--r-- | src/include/txn.h | 17 |
2 files changed, 4 insertions, 17 deletions
diff --git a/src/include/extern.h b/src/include/extern.h index 8b48fd587bd..416979142e1 100644 --- a/src/include/extern.h +++ b/src/include/extern.h @@ -791,7 +791,3 @@ extern int __wt_txn_global_query_timestamp( WT_SESSION_IMPL *session, char *hex_ extern int __wt_txn_update_pinned_timestamp(WT_SESSION_IMPL *session) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern int __wt_txn_global_set_timestamp(WT_SESSION_IMPL *session, const char *cfg[]) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern int __wt_txn_set_timestamp(WT_SESSION_IMPL *session, const char *cfg[]) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); -extern void __wt_txn_set_commit_timestamp(WT_SESSION_IMPL *session); -extern void __wt_txn_clear_commit_timestamp(WT_SESSION_IMPL *session); -extern void __wt_txn_set_read_timestamp(WT_SESSION_IMPL *session); -extern void __wt_txn_clear_read_timestamp(WT_SESSION_IMPL *session); diff --git a/src/include/txn.h b/src/include/txn.h index e4cc0b04046..bf2d9aa21ef 100644 --- a/src/include/txn.h +++ b/src/include/txn.h @@ -74,6 +74,9 @@ struct __wt_txn_state { volatile uint64_t pinned_id; volatile uint64_t metadata_pinned; + WT_DECL_TIMESTAMP(commit_timestamp) + WT_DECL_TIMESTAMP(read_timestamp) + WT_CACHE_LINE_PAD_END }; @@ -100,14 +103,6 @@ struct __wt_txn_global { /* Protects the active transaction states. */ WT_RWLOCK rwlock; - /* List of transactions sorted by commit timestamp. */ - WT_RWLOCK commit_timestamp_rwlock; - TAILQ_HEAD(__wt_txn_cts_qh, __wt_txn) commit_timestamph; - - /* List of transactions sorted by read timestamp. */ - WT_RWLOCK read_timestamp_rwlock; - TAILQ_HEAD(__wt_txn_rts_qh, __wt_txn) read_timestamph; - /* * Track information about the running checkpoint. The transaction * snapshot used when checkpointing are special. Checkpoints can run @@ -122,7 +117,6 @@ struct __wt_txn_global { volatile bool checkpoint_running; /* Checkpoint running */ volatile uint32_t checkpoint_id; /* Checkpoint's session ID */ WT_TXN_STATE checkpoint_state; /* Checkpoint's txn state */ - WT_TXN *checkpoint_txn; /* Checkpoint's txn structure */ volatile uint64_t metadata_pinned; /* Oldest ID for metadata */ @@ -200,11 +194,8 @@ struct __wt_txn { uint32_t snapshot_count; uint32_t txn_logsync; /* Log sync configuration */ - WT_DECL_TIMESTAMP(commit_timestamp) WT_DECL_TIMESTAMP(read_timestamp) - - TAILQ_ENTRY(__wt_txn) commit_timestampq; - TAILQ_ENTRY(__wt_txn) read_timestampq; + WT_DECL_TIMESTAMP(commit_timestamp) /* Array of modifications by this transaction. */ WT_TXN_OP *mod; |