From: Mattias Jonsson
Date: July 9 2010 1:02pm
Subject: bzr push into mysql-5.1-bugteam branch (mattias.jonsson:3474 to 3476)
List-Archive: http://lists.mysql.com/commits/113256
Message-Id: <201007091302.o69CnWKC004336@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8476507157092014768=="

--===============8476507157092014768==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3476 Mattias Jonsson	2010-07-09 [merge]
      merge

    modified:
      sql/ha_partition.h
      sql/handler.h
 3475 Mattias Jonsson	2010-07-09 [merge]
      merge

    modified:
      sql/ha_partition.cc
      sql/ha_partition.h
 3474 Davi Arnaut	2010-07-09
      Remove AC_LANG_WERROR, it causes trouble earlier versions
      of autoconf and is not strictly needed for now.

    modified:
      config/ac-macros/maintainer.m4
=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2010-05-25 13:41:00 +0000
+++ b/sql/ha_partition.cc	2010-07-08 23:09:31 +0000
@@ -4220,6 +4220,58 @@ int ha_partition::index_read_last_map(uc
 
 
 /*
+  Optimization of the default implementation to take advantage of dynamic
+  partition pruning.
+*/
+int ha_partition::index_read_idx_map(uchar *buf, uint index,
+                                     const uchar *key,
+                                     key_part_map keypart_map,
+                                     enum ha_rkey_function find_flag)
+{
+  int error= HA_ERR_KEY_NOT_FOUND;
+  DBUG_ENTER("ha_partition::index_read_idx_map");
+
+  if (find_flag == HA_READ_KEY_EXACT)
+  {
+    uint part;
+    m_start_key.key= key;
+    m_start_key.keypart_map= keypart_map;
+    m_start_key.flag= find_flag;
+    m_start_key.length= calculate_key_len(table, index, m_start_key.key,
+                                          m_start_key.keypart_map);
+
+    get_partition_set(table, buf, index, &m_start_key, &m_part_spec);
+
+    /* How can it be more than one partition with the current use? */
+    DBUG_ASSERT(m_part_spec.start_part == m_part_spec.end_part);
+
+    for (part= m_part_spec.start_part; part <= m_part_spec.end_part; part++)
+    {
+      if (bitmap_is_set(&(m_part_info->used_partitions), part))
+      {
+        error= m_file[part]->index_read_idx_map(buf, index, key,
+                                                keypart_map, find_flag);
+        if (error != HA_ERR_KEY_NOT_FOUND &&
+            error != HA_ERR_END_OF_FILE)
+          break;
+      }
+    }
+  }
+  else
+  {
+    /*
+      If not only used with READ_EXACT, we should investigate if possible
+      to optimize for other find_flag's as well.
+    */
+    DBUG_ASSERT(0);
+    /* fall back on the default implementation */
+    error= handler::index_read_idx_map(buf, index, key, keypart_map, find_flag);
+  }
+  DBUG_RETURN(error);
+}
+
+
+/*
   Read next record in a forward index scan
 
   SYNOPSIS

=== modified file 'sql/ha_partition.h'
--- a/sql/ha_partition.h	2009-11-17 19:02:16 +0000
+++ b/sql/ha_partition.h	2010-07-09 13:00:33 +0000
@@ -53,8 +53,7 @@ typedef struct st_ha_data_partition
                                         HA_CAN_FULLTEXT | \
                                         HA_DUPLICATE_POS | \
                                         HA_CAN_SQL_HANDLER | \
-                                        HA_CAN_INSERT_DELAYED | \
-                                        HA_PRIMARY_KEY_REQUIRED_FOR_POSITION)
+                                        HA_CAN_INSERT_DELAYED)
 class ha_partition :public handler
 {
 private:
@@ -448,6 +447,15 @@ public:
   virtual int index_init(uint idx, bool sorted);
   virtual int index_end();
 
+  /**
+    @breif
+    Positions an index cursor to the index specified in the hanlde. Fetches the
+    row if available. If the key value is null, begin at first key of the
+    index.
+  */
+  virtual int index_read_idx_map(uchar *buf, uint index, const uchar *key,
+                                 key_part_map keypart_map,
+                                 enum ha_rkey_function find_flag);
   /*
     These methods are used to jump to next or previous entry in the index
     scan. There are also methods to jump to first and last entry.
@@ -766,9 +774,6 @@ public:
 
     HA_PRIMARY_KEY_REQUIRED_FOR_POSITION:
     Does the storage engine need a PK for position?
-    Used with hidden primary key in InnoDB.
-    Hidden primary keys cannot be supported by partitioning, since the
-    partitioning expressions columns must be a part of the primary key.
     (InnoDB)
 
     HA_FILE_BASED is always set for partition handler since we use a

=== modified file 'sql/handler.h'
--- a/sql/handler.h	2010-06-10 20:45:22 +0000
+++ b/sql/handler.h	2010-07-09 13:00:33 +0000
@@ -93,7 +93,10 @@
 #define HA_PRIMARY_KEY_IN_READ_INDEX (1 << 15)
 /*
   If HA_PRIMARY_KEY_REQUIRED_FOR_POSITION is set, it means that to position()
-  uses a primary key. Without primary key, we can't call position().
+  uses a primary key given by the record argument.
+  Without primary key, we can't call position().
+  If not set, the position is returned as the current rows position
+  regardless of what argument is given.
 */ 
 #define HA_PRIMARY_KEY_REQUIRED_FOR_POSITION (1 << 16) 
 #define HA_CAN_RTREEKEYS       (1 << 17)
@@ -1446,10 +1449,9 @@ public:
   virtual int rnd_next(uchar *buf)=0;
   virtual int rnd_pos(uchar * buf, uchar *pos)=0;
   /**
-    One has to use this method when to find
-    random position by record as the plain
-    position() call doesn't work for some
-    handlers for random position.
+    This function only works for handlers having
+    HA_PRIMARY_KEY_REQUIRED_FOR_POSITION set.
+    It will return the row with the PK given in the record argument.
   */
   virtual int rnd_pos_by_record(uchar *record)
     {
@@ -1467,6 +1469,12 @@ public:
     { return HA_ERR_WRONG_COMMAND; }
   virtual ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key)
     { return (ha_rows) 10; }
+  /*
+    If HA_PRIMARY_KEY_REQUIRED_FOR_POSITION is set, then it sets ref
+    (reference to the row, aka position, with the primary key given in
+    the record).
+    Otherwise it set ref to the current row.
+  */
   virtual void position(const uchar *record)=0;
   virtual int info(uint)=0; // see my_base.h for full description
   virtual void get_dynamic_partition_info(PARTITION_INFO *stat_info,


--===============8476507157092014768==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   fgr7hggrrebf6qkc
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/
# testament_sha1: fa496db866470ab6cea0aa596f396b3b19be8a41
# timestamp: 2010-07-09 15:02:45 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/b49161-51-bugteam/
# base_revision_id: davi.arnaut@stripped\
#   875eay5x9exlzpk5
# 
# Begin bundle
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
/4u5IpwoSCboJeSA


--===============8476507157092014768==--