fix file read and write delete bugs

DBMS/DBMS/fileManage.cpp

@@ -14,8 +14,8 @@ void FileManage::writePageToFile(int pageid, dbPage* pagedata, char* filename){
 	strcpy(updatefilename, filename);
 	strcat(updatefilename, ".tmp");
 
-	originfilestream = fopen(filename,"r");
-	updatefilestream = fopen(updatefilename, "w+");
+	originfilestream = fopen(filename,"rb");
+	updatefilestream = fopen(updatefilename, "wb+");
 	if (originfilestream == NULL) {
 		fseek(updatefilestream, pageid*sizeof(dbPage), SEEK_SET);
 		fwrite(pagedata,sizeof(dbPage), 1, updatefilestream);
@@ -52,10 +52,10 @@ void FileManage::writePageToFile(int pageid, dbPage* pagedata, char* filename){
 
 void FileManage::readPageFromFile(int pageid, dbPage* pageinfo, char* filename){
 	FILE* filestream;
-	filestream = fopen(filename,"r");
-	int status = fseek(filestream, pageid*sizeof(dbPage), SEEK_SET);
+	filestream = fopen(filename,"rb");
+	int status = fseek(filestream, pageid*DB_PGSIZE, SEEK_SET);
 	if (status == 0) {
-		fread(pageinfo, sizeof(dbPage), 1, filestream);
+		fread(pageinfo, DB_PGSIZE, 1, filestream);
 	} else {
 		cout << "Read page from file error: " << pageid << " filename: " << filename << endl;
 		pageinfo->header.fileId = 0;

DBMS/DBMS/main.cpp

@@ -68,11 +68,19 @@ int main()
 		cout << "first insert index data: " << i <<endl;
 		testdb.insertData("studentinfo", onedata);
 	}
+	//testdb.printFreeList("studentinfo", 1, 115);
+	for (int i = 0; i < 30; i++) {
+		cout << " delete index data: " << i << endl;
+		testdb.deleteData("studentinfo",1,115*i*2, 115);
+	}
 	testdb.printFreeList("studentinfo", 1, 115);
+
 	for (int i = 0; i < 30; i++) {
 		cout << " delete index data: " << i << endl;
 		testdb.deleteData("studentinfo",1,115*i*2, 115);
 	}
+	dbPage* pageInfo = new dbPage();
+	FileManage::readPageFromFile(1,pageInfo, testdb.getTablePath("studentinfo"));
 	testdb.printFreeList("studentinfo", 1, 115);
 	/*for (int i = 0; i < 40; i++) {
 		cout << "second insert index data: " << i <<endl;

DBMS/DBMS/recordManage.cpp

@@ -141,7 +141,10 @@ void DBStorage::deleteData(char* tablename, int pageid, int offset, int recordle
 	char* path = getTablePath(tablename);
 	dbPage* pageInfo = new dbPage();
 	FileManage::readPageFromFile(pageid, pageInfo, path);
-
+
+	if(dataUtility::char_to_bool(pageInfo->data[offset])) //have deleted
+		return;
+	pageInfo->data[offset] = dataUtility::bool_to_byte(true);
 	int firstOffset = pageInfo->header.firstFreeOffset;
 	if( firstOffset == -1 ){			//Full page
 		pageInfo->header.firstFreeOffset = offset;