Skip to content

jason fix the print undeleted data #61

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

jason fix the print undeleted data #61

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: 23 additions & 16 deletions DBMS/DBMS/dbManage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,22 +265,29 @@ 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){
++deletedItem;
freeOffset = dataUtility::char_to_data<TYPE_OFFSET>(dataPage->page->data+freeOffset+recordLength-SIZE_OFFSET);
}
if( freeOffset == EXIST_INDEX && dataPage->page->header.freeCount >= recordLength){
//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 <= offset*recordLength ){ //offset is not valid since it is still in default state
cout << "Record " << offset+1 << " in Page " << pageid << " has not been used." << endl;
return;
}
}
else if(freeOffset == offset*recordLength){//item is deleted or first free
if( PAGE_SIZE - dataPage->page->header.freeCount == freeOffset ){ //offset is not valid since it is still in default state
cout << "Record " << offset+1 << " in Page " << pageid << " has not been used." << endl;
return;
}
cout << "Record " << offset+1 << " in Page " << pageid << " has been deleted." << endl;
return;
}


cout << "------- Record " << offset+1 << " in Page " << pageid << " -------" << endl;
int i = 1;
Expand Down
Binary file added DBMS/DBMS/orderDB/_sysFile
View file
Open in desktop
Binary file not shown.
Binary file added DBMS/DBMS/orderDB/publisher
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions DBMS/DBMS/wq_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ bool parser::parserOneCommand(vector<string> commands) {
else if (checkKeyWord(commands[0], UPDATE)) {
return parserUpdate(commands);
}
else if (checkKeyWord(commands[0], SELECT)) {
return parserSelect(commands);
}
return true;
}
bool parser::parserSelect(vector<string> commands){
Expand Down