Merge serg:/usr/home/serg/Abk/mysql-4.0

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0

3 files changed, 78 insertions, 41 deletions

diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 3c1d090f53d..f27f297b3a4 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/* Descript, check and repair of MyISAM tables */
+/* Describe, check and repair of MyISAM tables */
 
 #include "ftdefs.h"
 #include <m_ctype.h>
@@ -1187,6 +1187,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
     my_seek(info->dfile,0L,MY_SEEK_END,MYF(0));
   sort_info.dupp=0;
   sort_param.fix_datafile= (my_bool) (! rep_quick);
+  sort_param.master=1;
   sort_info.max_records= ~(ha_rows) 0;
 
   set_data_file_type(&sort_info, share);
@@ -1888,6 +1889,7 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
   sort_param.tmpdir=param->tmpdir;
   sort_param.sort_info=&sort_info;
   sort_param.fix_datafile= (my_bool) (! rep_quick);
+  sort_param.master =1;
 
   del=info->state->del;
   param->glob_crc=0;
@@ -2107,13 +2109,14 @@ err:
   DESCRIPTION
     Same as mi_repair_by_sort but do it multithreaded
     Each key is handled by a separate thread.
+    TODO: make a number of thread a parameter
 
   RESULT
     0	ok
     <>0	Error
 */
 
-int mi_repair_by_sort_r(MI_CHECK *param, register MI_INFO *info,
+int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
 			const char * name, int rep_quick)
 {
   int got_error;
@@ -2131,7 +2134,7 @@ int mi_repair_by_sort_r(MI_CHECK *param, register MI_INFO *info,
   SORT_INFO sort_info;
   ulonglong key_map=share->state.key_map;
   pthread_attr_t thr_attr;
-  DBUG_ENTER("mi_repair_by_sort_r");
+  DBUG_ENTER("mi_repair_parallel");
 
   start_records=info->state->records;
   got_error=1;
@@ -2267,6 +2270,8 @@ int mi_repair_by_sort_r(MI_CHECK *param, register MI_INFO *info,
       i--;
       continue;
     }
+    if ((!(param->testflag & T_SILENT)))
+      printf ("- Fixing index %d\n",key+1);
     sort_param[i].key_read= ((sort_param[i].keyinfo->flag & HA_FULLTEXT) ?
 			     sort_ft_key_read : sort_key_read);
     sort_param[i].key_cmp=sort_key_cmp;
@@ -2274,6 +2279,7 @@ int mi_repair_by_sort_r(MI_CHECK *param, register MI_INFO *info,
     sort_param[i].lock_in_memory=lock_memory;
     sort_param[i].tmpdir=param->tmpdir;
     sort_param[i].sort_info=&sort_info;
+    sort_param[i].master=0;
     sort_param[i].fix_datafile=0;
 
     sort_param[i].filepos=new_header_length;
@@ -2300,7 +2306,8 @@ int mi_repair_by_sort_r(MI_CHECK *param, register MI_INFO *info,
       sort_param[i].key_length+=ft_max_word_len_for_sort-ft_max_word_len;
   }
   sort_info.total_keys=i;
-  sort_param[0].fix_datafile= ! rep_quick;
+  sort_param[0].master= 1;
+  sort_param[0].fix_datafile= (my_bool)(! rep_quick);
 
   sort_info.got_error=0;
   pthread_mutex_init(&sort_info.mutex, MY_MUTEX_INIT_FAST);
@@ -2321,10 +2328,10 @@ int mi_repair_by_sort_r(MI_CHECK *param, register MI_INFO *info,
         In the second one all the threads will fill their sort_buffers
         (and call write_keys) at the same time, putting more stress on i/o.
       */
-#if 1
+#ifndef USING_SECOND_APPROACH
       param->sort_buffer_length/sort_info.total_keys;
 #else
-    param->sort_buffer_length*sort_param[i].key_length/total_key_length;
+      param->sort_buffer_length*sort_param[i].key_length/total_key_length;
 #endif
     if (pthread_create(&sort_param[i].thr, &thr_attr,
 		       thr_find_all_keys,
@@ -2488,7 +2495,8 @@ static int sort_key_read(MI_SORT_PARAM *sort_param, void *key)
   if (info->state->records == sort_info->max_records)
   {
     mi_check_print_error(sort_info->param,
-			 "Found too many records; Can`t continue");
+			 "Key %d - Found too many records; Can't continue",
+                         sort_param->key+1);
     DBUG_RETURN(1);
   }
   sort_param->real_key_length=
@@ -2578,7 +2586,8 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
       if (!sort_param->fix_datafile)
       {
 	sort_param->filepos=sort_param->pos;
-	share->state.split++;
+        if (sort_param->master)
+	  share->state.split++;
       }
       sort_param->max_pos=(sort_param->pos+=share->base.pack_reclength);
       if (*sort_param->record)
@@ -2588,7 +2597,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
 			     mi_static_checksum(info,sort_param->record));
 	DBUG_RETURN(0);
       }
-      if (!sort_param->fix_datafile)
+      if (!sort_param->fix_datafile && sort_param->master)
       {
 	info->state->del++;
 	info->state->empty+=share->base.pack_reclength;
@@ -2734,7 +2743,8 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
 	}
 	if (b_type & (BLOCK_DELETED | BLOCK_SYNC_ERROR))
 	{
-	  if (!sort_param->fix_datafile && (b_type & BLOCK_DELETED))
+          if (!sort_param->fix_datafile && sort_param->master &&
+              (b_type & BLOCK_DELETED))
 	  {
 	    info->state->empty+=block_info.block_len;
 	    info->state->del++;
@@ -2753,7 +2763,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
 	  continue;
 	}
 
-	if (!sort_param->fix_datafile)
+	if (!sort_param->fix_datafile && sort_param->master)
 	  share->state.split++;
 	if (! found_record++)
 	{
@@ -2895,7 +2905,8 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
       if (!sort_param->fix_datafile)
       {
 	sort_param->filepos=sort_param->pos;
-	share->state.split++;
+        if (sort_param->master)
+	  share->state.split++;
       }
       sort_param->max_pos=(sort_param->pos=block_info.filepos+
 			 block_info.rec_len);
@@ -3003,12 +3014,15 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
       break;
     }
   }
-  info->state->records++;
-  if ((param->testflag & T_WRITE_LOOP) &&
-      (info->state->records % WRITE_COUNT) == 0)
+  if (sort_param->master)
   {
-    char llbuff[22];
-    printf("%s\r", llstr(info->state->records,llbuff)); VOID(fflush(stdout));
+    info->state->records++;
+    if ((param->testflag & T_WRITE_LOOP) &&
+        (info->state->records % WRITE_COUNT) == 0)
+    {
+      char llbuff[22];
+      printf("%s\r", llstr(info->state->records,llbuff)); VOID(fflush(stdout));
+    }
   }
   DBUG_RETURN(0);
 } /* sort_write_record */
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index 3432bdafd0e..0ac089bd261 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -194,6 +194,9 @@ static struct my_option my_long_options[] =
   {"force", 'f',
    "Restart with -r if there are any errors in the table. States will be updated as with --update-state.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"HELP", 'H',
+   "Display this help and exit.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"help", '?',
    "Display this help and exit.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -216,9 +219,15 @@ static struct my_option my_long_options[] =
   {"recover", 'r',
    "Can fix almost anything except unique keys that aren't unique.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"paraller-recover", 'p',
+   "Same as '-r' but creates all the keys in parallel",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"safe-recover", 'o',
    "Uses old recovery method; Slower than '-r' but can handle a couple of cases where '-r' reports that it can't fix the data file.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"sort-recover", 'n',
+   "Force recovering with sorting even if the temporary file was very big.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"start-check-pos", OPT_START_CHECK_POS,
    "No help available.",
    0, 0, 0, GET_ULL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -244,9 +253,6 @@ static struct my_option my_long_options[] =
    (gptr*) &check_param.opt_sort_key,
    (gptr*) &check_param.opt_sort_key,
    0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"sort-recover", 'n',
-   "Force recovering with sorting even if the temporary file was very big.",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"tmpdir", 't',
    "Path for temporary files.",
    (gptr*) &check_param.tmpdir,
@@ -514,6 +520,11 @@ get_one_option(int optid,
     if (argument != disabled_my_option)
       check_param.testflag|= T_REP_BY_SORT;
     break;
+  case 'p':
+    check_param.testflag&= ~T_REP_ANY;
+    if (argument != disabled_my_option)
+      check_param.testflag|= T_REP_PARALLEL;
+    break;
   case 'o':
     check_param.testflag&= ~T_REP_ANY;
     check_param.force_sort= 0;
@@ -616,6 +627,9 @@ get_one_option(int optid,
     check_param.start_check_pos= strtoull(argument, NULL, 0);
     break;
 #endif
+  case 'H':
+    my_print_help(my_long_options);
+    exit(0);
   case '?':
     usage();
     exit(0);
@@ -864,8 +878,7 @@ static int myisamchk(MI_CHECK *param, my_string filename)
 	if (tmp != share->state.key_map)
 	  info->update|=HA_STATE_CHANGED;
       }
-      if (rep_quick && chk_del(param, info,
-			       param->testflag & ~T_VERBOSE))
+      if (rep_quick && chk_del(param, info, param->testflag & ~T_VERBOSE))
       {
 	if (param->testflag & T_FORCE_CREATE)
 	{
@@ -881,14 +894,17 @@ static int myisamchk(MI_CHECK *param, my_string filename)
       }
       if (!error)
       {
-	if ((param->testflag & T_REP_BY_SORT) &&
+	if ((param->testflag & (T_REP_BY_SORT | T_REP_PARALLEL)) &&
 	    (share->state.key_map ||
 	     (rep_quick && !param->keys_in_use && !recreate)) &&
 	    mi_test_if_sort_rep(info, info->state->records,
 				info->s->state.key_map,
 				param->force_sort))
 	{
-	  error=mi_repair_by_sort(param,info,filename,rep_quick);
+          if (param->testflag & T_REP_BY_SORT)
+            error=mi_repair_by_sort(param,info,filename,rep_quick);
+          else
+            error=mi_repair_parallel(param,info,filename,rep_quick);
 	  state_updated=1;
 	}
 	else if (param->testflag & T_REP_ANY)
diff --git a/myisam/sort.c b/myisam/sort.c
index e0851b062e1..66cf7297c3f 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -284,21 +284,25 @@ pthread_handler_decl(thr_find_all_keys,arg)
   uint memavl,old_memavl,keys,sort_length;
   uint idx, maxbuffer;
   uchar **sort_keys;
+  
+  error=1;
+
+  if (my_thread_init())
+    goto err;
+  if (info->sort_info->got_error)
+    goto err;
 
   my_b_clear(&info->tempfile);
   my_b_clear(&info->tempfile_for_exceptions);
   bzero((char*) &info->buffpek,sizeof(info->buffpek));
   bzero((char*) &info->unique, sizeof(info->unique));
   sort_keys= (uchar **) NULL;
-  error= 1;
-  if (info->sort_info->got_error)
-    goto err;
 
   memavl=max(info->sortbuff_size, MIN_SORT_MEMORY);
   idx=      info->sort_info->max_records;
   sort_length=  info->key_length;
+  maxbuffer= 1;
 
-  maxbuffer=1;
   while (memavl >= MIN_SORT_MEMORY)
   {
     if ((my_off_t) (idx+1)*(sort_length+sizeof(char*)) <=
@@ -340,6 +344,7 @@ pthread_handler_decl(thr_find_all_keys,arg)
     mi_check_print_error(info->sort_info->param,"Sort buffer to small"); /* purecov: tested */
     goto err; /* purecov: tested */
   }
+//  (*info->lock_in_memory)(info->sort_info->param);/* Everything is allocated */
 
   if (info->sort_info->param->testflag & T_VERBOSE)
     printf("Key %d - Allocating buffer for %d keys\n",info->key+1,keys);
@@ -348,8 +353,8 @@ pthread_handler_decl(thr_find_all_keys,arg)
   idx=error=0;
   sort_keys[0]=(uchar*) (sort_keys+keys);
 
-  while (!(error=info->sort_info->got_error) ||
-	 !(error=(*info->key_read)(info,sort_keys[idx])))
+  while (!(error=info->sort_info->got_error) &&
+         !(error=(*info->key_read)(info,sort_keys[idx])))
   {
     if (info->real_key_length > info->key_length)
     {
@@ -364,7 +369,6 @@ pthread_handler_decl(thr_find_all_keys,arg)
 		     (BUFFPEK *)alloc_dynamic(&info->buffpek),
 		     &info->tempfile))
         goto err;
-
       sort_keys[0]=(uchar*) (sort_keys+keys);
       memcpy(sort_keys[0],sort_keys[idx-1],(size_t) info->key_length);
       idx=1;
@@ -401,6 +405,7 @@ ok:
   info->sort_info->threads_running--;
   pthread_cond_signal(&info->sort_info->cond);
   pthread_mutex_unlock(&info->sort_info->mutex);
+  my_thread_end();
   return NULL;
 }
 
@@ -414,14 +419,14 @@ int thr_write_keys(MI_SORT_PARAM *sort_param)
   int got_error=sort_info->got_error;
   uint i;
   MI_INFO *info=sort_info->info;
-  MYISAM_SHARE *share=info->s;  
+  MYISAM_SHARE *share=info->s;
   MI_SORT_PARAM *sinfo;
   byte *mergebuf=0;
   LINT_INIT(length);
 
-  for (i=0, sinfo=sort_param ;
-       i < sort_info->total_keys ;
-       i++, sinfo++, rec_per_key_part+=sinfo->keyinfo->keysegs)
+  for (i=0, sinfo=sort_param ; i<sort_info->total_keys ; i++,
+                               rec_per_key_part+=sinfo->keyinfo->keysegs,
+                                                                 sinfo++)
   {
     if (!sinfo->sort_keys)
     {
@@ -447,11 +452,11 @@ int thr_write_keys(MI_SORT_PARAM *sort_param)
     sinfo->sort_keys=0;
   }
 
-  for (i=0, sinfo=sort_param ;
-       i < sort_info->total_keys ;
-       i++, sinfo++, delete_dynamic(&sinfo->buffpek),
-	 close_cached_file(&sinfo->tempfile),
-	 close_cached_file(&sinfo->tempfile_for_exceptions))
+  for (i=0, sinfo=sort_param ; i<sort_info->total_keys ; i++,
+                                      delete_dynamic(&sinfo->buffpek),
+                                  close_cached_file(&sinfo->tempfile),
+                   close_cached_file(&sinfo->tempfile_for_exceptions),
+                                                              sinfo++)
   {
     if (got_error)
       continue;
@@ -552,8 +557,10 @@ static int NEAR_F write_keys(MI_SORT_PARAM *info, register uchar **sort_keys,
   buffpek->count=count;
 
   for (end=sort_keys+count ; sort_keys != end ; sort_keys++)
+  {
     if (my_b_write(tempfile,(byte*) *sort_keys,(uint) sort_length))
       DBUG_RETURN(1); /* purecov: inspected */
+  }
   DBUG_RETURN(0);
 } /* write_keys */
 
@@ -576,7 +583,7 @@ static int NEAR_F write_key(MI_SORT_PARAM *info, uchar *key,
 } /* write_key */
 
 
-        /* Write index */
+/* Write index */
 
 static int NEAR_F write_index(MI_SORT_PARAM *info, register uchar **sort_keys,
                               register uint count)