Insert method added to check_bTree.c
This commit is contained in:
Colleen M. Lewis
parent
5bfcbdb076
commit
a579da0a58
1 changed files with 191 additions and 88 deletions
|
|
@ -46,6 +46,9 @@ terms specified in this license.
|
||||||
|
|
||||||
#include <lladd/transactional.h>
|
#include <lladd/transactional.h>
|
||||||
|
|
||||||
|
|
||||||
|
#include "../../src/lladd/page/fixed.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
@ -55,126 +58,226 @@ terms specified in this license.
|
||||||
/** @test
|
/** @test
|
||||||
*/
|
*/
|
||||||
|
|
||||||
START_TEST(bTreeFixedPage)
|
|
||||||
{
|
|
||||||
Tinit();
|
|
||||||
SimpleExampleFixedPage();
|
|
||||||
Tdeinit();
|
|
||||||
} END_TEST
|
|
||||||
|
|
||||||
int SimpleExampleFixedPage(){
|
|
||||||
|
|
||||||
|
|
||||||
int DEBUGT = 1;
|
|
||||||
int xid = Tbegin();
|
|
||||||
int pageid1;
|
|
||||||
Page * p1;
|
|
||||||
|
|
||||||
recordid rid = TfixedPageAlloc(xid, sizeof(int)); // this does the initialize
|
|
||||||
|
|
||||||
pageid1 = rid.page;
|
|
||||||
|
|
||||||
p1 = loadPage(xid, pageid1);
|
|
||||||
|
|
||||||
int num_slots = rid.slot;
|
|
||||||
int size_of_slots = rid.size;
|
|
||||||
|
|
||||||
if(DEBUGT) { printf("\n rid:size_of_slots = %d" , size_of_slots); }
|
|
||||||
if(DEBUGT) { printf("\n rid:num_slots = %d" , num_slots);}
|
|
||||||
|
|
||||||
|
|
||||||
if(DEBUGT) {printf("\n record size (p1) = %d" , fixedPageRecordSize(p1));}
|
|
||||||
if(DEBUGT) {printf("\n fixedPageCount (p1) = %d" , fixedPageCount(p1));}
|
|
||||||
|
|
||||||
releasePage(p1);
|
|
||||||
Tcommit(xid);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
START_TEST(bTreeTest)
|
START_TEST(bTreeTest)
|
||||||
{
|
{
|
||||||
Tinit();
|
Tinit();
|
||||||
// HelloWorld();
|
testFunctions();
|
||||||
SimpleExample();
|
SimpleExample();
|
||||||
// printf("\n end of practice run\n");
|
// printf("\n end of practice run\n");
|
||||||
Tdeinit();
|
Tdeinit();
|
||||||
} END_TEST
|
} END_TEST
|
||||||
|
|
||||||
|
/* This only takes in a page that is already initialized as a fixed page.
|
||||||
|
and has been initialized as a BTree Node, which involves placing an
|
||||||
|
index to tell how many entries are currently valid.
|
||||||
|
For now it will just return false if you try to add something to it
|
||||||
|
when it is already full.
|
||||||
|
This method doesn't use the Slot value of rid!
|
||||||
|
We make a copy of rid_caller so that the caller's copy doesn't change.
|
||||||
|
*/
|
||||||
|
int insert(Page* p, recordid rid_caller, int valueIn){
|
||||||
|
printf ("\nbegin insert\n");
|
||||||
|
int DEBUG = 0;
|
||||||
|
int DEBUGERROR = 1;
|
||||||
|
int DEBUGERROR2 = 0;
|
||||||
|
int DEBUGSTATEMENTS = 1;
|
||||||
|
int DEBUGMALLOC = 1; // 1 makes it malloc the space
|
||||||
|
|
||||||
|
//printf("\npage->id = %d\n", p->id);
|
||||||
|
|
||||||
|
// make a copy of the rid - so we don't effect the caller's copy
|
||||||
|
recordid rid = rid_caller;
|
||||||
|
|
||||||
|
|
||||||
|
// if DEBUGERROR ==1 this causes a seg fault below!
|
||||||
|
if (DEBUGERROR) {printf("\n***page->id = %d\n", p->id);}
|
||||||
|
printf("\n***rid.page = %d\n\n", rid.page);
|
||||||
|
|
||||||
|
|
||||||
|
if(DEBUG) {printf("\nrid.page = %d\n", rid.page);}
|
||||||
|
if(DEBUG) {printf("\nrid.slot = %d\n", rid.slot);}
|
||||||
|
|
||||||
|
|
||||||
|
// Figure out how many entries are in the node
|
||||||
|
rid.slot = 0; // need to get the variable in slot 0
|
||||||
|
|
||||||
|
byte * countBuff;/// AHHH - i wasn't mallocing space for this!
|
||||||
|
|
||||||
|
if(DEBUGMALLOC ) {countBuff = (byte *) malloc (sizeof(int));}
|
||||||
|
|
||||||
|
if (DEBUGSTATEMENTS) {printf("\nDebug1\n");}
|
||||||
|
|
||||||
|
fixedRead(p, rid, countBuff); // read the value of count from slot 0
|
||||||
|
|
||||||
|
if (DEBUGSTATEMENTS) {printf("\nDebug2\n");}
|
||||||
|
|
||||||
|
int * countInt = (int *) countBuff; // cast it to an int *
|
||||||
|
|
||||||
|
// set rid.slot to be the max slot entry used.
|
||||||
|
rid.slot = *countInt;
|
||||||
|
|
||||||
|
printf("\nrid2slot = %d\n", rid.slot);
|
||||||
|
|
||||||
|
// *recordcount_ptr(p) = last accessible index on the page.
|
||||||
|
int max_index = *recordcount_ptr(p);
|
||||||
|
|
||||||
|
|
||||||
|
//THESE LINES WERE CAUSING A SEGFAULT! *******************************************
|
||||||
|
if (DEBUGERROR2) {printf("\nx = %d\n", max_index);} // This causes a segfault after Debug2
|
||||||
|
|
||||||
|
// HACK! TO FIX THE ABOVE PROBLEM!
|
||||||
|
max_index = 1021;
|
||||||
|
|
||||||
|
// assert that max_index is greater than our record of how many
|
||||||
|
// entries we currently have on the page.
|
||||||
|
assert(max_index>rid.slot);
|
||||||
|
|
||||||
|
|
||||||
|
// check to see if we have room to add the entry.
|
||||||
|
if (rid.slot == max_index){
|
||||||
|
// we can't add any more entries to this node
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// the default location to put the new value is location 1.
|
||||||
|
int insertLocation = 1;
|
||||||
|
|
||||||
|
// Iterating DOWN through the slots. Stop when we reach 0.
|
||||||
|
// Will also break out of the while loop if we've found where
|
||||||
|
// to insert the new value.
|
||||||
|
while ( (rid.slot >= 1) && (insertLocation == 1)){
|
||||||
|
|
||||||
|
// TODO: JuSt haven't filled in the code here yet...
|
||||||
|
insertLocation =2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// convert the input valueIn into a byte array
|
||||||
|
byte * valueInBuff = (byte *) & valueIn;
|
||||||
|
|
||||||
|
// get the rid ready to write to the insertLocation (determined above)
|
||||||
|
rid.slot = insertLocation;
|
||||||
|
|
||||||
|
// fixedWrite(p, rid, valueInBuff); // page/fixed.c:58: checkRid: Assertion `page->id == rid.page' failed.
|
||||||
|
printf("\n***page->id = %d\n", p->id);
|
||||||
|
printf("\n***rid.page = %d\n", rid.page);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This takes a page that is already initialized and a
|
||||||
|
corresponding rid and initalizes the count value for
|
||||||
|
it to be a BTreeNode. Just puts the value 0 in the
|
||||||
|
first index of the page.
|
||||||
|
*/
|
||||||
|
int initializeNewBTreeNode(Page* p, recordid rid){
|
||||||
|
|
||||||
|
// need access to the first slot
|
||||||
|
rid.slot = 0;
|
||||||
|
|
||||||
|
// prepare the value to go into the first slot
|
||||||
|
int countInt = 0;
|
||||||
|
byte * countBuff = (byte *) & countInt;
|
||||||
|
|
||||||
|
// write the count out
|
||||||
|
fixedWrite(p, rid, countBuff);
|
||||||
|
|
||||||
|
}
|
||||||
|
int testFunctions(){
|
||||||
|
printf("testing functions");
|
||||||
|
|
||||||
|
// getting things ready
|
||||||
|
int xid = Tbegin();
|
||||||
|
recordid rid1 = TfixedPageAlloc(xid, sizeof(int)); // this does the initialize
|
||||||
|
int pageid1 = rid1.page;
|
||||||
|
Page * p1 = loadPage(xid, pageid1);
|
||||||
|
|
||||||
|
// calling functions
|
||||||
|
|
||||||
|
initializeNewBTreeNode(p1, rid1);
|
||||||
|
insert(p1, rid1, 3);
|
||||||
|
|
||||||
|
|
||||||
|
// cleaning up
|
||||||
|
releasePage(p1);
|
||||||
|
Tcommit(xid);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
int SimpleExample(){
|
int SimpleExample(){
|
||||||
|
|
||||||
int DEBUGP = 0;
|
int DEBUGP = 0;
|
||||||
int DEBUGT = 0;
|
int DEBUGT = 0;
|
||||||
|
int DEBUGA = 0;
|
||||||
int xid = Tbegin();
|
int xid = Tbegin();
|
||||||
|
|
||||||
/* Where to find stuff
|
/* Where to find stuff
|
||||||
* ****************************
|
* ****************************
|
||||||
* TpageAlloc -> lladd/src/lladd/operations/pageOperations.c
|
* TpageAlloc -> lladd/src/lladd/operations/pageOperations.c
|
||||||
* TfixedPageAlloc -> lladd/src/lladd/operations/pageOperations.c
|
* TfixedPageAlloc -> lladd/src/lladd/operations/pageOperations.c
|
||||||
* fixedPageInitailze -> lladd/src/lladd/page/fixed.c
|
* fixedPageInitailze -> lladd/src/lladd/page/fixed.c
|
||||||
*/
|
*/
|
||||||
int pageid1;// = TpageAlloc(xid);
|
|
||||||
|
|
||||||
int pageid2 = TpageAlloc(xid);
|
|
||||||
|
|
||||||
int pageid3;// = TpageAlloc(xid);
|
|
||||||
|
|
||||||
Page * p1;// = (Page *) malloc (sizeof(300));
|
|
||||||
Page * p2;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//p2 = loadPage(xid, pageid2);
|
recordid rid1 = TfixedPageAlloc(xid, sizeof(int)); // this does the initialize
|
||||||
|
|
||||||
// fixedPageInitialize(p1, sizeof(int) , 4);
|
|
||||||
|
|
||||||
|
|
||||||
recordid rid = TfixedPageAlloc(xid, sizeof(int)); // this does the initialize
|
int pageid1 = rid1.page;
|
||||||
|
|
||||||
pageid1 = rid.page;
|
Page * p1 = loadPage(xid, pageid1);
|
||||||
|
|
||||||
p1 = loadPage(xid, pageid1);
|
if(DEBUGP) { printf("\n**** page->id = %d\n", p1->id);}
|
||||||
|
|
||||||
int num_slots = rid.slot;
|
/* check consistency between rid & page's values
|
||||||
int size_of_slots = rid.size;
|
* for number of slots and record size */
|
||||||
|
assert (rid1.slot == fixedPageCount(p1));
|
||||||
if(DEBUGP) { printf("\n size of int = %d ", sizeof(int));}
|
assert (rid1.size == fixedPageRecordSize(p1));
|
||||||
|
assert (p1->id == rid1.page);
|
||||||
if(DEBUGT) { printf("\n rid:size_of_slots = %d" , size_of_slots); }
|
|
||||||
if(DEBUGT) { printf("\n rid:num_slots = %d" , num_slots);}
|
|
||||||
|
|
||||||
if(DEBUGP) { printf("\n rid:pageid num = %d" , pageid1);}
|
|
||||||
|
|
||||||
|
|
||||||
|
/* check to make sure page is recorded as a FIXED_PAGE */
|
||||||
|
assert( *page_type_ptr(p1) == FIXED_PAGE);
|
||||||
|
|
||||||
|
if (DEBUGP) { printf("\n%d\n", rid1); }
|
||||||
|
byte * b1 = (byte *) malloc (sizeof (int));
|
||||||
|
byte * b2 = (byte *) malloc (sizeof (int));
|
||||||
|
byte * b3 = (byte *) malloc (sizeof (int));
|
||||||
|
int x = *recordcount_ptr(p1);
|
||||||
|
int y = rid1.slot;
|
||||||
|
int z = 256;
|
||||||
|
|
||||||
|
b1 = (byte *) & x;
|
||||||
|
b2 = (byte *) & y;
|
||||||
|
b3 = (byte *) & z;
|
||||||
|
|
||||||
|
int * x1 = (int *) b1;
|
||||||
|
|
||||||
|
|
||||||
// int page_type = *page_type_ptr(p1);
|
if (DEBUGP) { printf("\nx = %d\n", x);}
|
||||||
|
if (DEBUGP) { printf("\nb1 = %d\n", *b1);}
|
||||||
|
if (DEBUGP) { printf("\nx1 = %d\n", *x1);}
|
||||||
|
if (DEBUGP) { printf("\ny = %d\n", y);}
|
||||||
|
if (DEBUGP) { printf("\nb2 = %d\n", *b2);}
|
||||||
|
if (DEBUGP) { printf("\nz = %d\n", z);}
|
||||||
|
if (DEBUGP) { printf("\nb3 = %d\n", *b3);}
|
||||||
|
|
||||||
// if(DEBUGP) { printf ("\n\n *page_type_ptr (p1) = %d \n" ,( *page_type_ptr(p1) == FIXED_PAGE)); }
|
recordid rid2 = rid1;
|
||||||
|
rid2.slot = 0;
|
||||||
|
|
||||||
// if(DEBUGT) { printf ("\n\n *page_type_ptr (p1) = %d \n" , page_type_ptr(p1));}
|
fixedWrite(p1, rid2, b1);
|
||||||
|
fixedRead(p1, rid2, b2);
|
||||||
|
if (DEBUGP) { printf("\nb2** = %d\n",*((int *) b2));}
|
||||||
|
|
||||||
// if(DEBUGT) { printf ( page_type_ptr(p1));}
|
// initializeNewBTreeNode(p1, rid1);
|
||||||
|
|
||||||
// * page_type_ptr(p1);
|
|
||||||
|
|
||||||
// int i = page_type_ptr(p1);
|
|
||||||
|
|
||||||
|
|
||||||
if(DEBUGT) {printf("\n record size (p1) = %d" , fixedPageRecordSize(p1));}
|
|
||||||
if(DEBUGT) {printf("\n fixedPageCount (p1) = %d" , fixedPageCount(p1));}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(DEBUGT) { printf("\n%x\n", p1);}
|
|
||||||
|
|
||||||
// recordid r = fixedRawRallocMany(p1, 4);
|
|
||||||
//fixedRawRallocMany(p1, 4);
|
|
||||||
if(DEBUGP) {printf("\n");}
|
|
||||||
if(DEBUGT) {printf("\n Just for FUN .... \n .... ");}
|
|
||||||
|
|
||||||
Page * p = & p1;
|
|
||||||
// int page_type = *page_type_ptr(p); // copied from page.c
|
|
||||||
|
|
||||||
// if(DEBUGT) {printf("\n page_type = %d", page_type);}
|
|
||||||
|
|
||||||
releasePage(p1);
|
releasePage(p1);
|
||||||
Tcommit(xid);
|
Tcommit(xid);
|
||||||
|
|
@ -197,7 +300,7 @@ Suite * check_suite(void) {
|
||||||
|
|
||||||
/* Sub tests are added, one per line, here */
|
/* Sub tests are added, one per line, here */
|
||||||
tcase_add_test(tc, bTreeTest);
|
tcase_add_test(tc, bTreeTest);
|
||||||
tcase_add_test(tc, bTreeFixedPage);
|
|
||||||
// tcase_add_test(tc, simpleLinearHashTest); // put back in if playing with hashtable
|
// tcase_add_test(tc, simpleLinearHashTest); // put back in if playing with hashtable
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue