diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2014-12-09 09:17:43 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2014-12-09 09:17:43 +1100 |
| commit | 771b6b984cb9d722ae4ab6508f658f2973588248 (patch) | |
| tree | 2957918cc2d0f3a6c31e33a7b467009c9e3e3e52 /src/session/session_dhandle.c | |
| parent | d409e4431f92621cd61467d19dddcb04007444a2 (diff) | |
| download | mongo-771b6b984cb9d722ae4ab6508f658f2973588248.tar.gz | |
Refer to a dhandle hash slot as a bucket.
This avoids confusion re: using a mod of the hash as the bucket ID.
Diffstat (limited to 'src/session/session_dhandle.c')
| -rw-r--r-- | src/session/session_dhandle.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/session/session_dhandle.c b/src/session/session_dhandle.c index a7e127230d3..51835cf260c 100644 --- a/src/session/session_dhandle.c +++ b/src/session/session_dhandle.c @@ -52,14 +52,14 @@ __session_add_dhandle( WT_SESSION_IMPL *session, WT_DATA_HANDLE_CACHE **dhandle_cachep) { WT_DATA_HANDLE_CACHE *dhandle_cache; - uint64_t hash; + uint64_t bucket; WT_RET(__wt_calloc_def(session, 1, &dhandle_cache)); dhandle_cache->dhandle = session->dhandle; - hash = dhandle_cache->dhandle->name_hash % WT_HASH_ARRAY_SIZE; + bucket = dhandle_cache->dhandle->name_hash % WT_HASH_ARRAY_SIZE; SLIST_INSERT_HEAD(&session->dhandles, dhandle_cache, l); - SLIST_INSERT_HEAD(&session->dhhash[hash], dhandle_cache, hashl); + SLIST_INSERT_HEAD(&session->dhhash[bucket], dhandle_cache, hashl); if (dhandle_cachep != NULL) *dhandle_cachep = dhandle_cache; @@ -293,12 +293,12 @@ static void __session_discard_btree( WT_SESSION_IMPL *session, WT_DATA_HANDLE_CACHE *dhandle_cache) { - uint64_t hash; + uint64_t bucket; - hash = dhandle_cache->dhandle->name_hash % WT_HASH_ARRAY_SIZE; + bucket = dhandle_cache->dhandle->name_hash % WT_HASH_ARRAY_SIZE; SLIST_REMOVE( &session->dhandles, dhandle_cache, __wt_data_handle_cache, l); - SLIST_REMOVE(&session->dhhash[hash], + SLIST_REMOVE(&session->dhhash[bucket], dhandle_cache, __wt_data_handle_cache, hashl); (void)WT_ATOMIC_SUB4(dhandle_cache->dhandle->session_ref, 1); @@ -389,15 +389,15 @@ __wt_session_get_btree(WT_SESSION_IMPL *session, WT_DATA_HANDLE *dhandle; WT_DATA_HANDLE_CACHE *dhandle_cache; WT_DECL_RET; - uint64_t hash; + uint64_t bucket; WT_ASSERT(session, !F_ISSET(session, WT_SESSION_NO_DATA_HANDLES)); WT_ASSERT(session, !LF_ISSET(WT_DHANDLE_HAVE_REF)); dhandle = NULL; - hash = __wt_hash_city64(uri, strlen(uri)) % WT_HASH_ARRAY_SIZE; - SLIST_FOREACH(dhandle_cache, &session->dhhash[hash], hashl) { + bucket = __wt_hash_city64(uri, strlen(uri)) % WT_HASH_ARRAY_SIZE; + SLIST_FOREACH(dhandle_cache, &session->dhhash[bucket], hashl) { dhandle = dhandle_cache->dhandle; if (strcmp(uri, dhandle->name) != 0) continue; |