diff options
| author | Don Anderson <dda@ddanderson.com> | 2015-09-13 21:57:42 -0400 |
|---|---|---|
| committer | Don Anderson <dda@ddanderson.com> | 2015-09-13 21:57:42 -0400 |
| commit | 0225351bb6d937309f0bccb800c46e72e1aa4b82 (patch) | |
| tree | 95998c9b83fe07fef1642cc281f814e4f25831f0 /src/schema/schema_list.c | |
| parent | 4c663725867d2f9434298d30883c58a0d96deaa9 (diff) | |
| parent | e1d6886824058b333495236b776b10fcd8fb74ae (diff) | |
| download | mongo-0225351bb6d937309f0bccb800c46e72e1aa4b82.tar.gz | |
Merge branch 'develop' into index-create-lsm3
Diffstat (limited to 'src/schema/schema_list.c')
| -rw-r--r-- | src/schema/schema_list.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/schema/schema_list.c b/src/schema/schema_list.c index a36fd696079..d091a5d94da 100644 --- a/src/schema/schema_list.c +++ b/src/schema/schema_list.c @@ -29,8 +29,8 @@ __schema_add_table(WT_SESSION_IMPL *session, WT_RET(ret); bucket = table->name_hash % WT_HASH_ARRAY_SIZE; - SLIST_INSERT_HEAD(&session->tables, table, l); - SLIST_INSERT_HEAD(&session->tablehash[bucket], table, hashl); + TAILQ_INSERT_HEAD(&session->tables, table, q); + TAILQ_INSERT_HEAD(&session->tablehash[bucket], table, hashq); *tablep = table; return (0); @@ -51,7 +51,7 @@ __schema_find_table(WT_SESSION_IMPL *session, bucket = __wt_hash_city64(name, namelen) % WT_HASH_ARRAY_SIZE; restart: - SLIST_FOREACH(table, &session->tablehash[bucket], hashl) { + TAILQ_FOREACH(table, &session->tablehash[bucket], hashq) { tablename = table->name; (void)WT_PREFIX_SKIP(tablename, "table:"); if (WT_STRING_MATCH(tablename, name, namelen)) { @@ -228,8 +228,8 @@ __wt_schema_remove_table(WT_SESSION_IMPL *session, WT_TABLE *table) WT_ASSERT(session, table->refcnt <= 1); bucket = table->name_hash % WT_HASH_ARRAY_SIZE; - SLIST_REMOVE(&session->tables, table, __wt_table, l); - SLIST_REMOVE(&session->tablehash[bucket], table, __wt_table, hashl); + TAILQ_REMOVE(&session->tables, table, q); + TAILQ_REMOVE(&session->tablehash[bucket], table, hashq); return (__wt_schema_destroy_table(session, &table)); } @@ -243,7 +243,7 @@ __wt_schema_close_tables(WT_SESSION_IMPL *session) WT_DECL_RET; WT_TABLE *table; - while ((table = SLIST_FIRST(&session->tables)) != NULL) + while ((table = TAILQ_FIRST(&session->tables)) != NULL) WT_TRET(__wt_schema_remove_table(session, table)); return (ret); } |