diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/include')
-rw-r--r-- | src/third_party/wiredtiger/src/include/extern.h | 7 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/include/session.h | 24 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/include/txn.h | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/include/wt_internal.h | 4 |
4 files changed, 0 insertions, 37 deletions
diff --git a/src/third_party/wiredtiger/src/include/extern.h b/src/third_party/wiredtiger/src/include/extern.h index 9f750ed7092..0d13ff53d95 100644 --- a/src/third_party/wiredtiger/src/include/extern.h +++ b/src/third_party/wiredtiger/src/include/extern.h @@ -777,10 +777,6 @@ extern int __wt_hazard_set_func(WT_SESSION_IMPL *session, WT_REF *ref, bool *bus const char *func, int line #endif ) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); -extern int __wt_hazard_weak_clear(WT_SESSION_IMPL *session, WT_TXN_OP *op) - WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); -extern int __wt_hazard_weak_set(WT_SESSION_IMPL *session, WT_REF *ref, WT_TXN_OP *op) - WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern int __wt_hex2byte(const u_char *from, u_char *to) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern int __wt_hex_to_raw(WT_SESSION_IMPL *session, const char *from, WT_ITEM *to) @@ -1787,9 +1783,6 @@ extern void __wt_gen_init(WT_SESSION_IMPL *session); extern void __wt_gen_next(WT_SESSION_IMPL *session, int which, uint64_t *genp); extern void __wt_gen_next_drain(WT_SESSION_IMPL *session, int which); extern void __wt_hazard_close(WT_SESSION_IMPL *session); -extern void __wt_hazard_weak_close(WT_SESSION_IMPL *session); -extern void __wt_hazard_weak_destroy(WT_SESSION_IMPL *session_safe, WT_SESSION_IMPL *s); -extern void __wt_hazard_weak_invalidate(WT_SESSION_IMPL *session, WT_REF *ref); extern void __wt_hs_close(WT_SESSION_IMPL *session); extern void __wt_hs_upd_time_window(WT_CURSOR *hs_cursor, WT_TIME_WINDOW **twp); extern void __wt_huffman_close(WT_SESSION_IMPL *session, void *huffman_arg); diff --git a/src/third_party/wiredtiger/src/include/session.h b/src/third_party/wiredtiger/src/include/session.h index 5273e1234b4..85690b57fbd 100644 --- a/src/third_party/wiredtiger/src/include/session.h +++ b/src/third_party/wiredtiger/src/include/session.h @@ -30,28 +30,6 @@ struct __wt_hazard { #endif }; -/* - * WT_HAZARD_WEAK -- - * A weak hazard pointer. - */ -struct __wt_hazard_weak { - WT_REF *ref; /* Page reference */ - bool valid; /* Is the weak hazard pointer still valid? */ -}; - -/* - * WT_HAZARD_WEAK_ARRAY -- - * A per-session array of weak hazard pointers. These are grown by adding a new array, and are - * only freed when the session is closed. - */ -struct __wt_hazard_weak_array { - uint32_t hazard_size; /* Weak hazard pointer array slots */ - uint32_t hazard_inuse; /* Weak hazard pointer array slots in-use */ - uint32_t nhazard; /* Count of active weak hazard pointers */ - WT_HAZARD_WEAK_ARRAY *next; - WT_HAZARD_WEAK hazard[0]; /* Weak hazard pointer array */ -}; - /* Get the connection implementation for a session */ #define S2C(session) ((WT_CONNECTION_IMPL *)(session)->iface.connection) @@ -301,8 +279,6 @@ struct __wt_session_impl { uint32_t nhazard; /* Count of active hazard pointers */ WT_HAZARD *hazard; /* Hazard pointer array */ - WT_HAZARD_WEAK_ARRAY *hazard_weak; - /* * Operation tracking. */ diff --git a/src/third_party/wiredtiger/src/include/txn.h b/src/third_party/wiredtiger/src/include/txn.h index b1c2b50a743..cb433664094 100644 --- a/src/third_party/wiredtiger/src/include/txn.h +++ b/src/third_party/wiredtiger/src/include/txn.h @@ -196,8 +196,6 @@ typedef enum { struct __wt_txn_op { WT_BTREE *btree; WT_TXN_TYPE type; - WT_HAZARD_WEAK *whp; - union { /* WT_TXN_OP_BASIC_ROW, WT_TXN_OP_INMEM_ROW */ struct { diff --git a/src/third_party/wiredtiger/src/include/wt_internal.h b/src/third_party/wiredtiger/src/include/wt_internal.h index 29a9f9db1a9..23f34391a5d 100644 --- a/src/third_party/wiredtiger/src/include/wt_internal.h +++ b/src/third_party/wiredtiger/src/include/wt_internal.h @@ -207,10 +207,6 @@ struct __wt_fstream; typedef struct __wt_fstream WT_FSTREAM; struct __wt_hazard; typedef struct __wt_hazard WT_HAZARD; -struct __wt_hazard_weak; -typedef struct __wt_hazard_weak WT_HAZARD_WEAK; -struct __wt_hazard_weak_array; -typedef struct __wt_hazard_weak_array WT_HAZARD_WEAK_ARRAY; struct __wt_ikey; typedef struct __wt_ikey WT_IKEY; struct __wt_index; |