Commit 4e8b49d6 authored by unknown's avatar unknown
Browse files

WL#3700: Handler API change: all index search methods - that is, 

index_read(), index_read_idx(), index_read_last(), and
records_in_range() - instead of 'uint keylen' argument take
'ulonglong keypart_map', a bitmap showing which keyparts are
present in the key value.
Fallback method is provided for handlers that are lagging behind.
parent 6e1ba884

include/heap.h

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ ha_rows hp_rb_records_in_range(HP_INFO *info, int inx, key_range *min_key, 
                               key_range *max_key);

int hp_panic(enum ha_panic_function flag);

int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key, 

              uint key_len, enum ha_rkey_function find_flag);

              ulonglong keypart_map, enum ha_rkey_function find_flag);

extern gptr heap_find(HP_INFO *info,int inx,const byte *key);

extern int heap_check_heap(HP_INFO *info, my_bool print_status);

extern byte *heap_position(HP_INFO *info);

include/my_base.h

+5 −3
Original line number Diff line number Diff line
@@ -384,9 +384,10 @@ enum ha_base_keytype { 
#define HA_ERR_TABLE_NEEDS_UPGRADE 164  /* The table changed in storage engine */

#define HA_ERR_TABLE_READONLY    165  /* The table is not writable */



#define HA_ERR_AUTOINC_READ_FAILED 166/* Failed to get the next autoinc value */

#define HA_ERR_AUTOINC_ERANGE    167  /* Failed to set the row autoinc value */

#define HA_ERR_LAST              167  /*Copy last error nr.*/

#define HA_ERR_AUTOINC_READ_FAILED 166   /* Failed to get next autoinc value */

#define HA_ERR_AUTOINC_ERANGE    167     /* Failed to set row autoinc value */

#define HA_ERR_GENERIC           168     /* Generic error */

#define HA_ERR_LAST              168 /*Copy last error nr.*/

/* Add error numbers before HA_ERR_LAST and change it accordingly. */

#define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
@@ -467,6 +468,7 @@ typedef struct st_key_range 
{

  const byte *key;

  uint length;

  ulonglong keypart_map;

  enum ha_rkey_function flag;

} key_range;

include/myisam.h

+3 −4
Original line number Diff line number Diff line
@@ -274,9 +274,8 @@ extern struct st_myisam_info *mi_open(const char *name,int mode, 
				      uint wait_if_locked);

extern int mi_panic(enum ha_panic_function function);

extern int mi_rfirst(struct st_myisam_info *file,byte *buf,int inx);

extern int mi_rkey(struct st_myisam_info *file,byte *buf,int inx,

		   const byte *key,

		   uint key_len, enum ha_rkey_function search_flag);

extern int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key,

            ulonglong keypart_map, enum ha_rkey_function search_flag);

extern int mi_rlast(struct st_myisam_info *file,byte *buf,int inx);

extern int mi_rnext(struct st_myisam_info *file,byte *buf,int inx);

extern int mi_rnext_same(struct st_myisam_info *info, byte *buf);
@@ -303,7 +302,7 @@ extern int mi_extra(struct st_myisam_info *file, 
		    enum ha_extra_function function,

		    void *extra_arg);

extern int mi_reset(struct st_myisam_info *file);

extern ha_rows mi_records_in_range(struct st_myisam_info *info,int inx,

extern ha_rows mi_records_in_range(MI_INFO *info, int inx,

                                   key_range *min_key, key_range *max_key);

extern int mi_log(int activate_log);

extern int mi_is_changed(struct st_myisam_info *info);

include/myisammrg.h

+3 −3
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ extern int myrg_rlast(MYRG_INFO *file,byte *buf,int inx); 
extern int myrg_rnext(MYRG_INFO *file,byte *buf,int inx);

extern int myrg_rprev(MYRG_INFO *file,byte *buf,int inx);

extern int myrg_rnext_same(MYRG_INFO *file,byte *buf);

extern int myrg_rkey(MYRG_INFO *file,byte *buf,int inx,const byte *key,

		       uint key_len, enum ha_rkey_function search_flag);

extern int myrg_rkey(MYRG_INFO *info,byte *buf,int inx, const byte *key,

                     ulonglong keypart_map, enum ha_rkey_function search_flag);

extern int myrg_rrnd(MYRG_INFO *file,byte *buf,ulonglong pos);

extern int myrg_rsame(MYRG_INFO *file,byte *record,int inx);

extern int myrg_update(MYRG_INFO *file,const byte *old,byte *new_rec);

sql/event_db_repository.cc

+2 −4
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ Event_db_repository::index_read_for_db_for_i_s(THD *thd, TABLE *schema_table, 
  {

    key_copy(key_buf, event_table->record[0], key_info, key_len);

    if (!(ret= event_table->file->index_read(event_table->record[0], key_buf,

                                             key_len, HA_READ_PREFIX)))

                                             (ulonglong)1, HA_READ_PREFIX)))

    {

      DBUG_PRINT("info",("Found rows. Let's retrieve them. ret=%d", ret));

      do
@@ -518,7 +518,6 @@ Event_db_repository::create_event(THD *thd, Event_parse_data *parse_data, 
                                  my_bool create_if_not)

{

  int ret= 0;

  CHARSET_INFO *scs= system_charset_info;

  TABLE *table= NULL;

  char old_db_buf[NAME_LEN+1];

  LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };
@@ -844,8 +843,7 @@ Event_db_repository::find_named_event(THD *thd, LEX_STRING db, LEX_STRING name, 


  key_copy(key, table->record[0], table->key_info, table->key_info->key_length);



  if (table->file->index_read_idx(table->record[0], 0, key,

                                  table->key_info->key_length,

  if (table->file->index_read_idx(table->record[0], 0, key, ~ULL(0),

                                  HA_READ_KEY_EXACT))

  {

    DBUG_PRINT("info", ("Row not found"));