Skip to content

Commit b17fed8

Browse files
committed
Revert "add debug info"
This reverts commit 39b1dc2.
1 parent 39b1dc2 commit b17fed8

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

include/btree.h

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <memory>
3030

3131
#define BLOCKSIZE 4096
32-
#define T 255
32+
#define T 255
3333
#define LEAF 0x0001
3434
#define ONDISK 0x0002
3535

@@ -104,16 +104,11 @@ namespace alg {
104104
*/
105105
int32_t search(node x, int32_t k) {
106106
int32_t i = 0;
107-
while (i<x->n && (k > x->key[i])) i++;
107+
while (i<x->n && k > x->key[i]) i++;
108108

109109
if (i<x->n && k == x->key[i]) {
110110
return i;
111111
} else if (x->flag & LEAF) {
112-
int c;
113-
for (c=0;c<x->n;c++) {
114-
printf("%d ", x->key[c]);
115-
}
116-
printf("[%d]\n", x->key[i]);
117112
return -1;
118113
} else {
119114
std::auto_ptr<node_t> xi(READ(x, i));
@@ -156,7 +151,11 @@ namespace alg {
156151
*/
157152
void * allocate_node() {
158153
node x = (node)malloc(sizeof(node_t));
159-
memset(x, 0, sizeof(node_t));
154+
x->n = 0;
155+
x->offset = 0;
156+
x->flag = 0;
157+
memset(x->key, 0, sizeof(x->key));
158+
memset(x->c, 0, sizeof(x->c));
160159
return x;
161160
}
162161

@@ -166,7 +165,11 @@ namespace alg {
166165
void split_child(node x, int32_t i) {
167166
std::auto_ptr<node_t> z((node)allocate_node());
168167
std::auto_ptr<node_t> y(READ(x, i));
168+
z->flag &= ~LEAF;
169169
z->flag |= (y->flag & LEAF);
170+
printf("leafz:%x\n", z->flag);
171+
printf("leafy:%x\n", y->flag);
172+
printf("leafx:%x offset:%x\n", x->flag, x->offset);
170173
z->n = T - 1;
171174

172175
int32_t j;
@@ -185,8 +188,10 @@ namespace alg {
185188
WRITE(z.get());
186189

187190
for (j=x->n;j>=i+1;j--) {
188-
x->c[j+1] = x->c[j]; // right shift
191+
x->c[j+1] = x->c[j]; // shift
189192
}
193+
194+
// save z
190195
x->c[i+1] = z->offset;
191196

192197
for (j=x->n-1;j>=i;j--) {

src/btree_demo.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ int main(void) {
66
BTree x("./btree.dat");
77
int32_t i;
88

9+
/*
910
for (i=0;i<1024;i++) {
10-
x.Insert(i);
11+
x.Insert(i);
1112
}
13+
*/
1214

1315
for(i=0;i<1024;i++) {
1416
int32_t r = x.Search(i);

0 commit comments

Comments
 (0)