← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-23 12:07:34 UTC
  • mto: (2247.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2248.
  • Revision ID: olafvdspek@gmail.com-20110323120734-adgne8jcxj3slos2
Use BOOST_FOREACH

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
6005
6005
  */
6006
6006
  if (const_count && ! sargables.empty())
6007
6007
  {
6008
 
    vector<optimizer::SargableParam>::iterator iter= sargables.begin();
6009
 
    while (iter != sargables.end())
 
6008
    BOOST_FOREACH(vector<optimizer::SargableParam>::reference iter, sargables)
6010
6009
    {
6011
 
      Field *field= iter->getField();
6012
 
      JoinTable *join_tab= field->getTable()->reginfo.join_tab;
6013
 
      key_map possible_keys= field->key_start;
6014
 
      possible_keys&= field->getTable()->keys_in_use_for_query;
 
6010
      Field& field= *iter.getField();
 
6011
      JoinTable *join_tab= field.getTable()->reginfo.join_tab;
 
6012
      key_map possible_keys= field.key_start & field.getTable()->keys_in_use_for_query;
6015
6013
      bool is_const= true;
6016
 
      for (uint32_t j= 0; j < iter->getNumValues(); j++)
6017
 
        is_const&= iter->isConstItem(j);
 
6014
      for (uint32_t j= 0; j < iter.getNumValues(); j++)
 
6015
        is_const&= iter.isConstItem(j);
6018
6016
      if (is_const)
6019
6017
        join_tab[0].const_keys|= possible_keys;
6020
 
      ++iter;
6021
6018
    }
6022
6019
  }
6023
6020