Commit caeafaa1 authored by John Esmet's avatar John Esmet

FT-93 Fix an oops - accidentally swapped usage of serialized_size() with total_size()

parent 45285428
...@@ -540,7 +540,7 @@ ftnode_memory_size (FTNODE node) ...@@ -540,7 +540,7 @@ ftnode_memory_size (FTNODE node)
int n_children = node->n_children; int n_children = node->n_children;
retval += sizeof(*node); retval += sizeof(*node);
retval += (n_children)*(sizeof(node->bp[0])); retval += (n_children)*(sizeof(node->bp[0]));
retval += node->pivotkeys.serialized_size(); retval += node->pivotkeys.total_size();
// now calculate the sizes of the partitions // now calculate the sizes of the partitions
for (int i = 0; i < n_children; i++) { for (int i = 0; i < n_children; i++) {
......
...@@ -469,7 +469,7 @@ serialize_ftnode_info_size(FTNODE node) ...@@ -469,7 +469,7 @@ serialize_ftnode_info_size(FTNODE node)
retval += 4; // flags retval += 4; // flags
retval += 4; // height; retval += 4; // height;
retval += 8; // oldest_referenced_xid_known retval += 8; // oldest_referenced_xid_known
retval += node->pivotkeys.total_size(); retval += node->pivotkeys.serialized_size();
retval += (node->n_children-1)*4; // encode length of each pivot retval += (node->n_children-1)*4; // encode length of each pivot
if (node->height > 0) { if (node->height > 0) {
retval += node->n_children*8; // child blocknum's retval += node->n_children*8; // child blocknum's
......
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