Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
caeafaa1
Commit
caeafaa1
authored
Jun 23, 2014
by
John Esmet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FT-93 Fix an oops - accidentally swapped usage of serialized_size() with total_size()
parent
45285428
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ft/ft-ops.cc
ft/ft-ops.cc
+1
-1
ft/ft_node-serialize.cc
ft/ft_node-serialize.cc
+1
-1
No files found.
ft/ft-ops.cc
View file @
caeafaa1
...
@@ -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
++
)
{
...
...
ft/ft_node-serialize.cc
View file @
caeafaa1
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment