diff options
Diffstat (limited to 'src/include/session.h')
| -rw-r--r-- | src/include/session.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/include/session.h b/src/include/session.h index 5c3bcfb8ed0..5c3291230b4 100644 --- a/src/include/session.h +++ b/src/include/session.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014-2015 MongoDB, Inc. + * Copyright (c) 2014-2016 MongoDB, Inc. * Copyright (c) 2008-2014 WiredTiger, Inc. * All rights reserved. * @@ -74,19 +74,22 @@ struct WT_COMPILER_TYPE_ALIGN(WT_CACHE_LINE_ALIGNMENT) __wt_session_impl { TAILQ_HEAD(__cursors, __wt_cursor) cursors; WT_CURSOR_BACKUP *bkp_cursor; /* Hot backup cursor */ - WT_COMPACT *compact; /* Compact state */ + + WT_COMPACT *compact; /* Compaction information */ + enum { WT_COMPACT_NONE=0, + WT_COMPACT_RUNNING, WT_COMPACT_SUCCESS } compact_state; /* * Lookaside table cursor, sweep and eviction worker threads only. */ WT_CURSOR *las_cursor; /* Lookaside table cursor */ - WT_DATA_HANDLE *meta_dhandle; /* Metadata file */ - void *meta_track; /* Metadata operation tracking */ - void *meta_track_next; /* Current position */ - void *meta_track_sub; /* Child transaction / save point */ - size_t meta_track_alloc; /* Currently allocated */ - int meta_track_nest; /* Nesting level of meta transaction */ + WT_CURSOR *meta_cursor; /* Metadata file */ + void *meta_track; /* Metadata operation tracking */ + void *meta_track_next; /* Current position */ + void *meta_track_sub; /* Child transaction / save point */ + size_t meta_track_alloc; /* Currently allocated */ + int meta_track_nest; /* Nesting level of meta transaction */ #define WT_META_TRACKING(session) (session->meta_track_next != NULL) /* @@ -134,8 +137,6 @@ struct WT_COMPILER_TYPE_ALIGN(WT_CACHE_LINE_ALIGNMENT) __wt_session_impl { void *reconcile; /* Reconciliation support */ int (*reconcile_cleanup)(WT_SESSION_IMPL *); - bool compaction; /* Compaction did some work */ - uint32_t flags; /* |