← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

  • Committer: Brian Aker
  • Date: 2010-06-02 23:40:24 UTC
  • mto: (1578.6.9 explain-drizzle)
  • mto: This revision was merged to the branch mainline in revision 1585.
  • Revision ID: brian@gir-2.local-20100602234024-x26qr3pfhvood1d7
keys and fields partial encapsulation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
2494
2494
{
2495
2495
  Item_sum_count_distinct* item = (Item_sum_count_distinct*)arg;
2496
2496
  Field **field    = item->table->field;
2497
 
  Field **field_end= field + item->table->getShare()->fields;
 
2497
  Field **field_end= field + item->table->getShare()->sizeFields();
2498
2498
  uint32_t *lengths=item->field_lengths;
2499
2499
  for (; field < field_end; ++field)
2500
2500
  {
2617
2617
    qsort_cmp2 compare_key;
2618
2618
    void* cmp_arg;
2619
2619
    Field **field= table->field;
2620
 
    Field **field_end= field + table->getShare()->fields;
 
2620
    Field **field_end= field + table->getShare()->sizeFields();
2621
2621
    bool all_binary= true;
2622
2622
 
2623
2623
    for (tree_key_length= 0; field < field_end; ++field)
2638
2638
    }
2639
2639
    else
2640
2640
    {
2641
 
      if (table->getShare()->fields == 1)
 
2641
      if (table->getShare()->sizeFields() == 1)
2642
2642
      {
2643
2643
        /*
2644
2644
          If we have only one field, which is the most common use of
2655
2655
        uint32_t *length;
2656
2656
        compare_key= (qsort_cmp2) composite_key_cmp;
2657
2657
        cmp_arg= (void*) this;
2658
 
        field_lengths= (uint32_t*) session->alloc(table->getShare()->fields * sizeof(uint32_t));
 
2658
        field_lengths= (uint32_t*) session->alloc(table->getShare()->sizeFields() * sizeof(uint32_t));
2659
2659
        for (tree_key_length= 0, length= field_lengths, field= table->field;
2660
2660
             field < field_end; ++field, ++length)
2661
2661
        {