Merge lp:~vkolesnikov/pbxt/pbxt-index-recovery-problem into lp:pbxt

[Vladimir Kolesnikov]

[Vladimir Kolesnikov (vkolesnikov)]

merged with upstream

=== modified file 'ChangeLog'
--- ChangeLog	2009-06-03 14:53:00 +0000
+++ ChangeLog	2009-06-09 15:06:41 +0000
@@ -3,6 +3,8 @@
 
 ------- 1.0.08 RC - Not yet released
 
+RN244: Fixed a recovery problem: during the recovery of "record modified" action the table was updated before the old index entries were removed; then the xres_remove_index_entries was supplied the new record which lead to incorrect index update
+
 RN243: Fixed a bug that caused a recovery failure if partitioned pbxt tables where present. This happended because the recovery used a MySQL function to open tables and the PBXT handler was not yet registered
 
 RN242: Fixed a bug that caused a deadlock if pbxt initialization failed. This happened because pbxt ceanup was done from pbxt_init() with PLUGIN_lock being held by MySQL which lead to a deadlock in the freeer thread
 
=== modified file 'src/restart_xt.cc'
--- src/restart_xt.cc	2009-06-03 14:07:54 +0000
+++ src/restart_xt.cc	2009-06-09 15:06:41 +0000
@@ -638,6 +638,15 @@
 		case XT_LOG_ENT_INSERT_BG:
 		case XT_LOG_ENT_DELETE_BG:
 			rec_id = XT_GET_DISK_4(record->xu.xu_rec_id_4);
+
+			/* This should be done before we apply change to table, as otherwise we lose
+			 * the key value that we need to remove from index
+			 */
+			if (record->xl.xl_status_1 == XT_LOG_ENT_REC_MODIFIED) {
+				if ((rec_data = xres_load_record(self, ot, rec_id, NULL, 0, rec_buf, tab->tab_dic.dic_ind_cols_req)))
+					xres_remove_index_entries(ot, rec_id, rec_data);			
+			}
+
 			len = (size_t) XT_GET_DISK_2(record->xu.xu_size_2);
 			if (!XT_PWRITE_RR_FILE(ot->ot_rec_file, xt_rec_id_to_rec_offset(tab, rec_id), len, (xtWord1 *) &record->xu.xu_rec_type_1, &ot->ot_thread->st_statistics.st_rec, ot->ot_thread))
 				xt_throw(self);
@@ -648,10 +657,6 @@
 					case XT_LOG_ENT_DELETE:
 					case XT_LOG_ENT_DELETE_BG:
 						break;
-					case XT_LOG_ENT_REC_MODIFIED:
-						if ((rec_data = xres_load_record(self, ot, rec_id, NULL, 0, rec_buf, tab->tab_dic.dic_ind_cols_req)))
-							xres_remove_index_entries(ot, rec_id, rec_data);
-						/* No break required: */
 					default:
 						if ((rec_data = xres_load_record(self, ot, rec_id, &record->xu.xu_rec_type_1, len, rec_buf, tab->tab_dic.dic_ind_cols_req))) {
 							row_id = XT_GET_DISK_4(record->xu.xu_row_id_4);
@@ -3197,13 +3202,13 @@
 
 static void *xn_xres_run_recovery_thread(XTThreadPtr self)
 {
-	THD *mysql_thread;
-
-	mysql_thread = (THD *)myxt_create_thread();
-
-	while(!ha_resolve_by_legacy_type(mysql_thread, DB_TYPE_PBXT))
-		xt_sleep_milli_second(1);
-
+	THD *mysql_thread;
+
+	mysql_thread = (THD *)myxt_create_thread();
+
+	while(!ha_resolve_by_legacy_type(mysql_thread, DB_TYPE_PBXT))
+		xt_sleep_milli_second(1);
+
 	xt_open_database(self, mysql_real_data_home, TRUE);
 	pbxt_database = self->st_database;
 	xt_heap_reference(self, pbxt_database);