Merge lp:~brianaker/drizzle/error-cleanup into lp:drizzle/7.0

[Brian Aker]

[lp:~brianaker/drizzle/error-cleanup]

2148. By Lee Bieber on 2011-02-06

Merge Brian - table error updates
Merge Brian - parser updates
Merge Brian - more catalog work

=== modified file 'drizzled/sql_base.cc'
--- drizzled/sql_base.cc	2011-02-04 08:47:29 +0000
+++ drizzled/sql_base.cc	2011-02-05 21:31:52 +0000
@@ -1001,7 +1001,7 @@
     */
 
     {
-      table::Cache::singleton().mutex().lock(); /* Lock for FLUSH TABLES for open table */
+      boost::mutex::scoped_lock scopedLock(table::Cache::singleton().mutex());
 
       /*
         Actually try to find the table in the open_cache.
@@ -1053,7 +1053,6 @@
           /* Avoid self-deadlocks by detecting self-dependencies. */
           if (table->open_placeholder && table->in_use == this)
           {
-            table::Cache::singleton().mutex().unlock();
             my_error(ER_UPDATE_TABLE_USED, MYF(0), table->getShare()->getTableName());
             return NULL;
           }
@@ -1088,20 +1087,24 @@
           {
             /* wait_for_conditionwill unlock table::Cache::singleton().mutex() for us */
             wait_for_condition(table::Cache::singleton().mutex(), COND_refresh);
+            scopedLock.release();
           }
           else
           {
-            table::Cache::singleton().mutex().unlock();
+            scopedLock.unlock();
           }
+
           /*
             There is a refresh in progress for this table.
             Signal the caller that it has to try again.
           */
           if (refresh)
             *refresh= true;
+
           return NULL;
         }
       }
+
       if (table)
       {
         table::getUnused().unlink(static_cast<table::Concurrent *>(table));
@@ -1125,7 +1128,6 @@
             */
             if (!(table= table_cache_insert_placeholder(lock_table_identifier)))
             {
-              table::Cache::singleton().mutex().unlock();
               return NULL;
             }
             /*
@@ -1136,7 +1138,6 @@
             table->open_placeholder= true;
             table->setNext(open_tables);
             open_tables= table;
-            table::Cache::singleton().mutex().unlock();
 
             return table ;
           }
@@ -1149,7 +1150,6 @@
           table= new_table;
           if (new_table == NULL)
           {
-            table::Cache::singleton().mutex().unlock();
             return NULL;
           }
 
@@ -1157,15 +1157,13 @@
           if (error != 0)
           {
             delete new_table;
-            table::Cache::singleton().mutex().unlock();
             return NULL;
           }
           (void)table::Cache::singleton().insert(new_table);
         }
       }
+    }
 
-      table::Cache::singleton().mutex().unlock();
-    }
     if (refresh)
     {
       table->setNext(open_tables); /* Link into simple list */
 
=== modified file 'drizzled/table.cc'
--- drizzled/table.cc	2011-02-02 17:37:40 +0000
+++ drizzled/table.cc	2011-02-05 21:31:52 +0000
@@ -69,9 +69,6 @@
 
 /* Functions defined in this cursor */
 
-void open_table_error(TableShare *share, int error, int db_errno,
-                      myf errortype, int errarg);
-
 /*************************************************************************/
 
 // @note this should all be the destructor
@@ -82,6 +79,7 @@
   if (db_stat)
     error= cursor->close();
   _alias.clear();
+
   if (field)
   {
     for (Field **ptr=field ; *ptr ; ptr++)
@@ -112,6 +110,8 @@
                        uint32_t db_stat_arg)
 {
   setShare(share);
+  in_use= session;
+
   field= NULL;
 
   cursor= NULL;
@@ -124,7 +124,6 @@
   tablenr= 0;
   db_stat= db_stat_arg;
 
-  in_use= session;
   record[0]= (unsigned char *) NULL;
   record[1]= (unsigned char *) NULL;
 
@@ -1646,25 +1645,14 @@
   query_id(0),
   quick_condition_rows(0),
   timestamp_field_type(TIMESTAMP_NO_AUTO_SET),
-  map(0)
+  map(0),
+  quick_rows(),
+  const_key_parts(),
+  quick_key_parts(),
+  quick_n_ranges()
 {
   record[0]= (unsigned char *) 0;
   record[1]= (unsigned char *) 0;
-
-  reginfo.reset();
-  covering_keys.reset();
-  quick_keys.reset();
-  merge_keys.reset();
-
-  keys_in_use_for_query.reset();
-  keys_in_use_for_group_by.reset();
-  keys_in_use_for_order_by.reset();
-
-  memset(quick_rows, 0, sizeof(ha_rows) * MAX_KEY);
-  memset(const_key_parts, 0, sizeof(ha_rows) * MAX_KEY);
-
-  memset(quick_key_parts, 0, sizeof(unsigned int) * MAX_KEY);
-  memset(quick_n_ranges, 0, sizeof(unsigned int) * MAX_KEY);
 }
 
 /*****************************************************************************
 
=== modified file 'drizzled/table.h'
--- drizzled/table.h	2011-02-02 17:37:40 +0000
+++ drizzled/table.h	2011-02-05 21:31:52 +0000
@@ -91,8 +91,10 @@
   }
 
   Cursor *cursor; /**< Pointer to the storage engine's Cursor managing this table */
+
 private:
   Table *next;
+
 public:
   Table *getNext() const
   {
@@ -314,8 +316,10 @@
     The set is implemented as a bitmap.
   */
   key_map keys_in_use_for_query;
+
   /* Map of keys that can be used to calculate GROUP BY without sorting */
   key_map keys_in_use_for_group_by;
+
   /* Map of keys that can be used to calculate ORDER BY without sorting */
   key_map keys_in_use_for_order_by;
 
 
=== modified file 'drizzled/table/instance/base.cc'
--- drizzled/table/instance/base.cc	2011-02-04 09:30:58 +0000
+++ drizzled/table/instance/base.cc	2011-02-05 21:31:52 +0000
@@ -576,9 +576,9 @@
   getTableMessage()->set_schema(identifier_arg.getSchemaName());
 }
 
-int TableShare::inner_parse_table_proto(Session& session, message::Table &table)
+bool TableShare::parse_table_proto(Session& session, message::Table &table)
 {
-  int local_error= 0;
+  drizzled::error_t local_error= EE_OK;
 
   if (! table.IsInitialized())
   {
@@ -1057,9 +1057,9 @@
       {
         if (fo.scale() > DECIMAL_MAX_SCALE)
         {
-          local_error= 4;
+          local_error= ER_NOT_FORM_FILE;
 
-          return local_error;
+          return true;
         }
         decimals= static_cast<uint8_t>(fo.scale());
       }
@@ -1113,9 +1113,8 @@
             decimals != NOT_FIXED_DEC)
         {
           my_error(ER_M_BIGGER_THAN_D, MYF(0), pfield.name().c_str());
-          local_error= 1;
-
-          return local_error;
+          local_error= ER_M_BIGGER_THAN_D;
+          return true;
         }
         break;
       }
@@ -1254,9 +1253,9 @@
       if (res != 0 && res != 3) /* @TODO Huh? */
       {
         my_error(ER_INVALID_DEFAULT, MYF(0), f->field_name);
-        local_error= 1;
+        local_error= ER_INVALID_DEFAULT;
 
-        return local_error;
+        return true;
       }
     }
     else if (f->real_type() == DRIZZLE_TYPE_ENUM && (f->flags & NOT_NULL_FLAG))
@@ -1468,9 +1467,9 @@
                             &next_number_keypart)) < 0)
     {
       /* Wrong field definition */
-      local_error= 4;
+      local_error= ER_NOT_FORM_FILE;
 
-      return local_error;
+      return true;
     }
     else
     {
@@ -1495,24 +1494,8 @@
   all_set.resize(_field_size);
   all_set.set();
 
-  return local_error;
-}
-
-int TableShare::parse_table_proto(Session& session, message::Table &table)
-{
-  int local_error= inner_parse_table_proto(session, table);
-
-  if (not local_error)
-    return 0;
-
-  error= local_error;
-  open_errno= errno;
-  errarg= 0;
-  open_table_error(local_error, open_errno, 0);
-
-  return local_error;
-}
-
+  return local_error != EE_OK;
+}
 
 /*
   Read table definition from a binary / text based .frm cursor
 
=== modified file 'drizzled/table/instance/base.h'
--- drizzled/table/instance/base.h	2011-02-03 23:29:20 +0000
+++ drizzled/table/instance/base.h	2011-02-05 21:31:52 +0000
@@ -652,10 +652,12 @@
 private:
   void init(const char *new_table_name,
             const char *new_path);
-public:
 
+protected:
   void open_table_error(int pass_error, int db_errno, int pass_errarg);
 
+public:
+
   static TableShare::shared_ptr getShareCreate(Session *session, 
                                                const identifier::Table &identifier,
                                                int &error);
@@ -723,10 +725,7 @@
                               Table &outparam,
                               bool &error_reported);
 public:
-  int parse_table_proto(Session& session, message::Table &table);
-
-private:
-  int inner_parse_table_proto(Session& session, message::Table &table);
+  bool parse_table_proto(Session& session, message::Table &table);
 };
 
 } /* namespace drizzled */