summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2014-11-28 14:07:36 -0500
committerKeith Bostic <keith@wiredtiger.com>2014-11-28 14:07:36 -0500
commit80023e8b3908d91e7629b2845c0b7f70a1fc8991 (patch)
tree3381cc9eb8fce6c7f93d2216e27f2b053f78971f
parent44d7f586bd9491516cd81d44e535d1fb574dd63d (diff)
downloadmongo-80023e8b3908d91e7629b2845c0b7f70a1fc8991.tar.gz
Rename __wt_rec_write to __wt_reconcile, there's no __wt_rec_read.
-rw-r--r--src/btree/bt_slvg.c4
-rw-r--r--src/btree/bt_sync.c6
-rw-r--r--src/btree/rec_evict.c2
-rw-r--r--src/btree/rec_write.c6
-rw-r--r--src/include/extern.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/btree/bt_slvg.c b/src/btree/bt_slvg.c
index 10366e91a0e..84eb89f492f 100644
--- a/src/btree/bt_slvg.c
+++ b/src/btree/bt_slvg.c
@@ -1302,7 +1302,7 @@ __slvg_col_build_leaf(WT_SESSION_IMPL *session, WT_TRACK *trk, WT_REF *ref)
/* Write the new version of the leaf page to disk. */
WT_ERR(__slvg_modify_init(session, page));
- WT_ERR(__wt_rec_write(session, ref, cookie, WT_SKIP_UPDATE_ERR));
+ WT_ERR(__wt_reconcile(session, ref, cookie, WT_SKIP_UPDATE_ERR));
/* Reset the page. */
page->pg_var_d = save_col_var;
@@ -2009,7 +2009,7 @@ __slvg_row_build_leaf(
/* Write the new version of the leaf page to disk. */
WT_ERR(__slvg_modify_init(session, page));
- WT_ERR(__wt_rec_write(session, ref, cookie, WT_SKIP_UPDATE_ERR));
+ WT_ERR(__wt_reconcile(session, ref, cookie, WT_SKIP_UPDATE_ERR));
/* Reset the page. */
page->pg_row_entries += skip_stop;
diff --git a/src/btree/bt_sync.c b/src/btree/bt_sync.c
index a72076b92ea..89dc6cdf24b 100644
--- a/src/btree/bt_sync.c
+++ b/src/btree/bt_sync.c
@@ -66,7 +66,7 @@ __sync_file(WT_SESSION_IMPL *session, int syncop)
__wt_txn_refresh(session, 1);
leaf_bytes += page->memory_footprint;
++leaf_pages;
- WT_ERR(__wt_rec_write(session, walk, NULL, 0));
+ WT_ERR(__wt_reconcile(session, walk, NULL, 0));
}
}
break;
@@ -132,7 +132,7 @@ __sync_file(WT_SESSION_IMPL *session, int syncop)
leaf_bytes += page->memory_footprint;
++leaf_pages;
}
- WT_ERR(__wt_rec_write(session, walk, NULL, 0));
+ WT_ERR(__wt_reconcile(session, walk, NULL, 0));
}
}
break;
@@ -244,7 +244,7 @@ __evict_file(WT_SESSION_IMPL *session, int syncop)
* error, retrying later.
*/
if (syncop == WT_SYNC_CLOSE && __wt_page_is_modified(page))
- WT_ERR(__wt_rec_write(session, ref, NULL, WT_EVICTING));
+ WT_ERR(__wt_reconcile(session, ref, NULL, WT_EVICTING));
/*
* We can't evict the page just returned to us (it marks our
diff --git a/src/btree/rec_evict.c b/src/btree/rec_evict.c
index e2491e44017..670c65af172 100644
--- a/src/btree/rec_evict.c
+++ b/src/btree/rec_evict.c
@@ -404,7 +404,7 @@ __rec_review(
else if (top && !WT_PAGE_IS_INTERNAL(page) &&
page->memory_footprint > 10 * btree->maxleafpage)
LF_SET(WT_SKIP_UPDATE_RESTORE);
- WT_RET(__wt_rec_write(session, ref, NULL, flags));
+ WT_RET(__wt_reconcile(session, ref, NULL, flags));
WT_ASSERT(session,
!__wt_page_is_modified(page) ||
LF_ISSET(WT_SKIP_UPDATE_RESTORE));
diff --git a/src/btree/rec_write.c b/src/btree/rec_write.c
index 46f6ed92aae..c72447ae841 100644
--- a/src/btree/rec_write.c
+++ b/src/btree/rec_write.c
@@ -331,11 +331,11 @@ static int __rec_dictionary_lookup(
static void __rec_dictionary_reset(WT_RECONCILE *);
/*
- * __wt_rec_write --
+ * __wt_reconcile --
* Reconcile an in-memory page into its on-disk format, and write it.
*/
int
-__wt_rec_write(WT_SESSION_IMPL *session,
+__wt_reconcile(WT_SESSION_IMPL *session,
WT_REF *ref, WT_SALVAGE_COOKIE *salvage, uint32_t flags)
{
WT_CONNECTION_IMPL *conn;
@@ -523,7 +523,7 @@ __rec_root_write(WT_SESSION_IMPL *session, WT_PAGE *page, uint32_t flags)
* Fake up a reference structure, and write the next root page.
*/
__wt_root_ref_init(&fake_ref, next, page->type == WT_PAGE_COL_INT);
- return (__wt_rec_write(session, &fake_ref, NULL, flags));
+ return (__wt_reconcile(session, &fake_ref, NULL, flags));
err: __wt_page_out(session, &next);
return (ret);
diff --git a/src/include/extern.h b/src/include/extern.h
index e93ec17fb43..4ad3b6734c7 100644
--- a/src/include/extern.h
+++ b/src/include/extern.h
@@ -180,7 +180,7 @@ extern int __wt_ovfl_txnc_add(WT_SESSION_IMPL *session, WT_PAGE *page, const uin
extern void __wt_ovfl_txnc_free(WT_SESSION_IMPL *session, WT_PAGE *page);
extern int __wt_ovfl_track_wrapup(WT_SESSION_IMPL *session, WT_PAGE *page);
extern int __wt_ovfl_track_wrapup_err(WT_SESSION_IMPL *session, WT_PAGE *page);
-extern int __wt_rec_write(WT_SESSION_IMPL *session, WT_REF *ref, WT_SALVAGE_COOKIE *salvage, uint32_t flags);
+extern int __wt_reconcile(WT_SESSION_IMPL *session, WT_REF *ref, WT_SALVAGE_COOKIE *salvage, uint32_t flags);
extern int __wt_bulk_init(WT_SESSION_IMPL *session, WT_CURSOR_BULK *cbulk);
extern int __wt_bulk_wrapup(WT_SESSION_IMPL *session, WT_CURSOR_BULK *cbulk);
extern int __wt_bulk_insert_row(WT_SESSION_IMPL *session, WT_CURSOR_BULK *cbulk);