Skip to content

update bug #59

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

Merged
1 commit merged into from
Jan 11, 2015
Merged

update bug #59

Show file tree
Hide file tree
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
39 changes: 20 additions & 19 deletions DBMS/DBMS/dbManage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,11 @@ bool DBManager::updateRecord(string tableName,BYTE **Value,string *colName,BYTE
dataUtility::bytefillbyte(dataPage->page->data, (unsigned char*)temp, offset*recordLength+col->index, len[i]);
delete[] temp;
}else {
char* temp = new char[col->length-len[i]];
//char* temp = new char[col->length-len[i]];
dataUtility::bytefillbyte(dataPage->page->data, (unsigned char*)Value[i], offset*recordLength+col->index, len[i]);
dataUtility::bytefillbyte(dataPage->page->data, (unsigned char*)temp, offset*recordLength+col->index+len[i], col->length-len[i]);
delete[] temp;
dataPage->page->data[offset*recordLength+col->index+len[i]] = '\0';
//dataUtility::bytefillbyte(dataPage->page->data, (unsigned char*)temp, offset*recordLength+col->index+len[i], col->length-len[i]);
//delete[] temp;
}
dataPage->dirty = true;
}
Expand Down Expand Up @@ -259,22 +260,22 @@ void DBManager::printRecord(string tableName,BYTE colnum,string *colName,TYPE_OF
}
Node* dataPage = readPage(table->id, pageid);

TYPE_OFFSET freeOffset = dataPage->page->header.firstFreeOffset;
TYPE_OFFSET deletedItem = 0;
while(freeOffset < offset*recordLength && freeOffset != EXIST_INDEX){
freeOffset = dataUtility::char_to_data<TYPE_OFFSET>(dataPage->page->data+freeOffset+recordLength-SIZE_OFFSET);
deletedItem++;
}
if( freeOffset == EXIST_INDEX ){
//Deleted linked list ends before the selected item, check for initialized value
TYPE_OFFSET realFreeCount = dataPage->page->header.freeCount - deletedItem * recordLength;
if( PAGE_SIZE - realFreeCount <= freeOffset*recordLength ){ //offset is not valid since it is still in default state
return;
}
}
else if(freeOffset == offset*recordLength){//item is deleted
return;
}
//TYPE_OFFSET freeOffset = dataPage->page->header.firstFreeOffset;
//TYPE_OFFSET deletedItem = 0;
//while(freeOffset < offset*recordLength && freeOffset != EXIST_INDEX){
// freeOffset = dataUtility::char_to_data<TYPE_OFFSET>(dataPage->page->data+freeOffset+recordLength-SIZE_OFFSET);
// deletedItem++;
//}
//if( freeOffset == EXIST_INDEX ){
// //Deleted linked list ends before the selected item, check for initialized value
// TYPE_OFFSET realFreeCount = dataPage->page->header.freeCount - deletedItem * recordLength;
// if( PAGE_SIZE - realFreeCount <= freeOffset*recordLength ){ //offset is not valid since it is still in default state
// return;
// }
//}
//else if(freeOffset == offset*recordLength){//item is deleted
// return;
//}

cout << "------- Record " << offset+1 << " in Page " << pageid << " -------" << endl;
int i = 1;
Expand Down
Binary file modified DBMS/DBMS/orderDB/publisher
View file
Open in desktop
Binary file not shown.