Changeset 72 for btree

Timestamp:

09/14/06 00:15:35 (4 years ago)

Author:

aqua

Message:

ok... it works -_-;;;

Location:

btree/src

Files:

• btree.c (modified) (5 diffs)
• btree.h (modified) (1 diff)

btree/src/btree.c

@@ -66 +66 @@
  *     btree* btree_open( int fd, int root_offset );
  */
-btree* btree_open( char* btree_file ){
+btree* btree_open( char* btree_file, int offset ){
 
         btree* new = (btree*) malloc(sizeof(btree));
@@ -77 +77 @@
         }
 
-        new->root = lseek( new->fd, 0, SEEK_END );
-        if( new->root >= BLOCK_SIZE ){
-                /* root node is positioned in offset (SEEK_END-BLOCK_SIZE) */
-                new->root -= (BLOCK_SIZE);
-                new->depth = get_depth( new );
-        }
-        else {
-                /* empty tree */
+        if( offset < 0 ){
                 new->root = -1;
                 new->depth = 0;
+        }
+        else{
+                new->root = lseek( new->fd, offset, SEEK_SET );
+                new->depth = get_depth( new );
         }
 
@@ -371 +368 @@
         int i;
 
-        tree = btree_open( "test.idx" );
+        FILE* fp;
+        int offset;
+
+        fp = fopen( "root", "r+" );
+        fseek( fp, 0, SEEK_SET );
+        fread( &offset, 4, 1, fp );
+
+        tree = btree_open( "test.idx", offset );
         tree->compare = &compare;
         if( tree == NULL ){
@@ -381 +385 @@
         btree_print( tree );
 
-        for( i = 70 ; i < 80 ; i++ ){
+        for( i = 100 ; i < 120 ; i++ ){
                 sprintf( buf, "%d", i );
                 btree_insert( tree, buf );
@@ -390 +394 @@
         btree_print( tree );
 
+        fseek( fp, 0, SEEK_SET );
+        fwrite( &(tree->root), 4, 1, fp );
         return 0;
 }

btree/src/btree.h

@@ -31 +31 @@
 } btree;
 
-btree* btree_open( char* btree_file );
+//btree* btree_open( char* btree_file );
 void btree_insert( btree* tree, char* key );