← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Padraig
  • Date: 2009-03-01 06:17:32 UTC
  • mto: (934.3.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 938.
  • Revision ID: posulliv@linux-lap-20090301061732-82tzcoj2jcsif2kk
Giving function object a better name for this scenario.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
1089
1089
  assert(0);
1090
1090
}
1091
1091
 
1092
 
class buffpek_compare_if
 
1092
class compare_functor
1093
1093
{
1094
1094
  qsort2_cmp key_compare;
1095
1095
  void *key_compare_arg;
1096
1096
  public:
1097
 
  buffpek_compare_if(qsort2_cmp in_key_compare, void *in_compare_arg)
 
1097
  compare_functor(qsort2_cmp in_key_compare, void *in_compare_arg)
1098
1098
    : key_compare(in_key_compare), key_compare_arg(in_compare_arg) { }
1099
1099
  inline bool operator()(BUFFPEK *i, BUFFPEK *j)
1100
1100
  {
1178
1178
    cmp= get_ptr_compare(sort_length);
1179
1179
    first_cmp_arg= (void*) &sort_length;
1180
1180
  }
1181
 
  priority_queue<BUFFPEK *, vector<BUFFPEK *>, buffpek_compare_if > 
1182
 
    queue(buffpek_compare_if(cmp, first_cmp_arg));
 
1181
  priority_queue<BUFFPEK *, vector<BUFFPEK *>, compare_functor > 
 
1182
    queue(compare_functor(cmp, first_cmp_arg));
1183
1183
  for (buffpek= Fb ; buffpek <= Tb ; buffpek++)
1184
1184
  {
1185
1185
    buffpek->base= strpos;