Skip to content

fix two cases in raxRemove which can be compressed but not #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhuer91 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix two cases in raxRemove which can be compressed but not #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions rax.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,12 +1073,12 @@ int raxRemove(rax *rax, unsigned char *s, size_t len, void **old) {

/* If after the removal the node has just a single child
* and is not a key, we need to try to compress it. */
if (new->size == 1 && new->iskey == 0) {
if (new->size == 1) {
trycompress = 1;
h = new;
}
}
} else if (h->size == 1) {
} else if (h->size == 1 || h->iscompr) {
/* If the node had just one child, after the removal of the key
* further compression with adjacent nodes is pontentially possible. */
trycompress = 1;
Expand Down Expand Up @@ -1142,7 +1142,7 @@ int raxRemove(rax *rax, unsigned char *s, size_t len, void **old) {
raxNode *parent;
while(1) {
parent = raxStackPop(&ts);
if (!parent || parent->iskey ||
if (!parent || h->iskey ||
(!parent->iscompr && parent->size != 1)) break;
h = parent;
debugnode("Going up to",h);
Expand All @@ -1165,7 +1165,8 @@ int raxRemove(rax *rax, unsigned char *s, size_t len, void **old) {
if (nodes > 1) {
/* If we can compress, create the new node and populate it. */
size_t nodesize =
sizeof(raxNode)+comprsize+raxPadding(comprsize)+sizeof(raxNode*);
sizeof(raxNode)+comprsize+raxPadding(comprsize)+sizeof(raxNode*)
+(start->iskey&&!start->isnull)*sizeof(void*);
raxNode *new = rax_malloc(nodesize);
/* An out of memory here just means we cannot optimize this
* node, but the tree is left in a consistent state. */
Expand All @@ -1177,6 +1178,10 @@ int raxRemove(rax *rax, unsigned char *s, size_t len, void **old) {
new->isnull = 0;
new->iscompr = 1;
new->size = comprsize;
if(start->iskey){
void *data = raxGetData(start);
raxSetData(new,data);
}
rax->numnodes++;

/* Scan again, this time to populate the new node content and
Expand Down