Commit 6071fe59 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

cleanup a couple of icc compiler warnings.

git-svn-id: file:///svn/toku/tokudb.1032b@7896 c7de825b-a66e-492c-adef-691d508d4ae1
parent ed07bbb5
...@@ -1628,8 +1628,8 @@ brt_leaf_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER logger, ...@@ -1628,8 +1628,8 @@ brt_leaf_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER logger,
// if the insertion point is within a window of the right edge of // if the insertion point is within a window of the right edge of
// the leaf then it is sequential // the leaf then it is sequential
// window = min(32, number of leaf entries/16) // window = min(32, number of leaf entries/16)
{
u_int32_t s = toku_omt_size(node->u.l.buffer); u_int32_t s = toku_omt_size(node->u.l.buffer);
u_int32_t w = s / 16; u_int32_t w = s / 16;
if (w == 0) w = 1; if (w == 0) w = 1;
...@@ -1641,6 +1641,7 @@ brt_leaf_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER logger, ...@@ -1641,6 +1641,7 @@ brt_leaf_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER logger,
} else { } else {
node->u.l.seqinsert = 0; node->u.l.seqinsert = 0;
} }
}
break; break;
case BRT_DELETE_BOTH: case BRT_DELETE_BOTH:
case BRT_ABORT_BOTH: case BRT_ABORT_BOTH:
...@@ -2381,6 +2382,7 @@ brtnode_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER logger, enum react ...@@ -2381,6 +2382,7 @@ brtnode_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER logger, enum react
if (r!=0) goto return_r; if (r!=0) goto return_r;
} }
// Now all those children may need fixing. // Now all those children may need fixing.
{
int i; int i;
int original_n_children = node->u.n.n_children; int original_n_children = node->u.n.n_children;
for (i=0; i<original_n_children; i++) { for (i=0; i<original_n_children; i++) {
...@@ -2390,6 +2392,7 @@ brtnode_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER logger, enum react ...@@ -2390,6 +2392,7 @@ brtnode_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER logger, enum react
if (r!=0) break; if (r!=0) break;
if (*did_io) break; if (*did_io) break;
} }
}
return_r: return_r:
*re = get_nonleaf_reactivity(node); *re = get_nonleaf_reactivity(node);
return r; return r;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment