Merge lp:~sinha/drizzle/patch-621856 into lp:drizzle/7.0

[Akash Sinha]

Functions inside the drizzled directory have been re-factored (unused params removed) and their definitions and call sites are taken care.

Virtual functions are not touched,will do them afterwards.

[lp:~sinha/drizzle/patch-621856]

2237. By Akash Sinha<email address hidden> on 2011-03-17

calc_used_field_length call updated.

Unmerged revisions

2237. By Akash Sinha<email address hidden> on 2011-03-17

calc_used_field_length call updated.

2236. By Akash Sinha<email address hidden> on 2011-03-14

sql_select.cc
        #1 int join_no_more_records(ReadRecord *) at line 3549
           sql_select.h file: function altered
           No other calls found

        #2 void calc_used_field_length(Session *, JoinTable *join_tab) at line 847
        sql_select.h file: function altered
        Calls from join.cc and join_cache.cc altered

        #3 enum_nested_loop_state end_send_group(Join *join, JoinTable *, bool end_of_records)
        sql_select.h file: function altered
        no other calls

        #4 enum_nested_loop_state end_write_group(Join *join, JoinTable *, bool end_of_records)
        sql_select.h file: function altered
        no other calls

sql_parse.cc
        #1 TableList *Select_Lex::end_nested_join(Session *) at line 1130
        sql_lex.h file : definition altered
        No other calls found

        #2 bool update_precheck(Session *session, TableList *) at line 1539
        sql_parse.h file: function altered
        statement/update.cc call altered

        #3 bool insert_precheck(Session *session, TableList *) at line 1578
        sql_parse.h file: function altered
        Calls from these files updated
                statement/replace_select.cc
                statement/insert_select.cc
                statement/replace.cc
                statement/insert.cc

=== modified file 'drizzled/join.cc'
--- drizzled/join.cc	2011-03-10 12:49:38 +0000
+++ drizzled/join.cc	2011-03-14 21:44:38 +0000
@@ -3289,7 +3289,6 @@
 {
   uint32_t length=0;
   JoinTable **pos,**end;
-  Session *session=join->session;
 
   for (pos=join->best_ref+join->const_tables,end=join->best_ref+idx ;
        pos != end ;
@@ -3297,7 +3296,7 @@
   {
     JoinTable *join_tab= *pos;
     if (!join_tab->used_fieldlength)    /* Not calced yet */
-      calc_used_field_length(session, join_tab);
+      calc_used_field_length( join_tab);
     length+=join_tab->used_fieldlength;
   }
   return length;

=== modified file 'drizzled/join_cache.cc'
--- drizzled/join_cache.cc	2011-02-17 00:14:13 +0000
+++ drizzled/join_cache.cc	2011-03-14 21:44:38 +0000
@@ -78,7 +78,7 @@
   for (unsigned int i= 0; i < table_count ; i++, join_tab++)
   {
     if (!join_tab->used_fieldlength)		/* Not calced yet */
-      calc_used_field_length(session, join_tab);
+      calc_used_field_length(join_tab);
     cache->fields+=join_tab->used_fields;
     blobs+=join_tab->used_blobs;
 

=== modified file 'drizzled/sql_lex.h'
--- drizzled/sql_lex.h	2011-03-14 05:40:28 +0000
+++ drizzled/sql_lex.h	2011-03-14 21:44:38 +0000
@@ -615,7 +615,7 @@
                                LEX_STRING *option= 0);
   TableList* get_table_list();
   bool init_nested_join(Session *session);
-  TableList *end_nested_join(Session *session);
+  TableList *end_nested_join();
   TableList *nest_last_join(Session *session);
   void add_joined_table(TableList *table);
   TableList *convert_right_join();

=== modified file 'drizzled/sql_parse.cc'
--- drizzled/sql_parse.cc	2011-03-10 13:40:36 +0000
+++ drizzled/sql_parse.cc	2011-03-14 21:44:38 +0000
@@ -1127,7 +1127,7 @@
     - 0, otherwise
 */
 
-TableList *Select_Lex::end_nested_join(Session *)
+TableList *Select_Lex::end_nested_join()
 {
   TableList *ptr;
   NestedJoin *nested_join;
@@ -1536,7 +1536,7 @@
     true  Error
 */
 
-bool update_precheck(Session *session, TableList *)
+bool update_precheck(Session *session)
 {
   const char *msg= 0;
   Select_Lex *select_lex= &session->lex().select_lex;
@@ -1575,7 +1575,7 @@
     true   error
 */
 
-bool insert_precheck(Session *session, TableList *)
+bool insert_precheck(Session *session)
 {
   /*
     Check that we have modify privileges for the first table and

=== modified file 'drizzled/sql_parse.h'
--- drizzled/sql_parse.h	2011-03-14 05:40:28 +0000
+++ drizzled/sql_parse.h	2011-03-14 21:44:38 +0000
@@ -47,9 +47,9 @@
 
 bool execute_sqlcom_select(Session *session, TableList *all_tables);
 bool insert_select_prepare(Session *session);
-bool update_precheck(Session *session, TableList *tables);
+bool update_precheck(Session *session);
 bool delete_precheck(Session *session, TableList *tables);
-bool insert_precheck(Session *session, TableList *tables);
+bool insert_precheck(Session *session);
 
 Item *negate_expression(Session *session, Item *expr);
 

=== modified file 'drizzled/sql_select.cc'
--- drizzled/sql_select.cc	2011-03-11 19:18:45 +0000
+++ drizzled/sql_select.cc	2011-03-14 21:44:38 +0000
@@ -844,7 +844,7 @@
 /**
   Find how much space the prevous read not const tables takes in cache.
 */
-void calc_used_field_length(Session *, JoinTable *join_tab)
+void calc_used_field_length(JoinTable *join_tab)
 {
   uint32_t null_fields,blobs,fields,rec_length;
   Field **f_ptr,*field;
@@ -3546,7 +3546,7 @@
   return 0;
 }
 
-int join_no_more_records(ReadRecord *)
+int join_no_more_records()
 {
   return -1;
 }
@@ -3798,7 +3798,7 @@
   return safe_index_read(tab);			// then read null keys
 }
 
-enum_nested_loop_state end_send_group(Join *join, JoinTable *, bool end_of_records)
+enum_nested_loop_state end_send_group(Join *join, bool end_of_records)
 {
   int idx= -1;
   enum_nested_loop_state ok_code= NESTED_LOOP_OK;
@@ -3887,7 +3887,7 @@
   return(NESTED_LOOP_OK);
 }
 
-enum_nested_loop_state end_write_group(Join *join, JoinTable *, bool end_of_records)
+enum_nested_loop_state end_write_group(Join *join, bool end_of_records)
 {
   Table *table=join->tmp_table;
   int	  idx= -1;

=== modified file 'drizzled/sql_select.h'
--- drizzled/sql_select.h	2011-03-14 05:40:28 +0000
+++ drizzled/sql_select.h	2011-03-14 21:44:38 +0000
@@ -56,8 +56,8 @@
 
 enum_nested_loop_state sub_select_cache(Join *join, JoinTable *join_tab, bool end_of_records);
 enum_nested_loop_state sub_select(Join *join,JoinTable *join_tab, bool end_of_records);
-enum_nested_loop_state end_send_group(Join *join, JoinTable *join_tab, bool end_of_records);
-enum_nested_loop_state end_write_group(Join *join, JoinTable *join_tab, bool end_of_records);
+enum_nested_loop_state end_send_group(Join *join,bool end_of_records);
+enum_nested_loop_state end_write_group(Join *join, bool end_of_records);
 
 class Rollup
 {
@@ -211,7 +211,7 @@
 int join_read_key(JoinTable *tab);
 int join_read_always_key(JoinTable *tab);
 int join_read_last_key(JoinTable *tab);
-int join_no_more_records(ReadRecord *info);
+int join_no_more_records();
 int join_read_next(ReadRecord *info);
 int join_read_next_different(ReadRecord *info);
 int join_init_quick_read_record(JoinTable *tab);
@@ -227,7 +227,7 @@
 int join_read_always_key_or_null(JoinTable *tab);
 int join_read_next_same_or_null(ReadRecord *info);
 
-void calc_used_field_length(Session *, JoinTable *join_tab);
+void calc_used_field_length(JoinTable *join_tab);
 StoredKey *get_store_key(Session *session, 
                          optimizer::KeyUse *keyuse,
                          table_map used_tables,

=== modified file 'drizzled/statement/insert.cc'
--- drizzled/statement/insert.cc	2011-03-10 10:44:18 +0000
+++ drizzled/statement/insert.cc	2011-03-14 21:44:38 +0000
@@ -35,7 +35,7 @@
   assert(first_table == all_tables && first_table != 0);
   bool need_start_waiting= false;
 
-  if (insert_precheck(&session(), all_tables))
+  if (insert_precheck(&session()))
   {
     return true;
   }

=== modified file 'drizzled/statement/insert_select.cc'
--- drizzled/statement/insert_select.cc	2011-03-10 10:44:18 +0000
+++ drizzled/statement/insert_select.cc	2011-03-14 21:44:38 +0000
@@ -40,7 +40,7 @@
   bool res= false;
   bool need_start_waiting= false;
 
-  if (insert_precheck(&session(), all_tables))
+  if (insert_precheck(&session()))
   {
     return true;
   }

=== modified file 'drizzled/statement/replace.cc'
--- drizzled/statement/replace.cc	2011-03-10 10:44:18 +0000
+++ drizzled/statement/replace.cc	2011-03-14 21:44:38 +0000
@@ -33,7 +33,7 @@
   TableList *all_tables= lex().query_tables;
   assert(first_table == all_tables && first_table != 0);
 
-  if (insert_precheck(&session(), all_tables))
+  if (insert_precheck(&session()))
   {
     return true;
   }

=== modified file 'drizzled/statement/replace_select.cc'
--- drizzled/statement/replace_select.cc	2011-03-10 10:44:18 +0000
+++ drizzled/statement/replace_select.cc	2011-03-14 21:44:38 +0000
@@ -38,7 +38,7 @@
   select_result *sel_result= NULL;
   bool res;
 
-  if (insert_precheck(&session(), all_tables))
+  if (insert_precheck(&session()))
   {
     return true;
   }

=== modified file 'drizzled/statement/update.cc'
--- drizzled/statement/update.cc	2011-03-10 10:44:18 +0000
+++ drizzled/statement/update.cc	2011-03-14 21:44:38 +0000
@@ -33,7 +33,7 @@
   assert(first_table == all_tables && first_table != 0);
   Select_Lex *select_lex= &lex().select_lex;
   Select_Lex_Unit *unit= &lex().unit;
-  if (update_precheck(&session(), all_tables))
+  if (update_precheck(&session()))
   {
     return true;
   }