Skip to content

Commit

Permalink
WT-2073: review comments, rename __wt_metadata_cursor to
Browse files Browse the repository at this point in the history 
__wt_metadata_cursor_open __wt_metadata_session_cursor to
__wt_metadata_cursor.
  • Loading branch information
@keithbostic
keithbostic committed Oct 21, 2015
1 parent 7f62733 commit d653c60
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/conn/conn_api.c
View file
Expand Up @@ -2033,7 +2033,7 @@ wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler,
* DATABASE HOME, IT'S WHAT WE USE TO DECIDE IF WE'RE CREATING OR NOT.
*/
WT_ERR(__wt_turtle_init(session));
WT_ERR(__wt_metadata_session_cursor(session, NULL));
WT_ERR(__wt_metadata_cursor(session, NULL));

/* Start the worker threads and run recovery. */
WT_ERR(__wt_connection_workers(session, cfg));
Expand Down
2 changes: 1 addition & 1 deletion src/cursor/cur_backup.c
View file
Expand Up @@ -338,7 +338,7 @@ __backup_all(WT_SESSION_IMPL *session, WT_CURSOR_BACKUP *cb)
const char *key, *value;

/* Copy all of the metadata entries to the hot backup file. */
WT_RET(__wt_metadata_session_cursor(session, &cursor));
WT_RET(__wt_metadata_cursor(session, &cursor));
while ((ret = cursor->next(cursor)) == 0) {
WT_RET(cursor->get_key(cursor, &key));
WT_RET(cursor->get_value(cursor, &value));
Expand Down
2 changes: 1 addition & 1 deletion src/cursor/cur_metadata.c
View file
Expand Up @@ -469,7 +469,7 @@ __wt_curmetadata_open(WT_SESSION_IMPL *session,
* use the existing, cached session metadata cursor, the configuration
* may not be the same.
*/
WT_ERR(__wt_metadata_cursor(session, cfg[1], &mdc->file_cursor));
WT_ERR(__wt_metadata_cursor_open(session, cfg[1], &mdc->file_cursor));

WT_ERR(__wt_cursor_init(cursor, uri, owner, cfg, cursorp));

Expand Down
4 changes: 2 additions & 2 deletions src/include/extern.h
View file
Expand Up @@ -438,8 +438,8 @@ extern int __wt_ext_metadata_search(WT_EXTENSION_API *wt_api, WT_SESSION *wt_ses
extern int __wt_ext_metadata_update(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, const char *key, const char *value);
extern int __wt_metadata_get_ckptlist( WT_SESSION *session, const char *name, WT_CKPT **ckptbasep);
extern void __wt_metadata_free_ckptlist(WT_SESSION *session, WT_CKPT *ckptbase);
extern int __wt_metadata_cursor( WT_SESSION_IMPL *session, const char *config, WT_CURSOR **cursorp);
extern int __wt_metadata_session_cursor(WT_SESSION_IMPL *session, WT_CURSOR **cursorp);
extern int __wt_metadata_cursor_open( WT_SESSION_IMPL *session, const char *config, WT_CURSOR **cursorp);
extern int __wt_metadata_cursor(WT_SESSION_IMPL *session, WT_CURSOR **cursorp);
extern int __wt_metadata_insert( WT_SESSION_IMPL *session, const char *key, const char *value);
extern int __wt_metadata_update( WT_SESSION_IMPL *session, const char *key, const char *value);
extern int __wt_metadata_remove(WT_SESSION_IMPL *session, const char *key);
Expand Down
2 changes: 1 addition & 1 deletion src/meta/meta_apply.c
View file
Expand Up @@ -72,7 +72,7 @@ __wt_meta_btree_apply(WT_SESSION_IMPL *session,
* loop calls code that repositions the cursor and our loop walking the
* metadata table will fail.
*/
WT_RET(__wt_metadata_cursor(session, NULL, &cursor));
WT_RET(__wt_metadata_cursor_open(session, NULL, &cursor));

WT_SAVE_DHANDLE(session,
ret = __meta_btree_apply(session, cursor, func, cfg));
Expand Down
18 changes: 9 additions & 9 deletions src/meta/meta_table.c
View file
Expand Up @@ -31,11 +31,11 @@ __metadata_turtle(const char *key)
}

/*
* __wt_metadata_cursor --
* __wt_metadata_cursor_open --
* Opens a cursor on the metadata.
*/
int
__wt_metadata_cursor(
__wt_metadata_cursor_open(
WT_SESSION_IMPL *session, const char *config, WT_CURSOR **cursorp)
{
WT_BTREE *btree;
Expand Down Expand Up @@ -68,14 +68,14 @@ __wt_metadata_cursor(
}

/*
* __wt_metadata_session_cursor --
* __wt_metadata_cursor --
* Opens the session's cached metadata cursor.
*/
int
__wt_metadata_session_cursor(WT_SESSION_IMPL *session, WT_CURSOR **cursorp)
__wt_metadata_cursor(WT_SESSION_IMPL *session, WT_CURSOR **cursorp)
{
if (session->meta_cursor == NULL)
WT_RET(__wt_metadata_cursor(
WT_RET(__wt_metadata_cursor_open(
session, NULL, &session->meta_cursor));
if (cursorp != NULL)
*cursorp = session->meta_cursor;
Expand All @@ -101,7 +101,7 @@ __wt_metadata_insert(
WT_RET_MSG(session, EINVAL,
"%s: insert not supported on the turtle file", key);

WT_RET(__wt_metadata_session_cursor(session, &cursor));
WT_RET(__wt_metadata_cursor(session, &cursor));
cursor->set_key(cursor, key);
cursor->set_value(cursor, value);
WT_RET(cursor->insert(cursor));
Expand Down Expand Up @@ -135,7 +135,7 @@ __wt_metadata_update(
if (WT_META_TRACKING(session))
WT_RET(__wt_meta_track_update(session, key));

WT_RET(__wt_metadata_session_cursor(session, &cursor));
WT_RET(__wt_metadata_cursor(session, &cursor));
cursor->set_key(cursor, key);
cursor->set_value(cursor, value);
WT_RET(cursor->insert(cursor));
Expand All @@ -160,7 +160,7 @@ __wt_metadata_remove(WT_SESSION_IMPL *session, const char *key)
WT_RET_MSG(session, EINVAL,
"%s: remove not supported on the turtle file", key);

WT_RET(__wt_metadata_session_cursor(session, &cursor));
WT_RET(__wt_metadata_cursor(session, &cursor));
cursor->set_key(cursor, key);
WT_RET(cursor->search(cursor));
if (WT_META_TRACKING(session))
Expand Down Expand Up @@ -191,7 +191,7 @@ __wt_metadata_search(WT_SESSION_IMPL *session, const char *key, char **valuep)
if (__metadata_turtle(key))
return (__wt_turtle_read(session, key, valuep));

WT_RET(__wt_metadata_session_cursor(session, &cursor));
WT_RET(__wt_metadata_cursor(session, &cursor));
cursor->set_key(cursor, key);
WT_RET(cursor->search(cursor));
WT_RET(cursor->get_value(cursor, &value));
Expand Down
2 changes: 1 addition & 1 deletion src/meta/meta_turtle.c
View file
Expand Up @@ -120,7 +120,7 @@ __metadata_load_bulk(WT_SESSION_IMPL *session)
* If a file was being bulk-loaded during the hot backup, it will appear
* in the metadata file, but the file won't exist. Create on demand.
*/
WT_RET(__wt_metadata_session_cursor(session, &cursor));
WT_RET(__wt_metadata_cursor(session, &cursor));
while ((ret = cursor->next(cursor)) == 0) {
WT_RET(cursor->get_key(cursor, &key));
if (!WT_PREFIX_SKIP(key, "file:"))
Expand Down
2 changes: 1 addition & 1 deletion src/schema/schema_list.c
View file
Expand Up @@ -21,7 +21,7 @@ __schema_add_table(WT_SESSION_IMPL *session,
uint64_t bucket;

/* Make sure the metadata is open before getting other locks. */
WT_RET(__wt_metadata_session_cursor(session, NULL));
WT_RET(__wt_metadata_cursor(session, NULL));

WT_WITH_TABLE_LOCK(session,
ret = __wt_schema_open_table(
Expand Down
4 changes: 2 additions & 2 deletions src/schema/schema_open.c
View file
Expand Up @@ -290,7 +290,7 @@ __wt_schema_open_index(WT_SESSION_IMPL *session,
WT_ERR(__wt_buf_fmt(session, tmp, "index:%s:", tablename));

/* Find matching indices. */
WT_ERR(__wt_metadata_session_cursor(session, &cursor));
WT_ERR(__wt_metadata_cursor(session, &cursor));
cursor->set_key(cursor, tmp->data);
if ((ret = cursor->search_near(cursor, &cmp)) == 0 && cmp < 0)
ret = cursor->next(cursor);
Expand Down Expand Up @@ -419,7 +419,7 @@ __wt_schema_open_table(WT_SESSION_IMPL *session,
WT_ERR(__wt_buf_fmt(session, buf, "table:%.*s", (int)namelen, name));
WT_ERR(__wt_strndup(session, buf->data, buf->size, &tablename));

WT_ERR(__wt_metadata_session_cursor(session, &cursor));
WT_ERR(__wt_metadata_cursor(session, &cursor));
cursor->set_key(cursor, tablename);
WT_ERR(cursor->search(cursor));
WT_ERR(cursor->get_value(cursor, &tconfig));
Expand Down
2 changes: 1 addition & 1 deletion src/session/session_api.c
View file
Expand Up @@ -1320,7 +1320,7 @@ __wt_open_session(WT_CONNECTION_IMPL *conn,
*/
if (open_metadata) {
WT_ASSERT(session, !F_ISSET(session, WT_SESSION_LOCKED_SCHEMA));
if ((ret = __wt_metadata_session_cursor(session, NULL)) != 0) {
if ((ret = __wt_metadata_cursor(session, NULL)) != 0) {
wt_session = &session->iface;
WT_TRET(wt_session->close(wt_session, NULL));
return (ret);
Expand Down
4 changes: 2 additions & 2 deletions src/txn/txn_ckpt.c
View file
Expand Up @@ -56,7 +56,7 @@ __checkpoint_name_check(WT_SESSION_IMPL *session, const char *uri)
* confirm the metadata file contains no non-file objects.
*/
if (uri == NULL) {
WT_RET(__wt_metadata_session_cursor(session, &cursor));
WT_RET(__wt_metadata_cursor(session, &cursor));
while ((ret = cursor->next(cursor)) == 0) {
WT_RET(cursor->get_key(cursor, &uri));
if (!WT_PREFIX_MATCH(uri, "colgroup:") &&
Expand Down Expand Up @@ -369,7 +369,7 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[])
full = idle = logging = tracking = false;

/* Ensure the metadata table is open before taking any locks. */
WT_RET(__wt_metadata_session_cursor(session, NULL));
WT_RET(__wt_metadata_cursor(session, NULL));

/*
* Do a pass over the configuration arguments and figure out what kind
Expand Down
2 changes: 1 addition & 1 deletion src/txn/txn_recover.c
View file
Expand Up @@ -427,7 +427,7 @@ __wt_txn_recover(WT_SESSION_IMPL *session)

WT_ERR(__wt_metadata_search(session, WT_METAFILE_URI, &config));
WT_ERR(__recovery_setup_file(&r, WT_METAFILE_URI, config));
WT_ERR(__wt_metadata_cursor(session, NULL, &metac));
WT_ERR(__wt_metadata_cursor_open(session, NULL, &metac));
metafile = &r.files[WT_METAFILE_ID];
metafile->c = metac;

Expand Down

0 comments on commit d653c60

Please sign in to comment.