diff options
author | Michael Cahill <michael.cahill@mongodb.com> | 2016-01-28 12:18:13 +1100 |
---|---|---|
committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-01-28 12:18:13 +1100 |
commit | 07966a492ada9b85cd45af9248abd85ca47f2ff2 (patch) | |
tree | 7e4e04870dd2ff4b1a6612ca0a201f181deee965 | |
parent | 67e412d4c578e203505446496c67fc1517931cad (diff) | |
download | mongo-07966a492ada9b85cd45af9248abd85ca47f2ff2.tar.gz |
Fixup for merge vs backport.mongodb-3.2.3mongodb-3.2.2
-rw-r--r-- | src/btree/bt_split.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/btree/bt_split.c b/src/btree/bt_split.c index 102265c0a8f..ac83a21ac6f 100644 --- a/src/btree/bt_split.c +++ b/src/btree/bt_split.c @@ -535,19 +535,6 @@ __split_root(WT_SESSION_IMPL *session, WT_PAGE *root) uint32_t slots; void *p; - /* - * A note on error handling: this function first allocates/initializes - * new structures; failures during that period are handled by discarding - * the memory and returning an error code, our caller knows the split - * didn't happen and proceeds accordingly. Second, this function updates - * the tree, and a failure in that period is catastrophic, any partial - * update to the tree requires a panic, we can't recover. Third, once - * the split is complete and the tree has been fully updated, we have to - * ignore most errors because the split is complete and correct, callers - * have to proceed accordingly. - */ - enum { ERR_RETURN, ERR_PANIC, ERR_IGNORE } complete; - WT_STAT_FAST_CONN_INCR(session, cache_eviction_deepen); WT_STAT_FAST_DATA_INCR(session, cache_eviction_deepen); WT_STAT_FAST_CONN_INCR(session, cache_eviction_split_internal); @@ -1023,19 +1010,6 @@ __split_internal(WT_SESSION_IMPL *session, WT_PAGE *parent, WT_PAGE *page) uint32_t slots; void *p; - /* - * A note on error handling: this function first allocates/initializes - * new structures; failures during that period are handled by discarding - * the memory and returning an error code, our caller knows the split - * didn't happen and proceeds accordingly. Second, this function updates - * the tree, and a failure in that period is catastrophic, any partial - * update to the tree requires a panic, we can't recover. Third, once - * the split is complete and the tree has been fully updated, we have to - * ignore most errors because the split is complete and correct, callers - * have to proceed accordingly. - */ - enum { ERR_RETURN, ERR_PANIC, ERR_IGNORE } complete; - WT_STAT_FAST_CONN_INCR(session, cache_eviction_split_internal); WT_STAT_FAST_DATA_INCR(session, cache_eviction_split_internal); |