diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2014-06-19 12:08:45 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2014-06-19 12:08:45 +1000 |
| commit | 4ccc71b548b392d99883042a052ff9d27d6d34da (patch) | |
| tree | b4352effc1f3a310c68510262a4be47ef5d1ac94 | |
| parent | 7819cd39f5efc7289ec58ec42d712e7f535f9caf (diff) | |
| download | mongo-4ccc71b548b392d99883042a052ff9d27d6d34da.tar.gz | |
Revert name change of flag to WT_SESSION_NO_CACHE_CHECK
| -rw-r--r-- | dist/flags.py | 2 | ||||
| -rw-r--r-- | src/include/cache.i | 2 | ||||
| -rw-r--r-- | src/include/flags.h | 4 | ||||
| -rw-r--r-- | src/lsm/lsm_tree.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/dist/flags.py b/dist/flags.py index 5d9994bc6d2..8a8641d2187 100644 --- a/dist/flags.py +++ b/dist/flags.py @@ -98,8 +98,8 @@ flags = { 'session' : [ 'SESSION_INTERNAL', 'SESSION_LOGGING_INMEM', - 'SESSION_LSM_TREE_LOCK', 'SESSION_NO_CACHE', + 'SESSION_NO_CACHE_CHECK', 'SESSION_NO_LOGGING', 'SESSION_NO_SCHEMA_LOCK', 'SESSION_SALVAGE_CORRUPT_OK', diff --git a/src/include/cache.i b/src/include/cache.i index 756cb803b14..d0f92375f22 100644 --- a/src/include/cache.i +++ b/src/include/cache.i @@ -82,7 +82,7 @@ __wt_cache_full_check(WT_SESSION_IMPL *session) * with some eviction-dominated workloads. */ if (full < (busy ? 100 : 95) || F_ISSET(session, - WT_SESSION_LSM_TREE_LOCK | WT_SESSION_SCHEMA_LOCKED)) + WT_SESSION_NO_CACHE_CHECK | WT_SESSION_SCHEMA_LOCKED)) return (0); if ((btree = S2BT_SAFE(session)) != NULL && diff --git a/src/include/flags.h b/src/include/flags.h index f010f1b7e27..5f23c9b38db 100644 --- a/src/include/flags.h +++ b/src/include/flags.h @@ -36,8 +36,8 @@ #define WT_READ_WONT_NEED 0x00000001 #define WT_SESSION_INTERNAL 0x00000100 #define WT_SESSION_LOGGING_INMEM 0x00000080 -#define WT_SESSION_LSM_TREE_LOCK 0x00000040 -#define WT_SESSION_NO_CACHE 0x00000020 +#define WT_SESSION_NO_CACHE 0x00000040 +#define WT_SESSION_NO_CACHE_CHECK 0x00000020 #define WT_SESSION_NO_LOGGING 0x00000010 #define WT_SESSION_NO_SCHEMA_LOCK 0x00000008 #define WT_SESSION_SALVAGE_CORRUPT_OK 0x00000004 diff --git a/src/lsm/lsm_tree.c b/src/lsm/lsm_tree.c index 44735f3611d..14e179fbaeb 100644 --- a/src/lsm/lsm_tree.c +++ b/src/lsm/lsm_tree.c @@ -990,7 +990,7 @@ __wt_lsm_tree_lock( * Diagnostic: avoid deadlocks with the schema lock: if we need it for * an operation, we should already have it. */ - F_SET(session, WT_SESSION_LSM_TREE_LOCK | WT_SESSION_NO_SCHEMA_LOCK); + F_SET(session, WT_SESSION_NO_CACHE_CHECK | WT_SESSION_NO_SCHEMA_LOCK); return (0); } @@ -1002,7 +1002,7 @@ int __wt_lsm_tree_unlock( WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree) { - F_CLR(session, WT_SESSION_LSM_TREE_LOCK | WT_SESSION_NO_SCHEMA_LOCK); + F_CLR(session, WT_SESSION_NO_CACHE_CHECK | WT_SESSION_NO_SCHEMA_LOCK); return (__wt_rwunlock(session, lsm_tree->rwlock)); } |