Merge lp:~stewart/drizzle/misc-cleanups into lp:drizzle

[Stewart Smith]

a bunch of misc cleanups, even getting rid of the legacy structs.h

[Stewart Smith (stewart)]

Approved by Brian over mail.

review: Approve

[lp:~stewart/drizzle/misc-cleanups]

2637. By Stewart Smith on 2013-03-07

fix a condition in ha_myisam::doOpen() that was relying on message::Table::STANDARD being 0 and non-standard tables being non-zero. At least let's not rely on message::Table::STANDARD being 0.

=== modified file 'drizzled/base.h'
--- drizzled/base.h	2011-03-17 06:15:56 +0000
+++ drizzled/base.h	2013-03-07 01:36:23 +0000
@@ -78,14 +78,6 @@
   HA_READ_MBR_EQUAL
 };
 
-	/* Key algorithm types */
-
-enum ha_key_alg {
-  HA_KEY_ALG_UNDEF=	0,		/* Not specified (old file) */
-  HA_KEY_ALG_BTREE=	1,		/* B-tree, default one          */
-  HA_KEY_ALG_HASH=	3		/* HASH keys (HEAP tables) */
-};
-
 	/* The following is parameter to ha_extra() */
 
 enum ha_extra_function {

=== modified file 'drizzled/cursor.cc'
--- drizzled/cursor.cc	2013-02-21 22:31:46 +0000
+++ drizzled/cursor.cc	2013-03-07 01:36:23 +0000
@@ -48,6 +48,7 @@
 #include <drizzled/statistics_variables.h>
 #include <drizzled/system_variables.h>
 #include "drizzled/probes.h"
+#include <drizzled/key_part_info.h>
 
 using namespace std;
 

=== modified file 'drizzled/cursor.h'
--- drizzled/cursor.h	2011-08-08 12:51:19 +0000
+++ drizzled/cursor.h	2013-03-07 01:36:23 +0000
@@ -38,6 +38,8 @@
 
 namespace drizzled {
 
+class KeyPartInfo;
+
 #define HA_MAX_ALTER_FLAGS 40
 
 typedef std::bitset<HA_MAX_ALTER_FLAGS> HA_ALTER_FLAGS;
@@ -603,8 +605,6 @@
   virtual void drop_table();
 };
 
-extern const char *ha_row_type[];
-
 /* basic stuff */
 void ha_init_errors(void);
 

=== modified file 'drizzled/field.h'
--- drizzled/field.h	2011-10-24 15:58:22 +0000
+++ drizzled/field.h	2013-03-07 01:36:23 +0000
@@ -31,9 +31,9 @@
 #include <drizzled/type/decimal.h>
 #include <drizzled/key_map.h>
 #include <drizzled/sql_list.h>
-#include <drizzled/structs.h>
 #include <drizzled/charset.h>
 #include <drizzled/item_result.h>
+#include <drizzled/base.h>
 
 #include <string>
 #include <vector>

=== modified file 'drizzled/ha_commands.cc'
--- drizzled/ha_commands.cc	2012-02-12 06:45:37 +0000
+++ drizzled/ha_commands.cc	2013-03-07 01:36:23 +0000
@@ -44,11 +44,6 @@
 
 KEY_CREATE_INFO default_key_create_info;
 
-const char *ha_row_type[] = 
-{
-  "", "FIXED", "DYNAMIC", "COMPRESSED", "REDUNDANT", "COMPACT", "PAGE", "?","?","?"
-};
-
 /**
   Register Cursor error messages for use with my_error().
 */

=== modified file 'drizzled/handler_structs.h'
--- drizzled/handler_structs.h	2011-10-10 09:27:50 +0000
+++ drizzled/handler_structs.h	2013-03-07 01:36:23 +0000
@@ -30,10 +30,11 @@
 # endif
 #endif
 
+#include <drizzled/common_fwd.h>
 #include <drizzled/base.h>
 #include <drizzled/definitions.h>
-#include <drizzled/structs.h>
 #include <drizzled/util/data_ref.h>
+#include <drizzled/message/table.h>
 
 namespace drizzled {
 
@@ -85,12 +86,12 @@
 struct KEY_CREATE_INFO
 {
   KEY_CREATE_INFO() :
-    algorithm(HA_KEY_ALG_UNDEF),
+    algorithm(drizzled::message::Table::Index::UNKNOWN_INDEX),
     block_size(0)
   {
   }
 
-  ha_key_alg algorithm;
+  drizzled::message::Table::Index::IndexType algorithm;
   uint32_t block_size;
   str_ref comment;
 };

=== modified file 'drizzled/include.am'
--- drizzled/include.am	2013-02-27 03:47:10 +0000
+++ drizzled/include.am	2013-03-07 01:36:23 +0000
@@ -288,7 +288,9 @@
 			      drizzled/join_cache.h \
 			      drizzled/join_table.h \
 			      drizzled/key.h \
+			      drizzled/key_info.h \
 			      drizzled/key_map.h \
+			      drizzled/key_part_info.h \
 			      drizzled/key_part_spec.h \
 			      drizzled/kill.h \
 			      drizzled/korr.h \
@@ -476,7 +478,6 @@
 			      drizzled/statistics_variables.h \
 			      drizzled/status_helper.h \
 			      drizzled/stored_key.h \
-			      drizzled/structs.h \
 			      drizzled/symbol_hash.h \
 			      drizzled/sys_var.h \
 			      drizzled/system_variables.h \

=== modified file 'drizzled/item/field.cc'
--- drizzled/item/field.cc	2013-01-08 12:08:04 +0000
+++ drizzled/item/field.cc	2013-03-07 01:36:23 +0000
@@ -31,6 +31,7 @@
 #include <drizzled/plugin/client.h>
 #include <drizzled/item/subselect.h>
 #include <drizzled/sql_lex.h>
+#include <drizzled/key_part_info.h>
 
 #include <boost/dynamic_bitset.hpp>
 

=== modified file 'drizzled/item/subselect.cc'
--- drizzled/item/subselect.cc	2012-03-05 06:00:54 +0000
+++ drizzled/item/subselect.cc	2013-03-07 01:36:23 +0000
@@ -47,6 +47,7 @@
 #include <drizzled/select_union.h>
 #include <drizzled/sql_lex.h>
 #include <drizzled/system_variables.h>
+#include <drizzled/key_part_info.h>
 
 namespace drizzled {
 

=== modified file 'drizzled/join.cc'
--- drizzled/join.cc	2013-01-08 12:08:04 +0000
+++ drizzled/join.cc	2013-03-07 01:36:23 +0000
@@ -69,6 +69,7 @@
 #include <drizzled/statistics_variables.h>
 #include <drizzled/system_variables.h>
 #include <algorithm>
+#include <drizzled/key_part_info.h>
 
 using namespace std;
 

=== modified file 'drizzled/key.cc'
--- drizzled/key.cc	2011-07-04 18:16:24 +0000
+++ drizzled/key.cc	2013-03-07 01:36:23 +0000
@@ -22,6 +22,7 @@
 #include <drizzled/field/blob.h>
 #include <drizzled/util/test.h>
 #include <drizzled/plugin/storage_engine.h>
+#include <drizzled/key_part_info.h>
 
 #include <boost/dynamic_bitset.hpp>
 

=== modified file 'drizzled/key.h'
--- drizzled/key.h	2011-10-24 21:23:54 +0000
+++ drizzled/key.h	2013-03-07 01:36:23 +0000
@@ -32,6 +32,8 @@
 
 namespace drizzled {
 
+class KeyPartInfo;
+
 class Key : public memory::SqlAlloc 
 {
 public:

=== renamed file 'drizzled/structs.h' => 'drizzled/key_info.h'
--- drizzled/structs.h	2011-10-26 09:37:58 +0000
+++ drizzled/key_info.h	2013-03-07 01:36:23 +0000
@@ -24,45 +24,17 @@
 #include <drizzled/definitions.h>
 #include <drizzled/lex_string.h>
 #include <drizzled/thr_lock.h>
+#include <drizzled/message/table.pb.h>
 
 namespace drizzled {
 
-class KeyPartInfo 
-{	/* Info about a key part */
-public:
-  Field *field;
-  unsigned int	offset;				/* offset in record (from 0) */
-  unsigned int	null_offset;			/* Offset to null_bit in record */
-  /* Length of key part in bytes, excluding NULL flag and length bytes */
-  uint16_t length;
-  /*
-    Number of bytes required to store the keypart value. This may be
-    different from the "length" field as it also counts
-     - possible NULL-flag byte (see HA_KEY_NULL_LENGTH) [if null_bit != 0,
-       the first byte stored at offset is 1 if null, 0 if non-null; the
-       actual value is stored from offset+1].
-     - possible HA_KEY_BLOB_LENGTH bytes needed to store actual value length.
-  */
-  uint16_t store_length;
-  uint16_t key_type;
-private:
-public:
-  uint16_t getKeyType() const
-  {
-    return key_type;
-  }
-  uint16_t fieldnr;			/* Fieldnum in UNIREG (1,2,3,...) */
-  uint16_t key_part_flag;			/* 0 or HA_REVERSE_SORT */
-  uint8_t type;
-  uint8_t null_bit;			/* Position to null_bit */
-};
-
-
-class KeyInfo 
+class KeyPartInfo;
+
+class KeyInfo
 {
 public:
   unsigned int	key_length;		/* Tot length of key */
-  enum  ha_key_alg algorithm;
+  drizzled::message::Table::Index::IndexType algorithm;
   unsigned long flags;			/* dupp key and pack flags */
   unsigned int key_parts;		/* How many key_parts */
   uint32_t  extra_length;
@@ -80,34 +52,4 @@
   str_ref comment;
 };
 
-
-class RegInfo 
-{
-public:		/* Extra info about reg */
-  JoinTable *join_tab;	/* Used by SELECT() */
-  enum thr_lock_type lock_type;		/* How database is used */
-  bool not_exists_optimize;
-  bool impossible_range;
-  RegInfo()
-    : join_tab(NULL), lock_type(TL_UNLOCK),
-      not_exists_optimize(false), impossible_range(false) {}
-  void reset()
-  {
-    join_tab= NULL;
-    lock_type= TL_UNLOCK;
-    not_exists_optimize= false;
-    impossible_range= false;
-  }
-};
-
-typedef int *(*update_var)(Session *, struct drizzle_show_var *);
-
 } /* namespace drizzled */
-
-	/* Bits in form->status */
-#define STATUS_NO_RECORD	(1+2)	/* Record isn't usably */
-#define STATUS_GARBAGE		1
-#define STATUS_NOT_FOUND	2	/* No record in database when needed */
-#define STATUS_NO_PARENT	4	/* Parent record wasn't found */
-#define STATUS_NULL_ROW		32	/* table->null_row is set */
-

=== added file 'drizzled/key_part_info.h'
--- drizzled/key_part_info.h	1970-01-01 00:00:00 +0000
+++ drizzled/key_part_info.h	2013-03-07 01:36:23 +0000
@@ -0,0 +1,61 @@
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2008 Sun Microsystems, Inc.
+ *  Copyright (C) 2013 Stewart Smith
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#pragma once
+
+#include <drizzled/message/table.pb.h>
+
+namespace drizzled {
+
+/* This structure describes a key part.
+   There is one key part per field in a key.
+ */
+class KeyPartInfo
+{
+public:
+  Field *field;
+  unsigned int	offset;	     /* offset in record (from 0) */
+  unsigned int	null_offset; /* Offset to null_bit in record */
+  /* Length of key part in bytes, excluding NULL flag and length bytes */
+  uint16_t length;
+  /*
+    Number of bytes required to store the keypart value. This may be
+    different from the "length" field as it also counts
+     - possible NULL-flag byte (see HA_KEY_NULL_LENGTH) [if null_bit != 0,
+       the first byte stored at offset is 1 if null, 0 if non-null; the
+       actual value is stored from offset+1].
+     - possible HA_KEY_BLOB_LENGTH bytes needed to store actual value length.
+  */
+  uint16_t store_length;
+  uint16_t key_type;
+private:
+public:
+  uint16_t getKeyType() const
+  {
+    return key_type;
+  }
+  uint16_t fieldnr;		/* Fieldnum in UNIREG (1,2,3,...) */
+  uint16_t key_part_flag;	/* 0 or HA_REVERSE_SORT */
+  uint8_t type;
+  uint8_t null_bit;		/* Position to null_bit */
+};
+
+} /* namespace drizzled */

=== modified file 'drizzled/optimizer/key_field.cc'
--- drizzled/optimizer/key_field.cc	2011-03-01 18:51:28 +0000
+++ drizzled/optimizer/key_field.cc	2013-03-07 01:36:23 +0000
@@ -28,6 +28,7 @@
 #include <drizzled/optimizer/key_use.h>
 #include <drizzled/sql_lex.h>
 #include <drizzled/item/subselect.h>
+#include <drizzled/key_part_info.h>
 
 #include <vector>
 

=== modified file 'drizzled/optimizer/quick_group_min_max_select.cc'
--- drizzled/optimizer/quick_group_min_max_select.cc	2011-06-22 19:56:58 +0000
+++ drizzled/optimizer/quick_group_min_max_select.cc	2013-03-07 01:36:23 +0000
@@ -31,6 +31,7 @@
 #include <drizzled/key.h>
 #include <drizzled/table.h>
 #include <drizzled/system_variables.h>
+#include <drizzled/key_part_info.h>
 
 #include <vector>
 

=== modified file 'drizzled/optimizer/quick_group_min_max_select.h'
--- drizzled/optimizer/quick_group_min_max_select.h	2011-03-14 05:40:28 +0000
+++ drizzled/optimizer/quick_group_min_max_select.h	2013-03-07 01:36:23 +0000
@@ -26,6 +26,8 @@
 namespace drizzled
 {
 
+class KeyPartInfo;
+
 namespace optimizer
 {
 

=== modified file 'drizzled/optimizer/quick_range_select.h'
--- drizzled/optimizer/quick_range_select.h	2012-02-12 10:29:09 +0000
+++ drizzled/optimizer/quick_range_select.h	2013-03-07 01:36:23 +0000
@@ -26,6 +26,9 @@
 #include <vector>
 
 namespace drizzled {
+
+class KeyPartInfo;
+
 namespace optimizer {
 
 /**

=== modified file 'drizzled/optimizer/range.cc'
--- drizzled/optimizer/range.cc	2013-01-08 12:08:04 +0000
+++ drizzled/optimizer/range.cc	2013-03-07 01:36:23 +0000
@@ -142,6 +142,7 @@
 #include <drizzled/temporal.h> /* Needed in get_mm_leaf() for timestamp -> datetime comparisons */
 #include <drizzled/sql_lex.h>
 #include <drizzled/system_variables.h>
+#include <drizzled/key_part_info.h>
 
 using namespace std;
 
@@ -3802,8 +3803,9 @@
     }
   }
   /* Figure out if the key scan is ROR (returns rows in ROWID order) or not */
-  enum ha_key_alg key_alg= param->table->key_info[seq.real_keyno].algorithm;
-  if ((key_alg != HA_KEY_ALG_BTREE) && (key_alg!= HA_KEY_ALG_UNDEF))
+  message::Table::Index::IndexType key_alg= param->table->key_info[seq.real_keyno].algorithm;
+  if ((key_alg != message::Table::Index::BTREE)
+      && (key_alg!= message::Table::Index::UNKNOWN_INDEX))
   {
     /*
       All scans are non-ROR scans for those index types.

=== modified file 'drizzled/optimizer/sum.cc'
--- drizzled/optimizer/sum.cc	2011-07-05 12:32:41 +0000
+++ drizzled/optimizer/sum.cc	2013-03-07 01:36:23 +0000
@@ -61,6 +61,7 @@
 #include <drizzled/table_list.h>
 #include <drizzled/key.h>
 #include <drizzled/error.h>
+#include <drizzled/key_part_info.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/optimizer/table_read_plan.h'
--- drizzled/optimizer/table_read_plan.h	2011-06-27 22:54:15 +0000
+++ drizzled/optimizer/table_read_plan.h	2013-03-07 01:36:23 +0000
@@ -24,6 +24,9 @@
 #include <algorithm>
 
 namespace drizzled {
+
+class KeyPartInfo;
+
 namespace optimizer {
 
 /*

=== modified file 'drizzled/plugin/storage_engine.h'
--- drizzled/plugin/storage_engine.h	2013-02-21 22:31:46 +0000
+++ drizzled/plugin/storage_engine.h	2013-03-07 01:36:23 +0000
@@ -229,7 +229,7 @@
   }
 
   // @todo match check_flag interface
-  virtual uint32_t index_flags(enum  ha_key_alg) const { return 0; }
+  virtual uint32_t index_flags(drizzled::message::Table::Index::IndexType) const { return 0; }
   virtual void startStatement(Session *session)
   {
     doStartStatement(session);

=== modified file 'drizzled/sql_select.cc'
--- drizzled/sql_select.cc	2012-03-05 06:00:54 +0000
+++ drizzled/sql_select.cc	2013-03-07 01:36:23 +0000
@@ -68,6 +68,7 @@
 #include <drizzled/select_result.h>
 #include <drizzled/key.h>
 #include <drizzled/my_hash.h>
+#include <drizzled/key_part_info.h>
 
 using namespace std;
 

=== modified file 'drizzled/sql_select.h'
--- drizzled/sql_select.h	2011-06-14 20:59:28 +0000
+++ drizzled/sql_select.h	2013-03-07 01:36:23 +0000
@@ -219,6 +219,8 @@
 int join_read_always_key_or_null(JoinTable *tab);
 int join_read_next_same_or_null(ReadRecord *info);
 
+class KeyPartInfo;
+
 void calc_used_field_length(Session *, JoinTable *join_tab);
 StoredKey *get_store_key(Session *session, 
                          optimizer::KeyUse *keyuse,

=== modified file 'drizzled/sql_table.cc'
--- drizzled/sql_table.cc	2012-07-11 14:06:00 +0000
+++ drizzled/sql_table.cc	2013-03-07 01:36:23 +0000
@@ -46,6 +46,7 @@
 #include <drizzled/open_tables_state.h>
 #include <drizzled/table/cache.h>
 #include <drizzled/create_field.h>
+#include <drizzled/key_part_info.h>
 
 #include <algorithm>
 #include <sstream>

=== modified file 'drizzled/sql_yacc.yy'
--- drizzled/sql_yacc.yy	2013-02-26 21:21:52 +0000
+++ drizzled/sql_yacc.yy	2013-03-07 01:36:23 +0000
@@ -148,7 +148,7 @@
   drizzled::sys_var_with_base variable;
   drizzled::sql_var_t var_type;
   drizzled::Key::Keytype key_type;
-  drizzled::ha_key_alg key_alg;
+  drizzled::message::Table::Index::IndexType key_alg;
   drizzled::ha_rkey_function ha_rkey_mode;
   drizzled::enum_tx_isolation tx_isolation;
   drizzled::Cast_target cast_type;
@@ -1780,8 +1780,8 @@
         ;
 
 btree_or_rtree:
-          BTREE_SYM { $$= HA_KEY_ALG_BTREE; }
-        | HASH_SYM  { $$= HA_KEY_ALG_HASH; }
+          BTREE_SYM { $$= drizzled::message::Table::Index::BTREE; }
+        | HASH_SYM  { $$= drizzled::message::Table::Index::HASH; }
         ;
 
 key_list:

=== modified file 'drizzled/statement/alter_table.cc'
--- drizzled/statement/alter_table.cc	2012-07-11 14:06:00 +0000
+++ drizzled/statement/alter_table.cc	2013-03-07 01:36:23 +0000
@@ -52,6 +52,7 @@
 #include <drizzled/table/cache.h>
 #include <drizzled/create_field.h>
 #include <drizzled/catalog/instance.h>
+#include <drizzled/key_part_info.h>
 
 using namespace std;
 

=== modified file 'drizzled/table.cc'
--- drizzled/table.cc	2011-10-24 09:51:02 +0000
+++ drizzled/table.cc	2013-03-07 01:36:23 +0000
@@ -59,6 +59,7 @@
 #include <drizzled/statistics_variables.h>
 #include <drizzled/system_variables.h>
 #include <drizzled/open_tables_state.h>
+#include <drizzled/key_part_info.h>
 
 using namespace std;
 
@@ -1162,7 +1163,7 @@
     keyinfo->usable_key_parts=keyinfo->key_parts= param->group_parts;
     keyinfo->key_length= 0;
     keyinfo->rec_per_key= 0;
-    keyinfo->algorithm= HA_KEY_ALG_UNDEF;
+    keyinfo->algorithm= message::Table::Index::UNKNOWN_INDEX;
     keyinfo->name= (char*) "group_key";
     Order *cur_group= group;
     for (; cur_group ; cur_group= cur_group->next, key_part_info++)
@@ -1240,7 +1241,7 @@
     keyinfo->flags=HA_NOSAME | HA_NULL_ARE_EQUAL;
     keyinfo->key_length=(uint16_t) reclength;
     keyinfo->name= (char*) "distinct_key";
-    keyinfo->algorithm= HA_KEY_ALG_UNDEF;
+    keyinfo->algorithm= message::Table::Index::UNKNOWN_INDEX;
     keyinfo->rec_per_key= 0;
 
     /*

=== modified file 'drizzled/table.h'
--- drizzled/table.h	2011-10-22 13:10:53 +0000
+++ drizzled/table.h	2013-03-07 01:36:23 +0000
@@ -36,11 +36,38 @@
 
 namespace drizzled {
 
+	/* Bits in form->status */
+#define STATUS_NO_RECORD	(1+2)	/* Record isn't usably */
+#define STATUS_GARBAGE		1
+#define STATUS_NOT_FOUND	2	/* No record in database when needed */
+#define STATUS_NO_PARENT	4	/* Parent record wasn't found */
+#define STATUS_NULL_ROW		32	/* table->null_row is set */
+
+
+class RegInfo
+{
+public:		/* Extra info about reg */
+  JoinTable *join_tab;	/* Used by SELECT() */
+  enum thr_lock_type lock_type;		/* How database is used */
+  bool not_exists_optimize;
+  bool impossible_range;
+  RegInfo()
+    : join_tab(NULL), lock_type(TL_UNLOCK),
+      not_exists_optimize(false), impossible_range(false) {}
+  void reset()
+  {
+    join_tab= NULL;
+    lock_type= TL_UNLOCK;
+    not_exists_optimize= false;
+    impossible_range= false;
+  }
+};
+
 /**
- * Class representing a set of records, either in a temporary, 
+ * Class representing a set of records, either in a temporary,
  * normal, or derived table.
  */
-class DRIZZLED_API Table 
+class DRIZZLED_API Table
 {
   Field **field; /**< Pointer to fields collection */
 

=== modified file 'drizzled/table/instance/base.cc'
--- drizzled/table/instance/base.cc	2012-07-11 14:06:00 +0000
+++ drizzled/table/instance/base.cc	2013-03-07 01:36:23 +0000
@@ -87,6 +87,7 @@
 #include <drizzled/key.h>
 #include <drizzled/open_tables_state.h>
 #include <drizzled/catalog/local.h>
+#include <drizzled/key_part_info.h>
 
 using namespace std;
 
@@ -625,23 +626,7 @@
       }
     }
 
-    switch (indx.type())
-    {
-    case message::Table::Index::UNKNOWN_INDEX:
-      keyinfo->algorithm= HA_KEY_ALG_UNDEF;
-      break;
-    case message::Table::Index::BTREE:
-      keyinfo->algorithm= HA_KEY_ALG_BTREE;
-      break;
-    case message::Table::Index::HASH:
-      keyinfo->algorithm= HA_KEY_ALG_HASH;
-      break;
-
-    default:
-      /* TODO: suitable warning ? */
-      keyinfo->algorithm= HA_KEY_ALG_UNDEF;
-      break;
-    }
+    keyinfo->algorithm= indx.type();
 
     keyinfo->key_length= indx.key_length();
 
@@ -1315,7 +1300,7 @@
         if (local_field->key_length() == key_part->length &&
             !(local_field->flags & BLOB_FLAG))
         {
-          enum ha_key_alg algo= key_info[key].algorithm;
+          message::Table::Index::IndexType algo= key_info[key].algorithm;
           if (db_type()->index_flags(algo) & HA_KEYREAD_ONLY)
           {
             keys_for_keyread.set(key);

=== modified file 'drizzled/table/instance/base.h'
--- drizzled/table/instance/base.h	2012-07-11 14:06:00 +0000
+++ drizzled/table/instance/base.h	2013-03-07 01:36:23 +0000
@@ -39,6 +39,7 @@
 #include <drizzled/key_map.h>
 #include <drizzled/field.h>
 #include <drizzled/util/find_ptr.h>
+#include <drizzled/key_info.h>
 
 namespace drizzled {
 

=== modified file 'drizzled/table/singular.cc'
--- drizzled/table/singular.cc	2012-07-11 14:06:00 +0000
+++ drizzled/table/singular.cc	2013-03-07 01:36:23 +0000
@@ -30,6 +30,7 @@
 #include <drizzled/statistics_variables.h>
 #include <drizzled/table.h>
 #include <drizzled/create_field.h>
+#include <drizzled/key_part_info.h>
 
 namespace drizzled {
 namespace table {

=== modified file 'drizzled/table_proto.cc'
--- drizzled/table_proto.cc	2011-10-06 18:18:31 +0000
+++ drizzled/table_proto.cc	2013-03-07 01:36:23 +0000
@@ -24,6 +24,8 @@
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/typelib.h>
 #include <drizzled/util/test.h>
+#include <drizzled/key_part_info.h>
+#include <drizzled/key_info.h>
 
 /* For proto */
 #include <string>
@@ -410,22 +412,10 @@
     idx->set_key_length(key_info[i].key_length);
     idx->set_is_primary(is_primary_key(key_info[i].name));
 
-    switch(key_info[i].algorithm)
-    {
-    case HA_KEY_ALG_HASH:
-      idx->set_type(message::Table::Index::HASH);
-      break;
-
-    case HA_KEY_ALG_BTREE:
-      idx->set_type(message::Table::Index::BTREE);
-      break;
-
-    case HA_KEY_ALG_UNDEF:
-      {
-        idx->set_type(create_info->db_type->default_index_type());
-        break;
-      }
-    }
+    if (key_info[i].algorithm == message::Table::Index::UNKNOWN_INDEX)
+      idx->set_type(create_info->db_type->default_index_type());
+    else
+      idx->set_type(key_info[i].algorithm);
 
     if (key_info[i].flags & HA_NOSAME)
       idx->set_is_unique(true);

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2013-02-27 02:30:19 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2013-03-07 01:36:23 +0000
@@ -74,6 +74,7 @@
 #include <drizzled/session/times.h>
 #include <drizzled/session/transactions.h>
 #include <drizzled/typelib.h>
+#include <drizzled/key_part_info.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/program_options.hpp>
@@ -553,7 +554,7 @@
   UNIV_INTERN uint32_t max_supported_key_part_length() const;
 
 
-  UNIV_INTERN uint32_t index_flags(enum  ha_key_alg) const
+  UNIV_INTERN uint32_t index_flags(drizzled::message::Table::Index::IndexType) const
   {
     return (HA_READ_NEXT |
             HA_READ_PREV |

=== modified file 'plugin/innobase/handler/handler0alter.cc'
--- plugin/innobase/handler/handler0alter.cc	2012-05-23 02:06:56 +0000
+++ plugin/innobase/handler/handler0alter.cc	2013-03-07 01:36:23 +0000
@@ -28,6 +28,7 @@
 #include <drizzled/table.h>
 #include <drizzled/field/varstring.h>
 #include <drizzled/internal/my_sys.h>
+#include <drizzled/key_part_info.h>
 
 #include "log0log.h"
 #include "row0merge.h"

=== modified file 'plugin/memory/ha_heap.cc'
--- plugin/memory/ha_heap.cc	2012-07-11 14:06:00 +0000
+++ plugin/memory/ha_heap.cc	2013-03-07 01:36:23 +0000
@@ -24,6 +24,7 @@
 #include <drizzled/session/table_messages.h>
 #include <drizzled/statistics_variables.h>
 #include <drizzled/system_variables.h>
+#include <drizzled/key_part_info.h>
 
 #include <boost/thread/mutex.hpp>
 
@@ -105,7 +106,7 @@
   uint32_t max_supported_keys()          const { return MAX_KEY; }
   uint32_t max_supported_key_part_length() const { return MAX_KEY_LENGTH; }
 
-  uint32_t index_flags(enum  ha_key_alg ) const
+  uint32_t index_flags(drizzled::message::Table::Index::IndexType) const
   {
     return ( HA_ONLY_WHOLE_INDEX | HA_KEY_SCAN_NOT_ROR);
   }

=== modified file 'plugin/myisam/ha_myisam.cc'
--- plugin/myisam/ha_myisam.cc	2013-02-12 01:26:17 +0000
+++ plugin/myisam/ha_myisam.cc	2013-03-07 01:36:23 +0000
@@ -38,6 +38,7 @@
 #include <drizzled/key.h>
 #include <drizzled/statistics_variables.h>
 #include <drizzled/system_variables.h>
+#include <drizzled/key_part_info.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_ptr.hpp>
@@ -121,7 +122,7 @@
   uint32_t max_supported_key_length()    const { return MI_MAX_KEY_LENGTH; }
   uint32_t max_supported_key_part_length() const { return MI_MAX_KEY_LENGTH; }
 
-  uint32_t index_flags(enum  ha_key_alg) const
+  uint32_t index_flags(drizzled::message::Table::Index::IndexType) const
   {
     return (HA_READ_NEXT |
             HA_READ_PREV |
@@ -223,7 +224,7 @@
   {
     KeyInfo *pos= &table_arg->key_info[i];
     keydef[i].flag= ((uint16_t) pos->flags & (HA_NOSAME));
-    keydef[i].key_alg= HA_KEY_ALG_BTREE;
+    keydef[i].key_alg= message::Table::Index::BTREE;
     keydef[i].block_length= pos->block_size;
     keydef[i].seg= keyseg;
     keydef[i].keysegs= pos->key_parts;
@@ -589,7 +590,7 @@
   if (!(file= mi_open(identifier, mode, test_if_locked)))
     return (errno ? errno : -1);
 
-  if (!getTable()->getShare()->getType()) /* No need to perform a check for tmp table */
+  if (getTable()->getShare()->getType() == message::Table::STANDARD)
   {
     if ((errno= table2myisam(getTable(), &keyinfo, &recinfo, &recs)))
     {

=== modified file 'plugin/myisam/mi_range.cc'
--- plugin/myisam/mi_range.cc	2010-10-02 21:15:42 +0000
+++ plugin/myisam/mi_range.cc	2013-03-07 01:36:23 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "myisam_priv.h"
+#include <drizzled/message/table.h>
 
 using namespace drizzled;
 
@@ -58,7 +59,7 @@
   info->update&= (HA_STATE_CHANGED+HA_STATE_ROW_CHANGED);
 
   switch(info->s->keyinfo[inx].key_alg){
-  case HA_KEY_ALG_BTREE:
+  case message::Table::Index::BTREE:
   default:
     start_pos= (min_key ?  _mi_record_pos(info, min_key->key,
                                           min_key->keypart_map, min_key->flag)

=== modified file 'plugin/myisam/mi_rkey.cc'
--- plugin/myisam/mi_rkey.cc	2010-10-02 21:15:42 +0000
+++ plugin/myisam/mi_rkey.cc	2013-03-07 01:36:23 +0000
@@ -16,6 +16,7 @@
 /* Read record based on a key */
 
 #include "myisam_priv.h"
+#include <drizzled/message/table.h>
 
 using namespace drizzled;
 
@@ -74,7 +75,7 @@
     use_key_length=USE_WHOLE_KEY;
 
   switch (info->s->keyinfo[inx].key_alg) {
-  case HA_KEY_ALG_BTREE:
+  case message::Table::Index::BTREE:
   default:
     myisam_search_flag= myisam_read_vec[search_flag];
     if (!_mi_search(info, keyinfo, key_buff, use_key_length,

=== modified file 'plugin/myisam/mi_rnext.cc'
--- plugin/myisam/mi_rnext.cc	2011-08-22 12:09:32 +0000
+++ plugin/myisam/mi_rnext.cc	2013-03-07 01:36:23 +0000
@@ -14,6 +14,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include "myisam_priv.h"
+#include <drizzled/message/table.h>
 
 using namespace drizzled;
 
@@ -41,7 +42,7 @@
   if (!flag)
   {
     switch(info->s->keyinfo[inx].key_alg){
-    case HA_KEY_ALG_BTREE:
+    case message::Table::Index::BTREE:
     default:
       error=_mi_search_first(info,info->s->keyinfo+inx,
 			   info->s->state.key_root[inx]);
@@ -51,7 +52,7 @@
   else
   {
     switch (info->s->keyinfo[inx].key_alg) {
-    case HA_KEY_ALG_BTREE:
+    case message::Table::Index::BTREE:
     default:
       if (!changed)
 	error= _mi_search_next(info,info->s->keyinfo+inx,info->lastkey,

=== modified file 'plugin/myisam/mi_rnext_same.cc'
--- plugin/myisam/mi_rnext_same.cc	2010-10-02 21:15:42 +0000
+++ plugin/myisam/mi_rnext_same.cc	2013-03-07 01:36:23 +0000
@@ -14,6 +14,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include "myisam_priv.h"
+#include <drizzled/message/table.h>
 
 using namespace drizzled;
 
@@ -39,7 +40,7 @@
 
   switch (keyinfo->key_alg)
   {
-    case HA_KEY_ALG_BTREE:
+    case message::Table::Index::BTREE:
     default:
       if (!(info->update & HA_STATE_RNEXT_SAME))
       {

=== modified file 'plugin/storage_engine_api_tester/storage_engine_api_tester.cc'
--- plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2013-02-21 22:31:46 +0000
+++ plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2013-03-07 01:36:23 +0000
@@ -590,7 +590,7 @@
   }
 
   /* just copied from innobase... */
-  uint32_t index_flags(enum  ha_key_alg) const
+  uint32_t index_flags(drizzled::message::Table::Index::IndexType) const
   {
     return (HA_READ_NEXT |
             HA_READ_PREV |

=== modified file 'plugin/tableprototester/tableprototester.cc'
--- plugin/tableprototester/tableprototester.cc	2012-04-20 18:29:45 +0000
+++ plugin/tableprototester/tableprototester.cc	2013-03-07 01:36:23 +0000
@@ -83,7 +83,7 @@
   uint32_t max_supported_key_length()    const { return 1000; }
   uint32_t max_supported_key_part_length() const { return 1000; }
 
-  uint32_t index_flags(enum  ha_key_alg) const
+  uint32_t index_flags(drizzled::message::Table::Index::IndexType) const
   {
     return (HA_READ_NEXT |
             HA_READ_PREV |