#526 use map methods at index scanning

mroonga · Oct 12, 2010 · 72d9ed5 · 72d9ed5
1 parent 0f2a10f
commit 72d9ed5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -1213,10 +1213,12 @@ ha_rows ha_mroonga::records_in_range(uint keynr, key_range *range_min, key_range
   DBUG_RETURN(row_count);
 }
 
-int ha_mroonga::index_read(uchar * record_buffer, const uchar * key, uint key_len,
-                           enum ha_rkey_function find_flag)
+int ha_mroonga::index_read_map(uchar * record_buffer, const uchar * key,
+                               key_part_map keypart_map,
+                               enum ha_rkey_function find_flag)
 {
-  DBUG_ENTER("ha_mroonga::index_read");
+  DBUG_ENTER("ha_mroonga::index_read_map");
+  uint key_len = calculate_key_len(table, active_index, key, keypart_map);
   uint keynr = active_index;
   uint pkeynr = table->s->primary_key;
   KEY key_info = table->key_info[keynr];
@@ -1229,16 +1231,10 @@ int ha_mroonga::index_read(uchar * record_buffer, const uchar * key, uint key_le
   DBUG_RETURN(0);
 }
 
-int ha_mroonga::index_read_idx(uchar * buf, uint index, const uchar * key,
-                               uint key_len, enum ha_rkey_function find_flag)
+int ha_mroonga::index_read_last_map(uchar *buf, const uchar *key,
+                                    key_part_map keypart_map)
 {
-  DBUG_ENTER("ha_mroonga::index_read_idx");
-  DBUG_RETURN(0);
-}
-
-int ha_mroonga::index_read_last(uchar *buf, const uchar *key, uint key_len)
-{
-  DBUG_ENTER("ha_mroonga::index_read_last");
+  DBUG_ENTER("ha_mroonga::index_read_last_map");
   DBUG_RETURN(0);
 }
 

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -96,11 +96,11 @@ class ha_mroonga: public handler
   uint max_supported_key_length()    const { return MAX_KEY_LENGTH; }
 
   ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key);
-  int index_read(uchar * buf, const uchar * key,
-                 uint key_len, enum ha_rkey_function find_flag);
-  int index_read_idx(uchar * buf, uint index, const uchar * key,
-                     uint key_len, enum ha_rkey_function find_flag);
-  int index_read_last(uchar * buf, const uchar * key, uint key_len);
+  int index_read_map(uchar * record_buffer, const uchar * key,
+                     key_part_map keypart_map,
+                     enum ha_rkey_function find_flag);
+  int index_read_last_map(uchar *buf, const uchar *key,
+                          key_part_map keypart_map);
   int index_next(uchar * buf);
   int index_prev(uchar * buf);
   int index_first(uchar * buf);