mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #5920 check that deserialization succeeded before attempting to use the ftnode for updating stats

Browse source 
git-svn-id: file:///svn/toku/tokudb@52380 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
John Esmet 2013-04-17 00:01:27 -04:00 • committed by Yoni Fogel
parent fe91960373
commit 3a5048832e
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ft/ft_node-serialize.cc
View file

@ -1720,7 +1720,9 @@ deserialize_ftnode_header_from_rbuf_if_small_enough (FTNODE *ftnode,
r = 0;
cleanup:
toku_ft_status_update_deserialize_times(node, deserialize_time, decompress_time);
if (r == 0) {
toku_ft_status_update_deserialize_times(node, deserialize_time, decompress_time);
}
if (r != 0) {
if (node) {
toku_free(*ndd);
@ -2386,11 +2388,11 @@ deserialize_ftnode_from_rbuf(
r = 0;
cleanup:
t1 = toku_time_now();
deserialize_time = (t1 - t0) - decompress_time;
toku_ft_status_update_deserialize_times(node, deserialize_time, decompress_time);
if (r == 0) {
t1 = toku_time_now();
deserialize_time = (t1 - t0) - decompress_time;
toku_ft_status_update_deserialize_times(node, deserialize_time, decompress_time);
}
if (r != 0) {
// NOTE: Right now, callers higher in the stack will assert on
// failure, so this is OK for production. However, if we
@ -2400,7 +2402,6 @@ cleanup:
toku_free(node);
}
}
return r;
}