maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/dev/maria-5.1-table-elim-r10/

------------------------------------------------------------
revno: 2726
revision-id: psergey@xxxxxxxxxxxx-20090816091549-da84w3nlmx8prmvm
parent: psergey@xxxxxxxxxxxx-20090816072524-w9fu2hy23pjwlr8z
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: maria-5.1-table-elim-r10
timestamp: Sun 2009-08-16 12:15:49 +0300
message:
  MWL#17: Table elimination
  - code cleanup
=== modified file 'sql/opt_table_elimination.cc'
--- a/sql/opt_table_elimination.cc	2009-08-16 07:25:24 +0000
+++ b/sql/opt_table_elimination.cc	2009-08-16 09:15:49 +0000
@@ -125,7 +125,7 @@
     make elements that depend on them bound, too.
   */
   Module_dep *next; 
-  uint unknown_args; /* TRUE<=> The entity is considered bound */
+  uint unknown_args;
 
   Module_dep() : next(NULL), unknown_args(0) {}
 };
@@ -249,11 +249,9 @@
 void eliminate_tables(JOIN *join);
 static void mark_as_eliminated(JOIN *join, TABLE_LIST *tbl);
 
-#if 0
 #ifndef DBUG_OFF
 static void dbug_print_deps(Table_elimination *te);
 #endif 
-#endif 
 /*******************************************************************************************/
 
 /*
@@ -854,7 +852,7 @@
 
 
 /*
-  This is used to analyse expressions in "tbl.col=expr" dependencies so
+  This is used to analyze expressions in "tbl.col=expr" dependencies so
   that we can figure out which fields the expression depends on.
 */
 
@@ -965,7 +963,7 @@
   }
   *bound_deps_list= bound_dep;
 
-  //DBUG_EXECUTE("test", dbug_print_deps(te); );
+  DBUG_EXECUTE("test", dbug_print_deps(te); );
   DBUG_RETURN(FALSE);
 }
 
@@ -1089,7 +1087,6 @@
 void signal_from_field_to_exprs(Table_elimination* te, Field_value *field_dep,
                                 Module_dep **bound_modules)
 {
-  /* Now, expressions */
   for (uint i=0; i < te->n_equality_deps; i++)
   {
     if (bitmap_is_set(&te->expr_deps, field_dep->bitmap_offset + i) &&
@@ -1213,7 +1210,6 @@
           for (Outer_join_module *outer_join_dep= table_dep->outer_join_dep;
                outer_join_dep; outer_join_dep= outer_join_dep->parent)
           {
-            //if (!(outer_join_dep->missing_tables &= ~table_dep->table->map))
             if (outer_join_dep->unknown_args && 
                 !--outer_join_dep->unknown_args)
             {
@@ -1268,7 +1264,6 @@
 }
 
 
-#if 0
 #ifndef DBUG_OFF
 static 
 void dbug_print_deps(Table_elimination *te)
@@ -1324,7 +1319,6 @@
 }
 
 #endif 
-#endif 
 /**
   @} (end of group Table_Elimination)
 */