From 4258288eb9dc3cc1bcd83c32b4805ef991d51140 Mon Sep 17 00:00:00 2001 From: Leif Walsh Date: Wed, 17 Apr 2013 00:01:16 -0400 Subject: [PATCH] refs #5671 also don't use copyref in ft-ops.cc git-svn-id: file:///svn/toku/tokudb@50010 c7de825b-a66e-492c-adef-691d508d4ae1 --- ft/ft-ops.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ft/ft-ops.cc b/ft/ft-ops.cc index d3fcb76c797..3942c63d773 100644 --- a/ft/ft-ops.cc +++ b/ft/ft-ops.cc @@ -1388,7 +1388,7 @@ init_childinfo(FTNODE node, int childnum, FTNODE child) { static void init_childkey(FTNODE node, int childnum, const DBT *pivotkey) { - toku_copyref_dbt(&node->childkeys[childnum], *pivotkey); + toku_copy_dbt(&node->childkeys[childnum], *pivotkey); node->totalchildkeylens += pivotkey->size; } @@ -4801,7 +4801,7 @@ ft_search_child(FT_HANDLE brt, FTNODE node, int childnum, ft_search_t *search, F static inline int search_which_child_cmp_with_bound(DB *db, ft_compare_func cmp, FTNODE node, int childnum, ft_search_t *search, DBT *dbt) { - return cmp(db, toku_copyref_dbt(dbt, node->childkeys[childnum]), &search->pivot_bound); + return cmp(db, toku_copy_dbt(dbt, node->childkeys[childnum]), &search->pivot_bound); } int @@ -4823,7 +4823,7 @@ toku_ft_search_which_child( int mi; while (lo < hi) { mi = (lo + hi) / 2; - toku_copyref_dbt(&pivotkey, node->childkeys[mi]); + toku_copy_dbt(&pivotkey, node->childkeys[mi]); // search->compare is really strange, and only works well with a // linear search, it makes binary search a pita. // @@ -4885,7 +4885,7 @@ toku_ft_search_which_child( } for (c = 0; c < node->n_children-1; c++) { int p = (search->direction == FT_SEARCH_LEFT) ? child[c] : child[c] - 1; - toku_copyref_dbt(&pivotkey, node->childkeys[p]); + toku_copy_dbt(&pivotkey, node->childkeys[p]); if (search_pivot_is_bounded(search, desc, cmp, &pivotkey) && search->compare(search, &pivotkey)) { return child[c]; }