Merge lp:~vkolesnikov/pbxt/pbxt-07-diskfull into lp:pbxt/1.0.07-rc

[Vladimir Kolesnikov]

[lp:~vkolesnikov/pbxt/pbxt-07-diskfull]

548. By Vladimir Kolesnikov on 2009-07-10

added more code comments, small cleanups

549. By Vladimir Kolesnikov on 2009-07-10

small cleanups

550. By Vladimir Kolesnikov on 2009-07-10

added a condition to exception throwing code in pbxt_init

=== modified file 'ChangeLog'
--- ChangeLog	2009-07-07 14:27:29 +0000
+++ ChangeLog	2009-07-10 14:01:07 +0000
@@ -1,6 +1,16 @@
 PBXT Release Notes
 ==================
 
+------- 1.0.07p RC - 2009-07-10
+
+RN258: updated xt_p_join implementation for Windows to check if a thread has already exited or has not yet started
+
+RN257: Removed false assertion that could fail during restore if a transaction log page was zero-filled
+
+RN256: Update datalog eof pointer only if write opearions were sucessful
+
+RN255: Added re-allocation of of filemap if allocating the of the new map failed. This often happens if there's not enough space on disk.
+
 ------- 1.0.07o RC - 2009-07-07
 
 RN254: When a table with a corrupted index is detected, PBXT creates a file called 'repair-pending' in the pbxt directory, with the name of the table in it. Each table in the file is listed on a line by itself (the last line has no trailing \n). When the table is repaired (using the REPAIR TABLE command), this entry is removed from the file.
 
=== modified file 'src/datalog_xt.cc'
--- src/datalog_xt.cc	2008-12-11 09:55:44 +0000
+++ src/datalog_xt.cc	2009-07-10 14:01:07 +0000
@@ -208,7 +208,8 @@
 			}
 			break;
 		default:
-			ASSERT_NS(FALSE);
+			/* assume 0 - eof */
+			//ASSERT_NS(FALSE);
 			goto return_empty;
 	}
 
@@ -1110,7 +1111,6 @@
 
 	*log_id = dlb_data_log->dlf_log_id;
 	*out_offset = dlb_data_log->dlf_log_eof;
-	dlb_data_log->dlf_log_eof += req_size;
 	return OK;
 }
 
@@ -1158,6 +1158,8 @@
 
 	if (!xt_pwrite_file(dlb_data_log->dlf_log_file, log_offset, size, data, &thread->st_statistics.st_data, thread))
 		return FAILED;
+	
+	dlb_data_log->dlf_log_eof += size;
 #ifdef DEBUG
 	if (log_offset + size > dlb_max_write_offset)
 		dlb_max_write_offset = log_offset + size;
@@ -1179,10 +1181,12 @@
 			if (dlb_buffer_size >= dlb_buffer_len + size) {
 				memcpy(dlb_log_buffer + dlb_buffer_len, data, size);
 				dlb_buffer_len += size;
+				dlb_data_log->dlf_log_eof += size;
 				return OK;
 			}
 		}
-		dlb_flush_log(FALSE, thread);
+		if (dlb_flush_log(FALSE, thread) != OK)
+			return FAILED;
 	}
 	
 	ASSERT_NS(dlb_buffer_len == 0);
@@ -1191,6 +1195,7 @@
 		dlb_buffer_offset = log_offset;
 		dlb_buffer_len = size;
 		memcpy(dlb_log_buffer, data, size);
+		dlb_data_log->dlf_log_eof += size;
 		return OK;
 	}
 
@@ -1202,6 +1207,7 @@
 		dlb_max_write_offset = log_offset + size;
 #endif
 	dlb_flush_required = TRUE;
+	dlb_data_log->dlf_log_eof += size;
 	return OK;
 }
 
 
=== modified file 'src/datalog_xt.h'
--- src/datalog_xt.h	2008-12-05 13:50:58 +0000
+++ src/datalog_xt.h	2009-07-10 14:01:07 +0000
@@ -93,6 +93,7 @@
 	u_int					dlf_open_count;					/* Number of open log files. */
 	XTOpenLogFilePtr		dlf_free_list;					/* The open file free list. */
 	off_t					dlf_log_eof;
+	//off_t					dlf_last_inc;					/* The size of the last added record */
 	off_t					dlf_start_offset;				/* Start offset for garbage collection. */
 	off_t					dlf_garbage_count;				/* The amount of garbage in the log file. */
 	XTOpenFilePtr			dlf_log_file;					/* The open file handle (if the log is in exclusive use!!). */
 
=== modified file 'src/filesys_xt.cc'
--- src/filesys_xt.cc	2009-07-07 14:27:29 +0000
+++ src/filesys_xt.cc	2009-07-10 14:01:07 +0000
@@ -1356,14 +1356,23 @@
 		}
 		mm->mm_start = NULL;
 #ifdef XT_WIN
-		if (!CloseHandle(mm->mm_mapdes))
+		/* It is possible that a previous remap attempt has failed: the map was closed
+		 * but the new map was not allocated (e.g. because of insufficient disk space). 
+		 * In this case mm->mm_mapdes will be NULL.
+		 */
+		if (mm->mm_mapdes && !CloseHandle(mm->mm_mapdes))
 			return xt_register_ferrno(XT_REG_CONTEXT, fs_get_win_error(), xt_file_path(map));
 		mm->mm_mapdes = NULL;
 #endif
+		off_t old_size = mm->mm_length;
 		mm->mm_length = new_size;
 
-		if (!fs_map_file(mm, map->fr_file, TRUE))
+		if (!fs_map_file(mm, map->fr_file, TRUE)) {
+			/* Try to restore old mapping */
+			mm->mm_length = old_size;
+			fs_map_file(mm, map->fr_file, FALSE);
 			return FAILED;
+		}
 	}
 	return OK;
 	
 
=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc	2009-02-23 22:43:55 +0000
+++ src/ha_pbxt.cc	2009-07-10 14:01:07 +0000
@@ -1144,7 +1144,7 @@
 #ifndef DRIZZLED
 					myxt_mutex_lock(&LOCK_plugin);
 #endif
-					xt_throw(self);
+					xt_throw_error(self, XT_REG_CONTEXT, XT_SYSTEM_ERROR, 0, "Initialization failed"); 
 				}
 				cont_(b);
 
 
=== modified file 'src/pthread_xt.cc'
--- src/pthread_xt.cc	2008-12-18 10:25:11 +0000
+++ src/pthread_xt.cc	2009-07-10 14:01:07 +0000
@@ -348,19 +348,26 @@
 
 int xt_p_join(pthread_t thread, void **value)
 {
-	switch (WaitForSingleObject(thread, INFINITE)) {
-		case WAIT_OBJECT_0: 
-		case WAIT_TIMEOUT:
-			/* Don't do this! According to the Win docs:
-			 * _endthread automatically closes the thread handle 
-			 * (whereas _endthreadex does not). Therefore, when using 
-			 * _beginthread and _endthread, do not explicitly close the 
-			 * thread handle by calling the Win32 CloseHandle API.
-			CloseHandle(thread);
-			 */
-			break;
-		case WAIT_FAILED:
-			return GetLastError();
+	DWORD exitcode;
+
+	while(1) {
+		switch (WaitForSingleObject(thread, 10000)) {
+			case WAIT_OBJECT_0:
+				return 0;
+			case WAIT_TIMEOUT:
+				/* Don't do this! According to the Win docs:
+				 * _endthread automatically closes the thread handle 
+				 * (whereas _endthreadex does not). Therefore, when using 
+				 * _beginthread and _endthread, do not explicitly close the 
+				 * thread handle by calling the Win32 CloseHandle API.
+				CloseHandle(thread);
+				 */
+				if (GetExitCodeThread(thread, &exitcode) && (exitcode == STILL_ACTIVE))
+					break;
+				return 0;
+			case WAIT_FAILED:
+				return GetLastError();
+		}
 	}
 	return 0;
 }
 
=== modified file 'src/restart_xt.cc'
--- src/restart_xt.cc	2009-07-07 14:21:07 +0000
+++ src/restart_xt.cc	2009-07-10 14:01:07 +0000
@@ -1498,7 +1498,9 @@
 		/* I could use tab_ind_rec_log_id, but this may be a problem, if
 		 * recovery does not recover up to the last committed transaction.
 		 */ 
-		check_index = ws->ws_in_recover && xt_comp_log_pos(log_id, log_offset, ws->ws_ind_rec_log_id, ws->ws_ind_rec_log_offset) >= 0;
+		check_index = ws->ws_in_recover 
+			&& xt_comp_log_pos(log_id, log_offset, ws->ws_ind_rec_log_id, ws->ws_ind_rec_log_offset) >= 0 
+			&& tab->tab_dic.dic_key_count;
 		xres_apply_change(self, ws->ws_ot, record, TRUE, check_index, &ws->ws_rec_buf);
 		tab->tab_head_op_seq = op_seq;
 		if (tab->tab_wr_wake_freeer) {
 
=== modified file 'src/strutil_xt.cc'
--- src/strutil_xt.cc	2009-07-07 14:29:30 +0000
+++ src/strutil_xt.cc	2009-07-10 14:01:07 +0000
@@ -367,7 +367,7 @@
 
 xtPublic c_char *xt_get_version(void)
 {
-	return "1.0.07o RC";
+	return "1.0.07p RC";
 }
 
 /* Copy and URL decode! */
 
=== modified file 'src/xactlog_xt.cc'
--- src/xactlog_xt.cc	2009-06-30 11:36:08 +0000
+++ src/xactlog_xt.cc	2009-07-10 14:01:07 +0000
@@ -1046,6 +1046,7 @@
 				/* [(8)] Flush the compactor log. */
 				xt_lock_mutex_ns(&xl_db->db_co_dlog_lock);
 				if (!xl_db->db_co_thread->st_dlog_buf.dlb_flush_log(TRUE, thread)) {
+					xl_log_bytes_written -= part_size;
 					xt_unlock_mutex_ns(&xl_db->db_co_dlog_lock);
 					goto write_failed;
 				}
@@ -1053,8 +1054,10 @@
 			}
 
 			/* And flush if required: */
-			if (!xt_flush_file(xl_log_file, &thread->st_statistics.st_xlog, thread))
+			if (!xt_flush_file(xl_log_file, &thread->st_statistics.st_xlog, thread)) {
+				xl_log_bytes_written -= part_size;
 				goto write_failed;
+			}
 
 			xl_log_bytes_flushed = xl_log_bytes_written;
 
@@ -2398,9 +2401,6 @@
 				if (!record) {
 					break;
 				}
-				/* Count the number of bytes read from the log: */
-				db->db_xlog.xl_log_bytes_read += ws->ws_seqread.xseq_record_len;
-
 				switch (record->xl.xl_status_1) {
 					case XT_LOG_ENT_HEADER:
 						break;
@@ -2424,6 +2424,8 @@
 						xt_xres_apply_in_order(self, ws, ws->ws_seqread.xseq_rec_log_id, ws->ws_seqread.xseq_rec_log_offset, record);
 						break;
 				}
+				/* Count the number of bytes read from the log: */
+				db->db_xlog.xl_log_bytes_read += ws->ws_seqread.xseq_record_len;
 			}
 		}