From: Date: March 31 2006 11:34am Subject: bk commit into 5.0 tree (timour:1.2050) BUG#16710 List-Archive: http://lists.mysql.com/commits/4357 X-Bug: 16710 Message-Id: <20060331093434.25601352EC4@lamia.home> Below is the list of changes that have just been committed into a local 5.0 repository of timka. When timka does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.2050 06/03/31 12:34:28 timour@stripped +5 -0 Fix for BUG#16710. The bug was due to a missed case in the detection of whether an index can be used for loose scan. More precisely, the range optimizer chose to use loose index scan for queries for which the condition(s) over an index key part could not be pushed to the index together with the loose scan. As a result, loose index scan was selecting the first row in the index with a given GROUP BY prefix, and was applying the WHERE clause after that, while it should have inspected all rows with the given prefix, and apply the WHERE clause to all of them. The fix detects and skips such cases. sql/opt_range.cc 1.205 06/03/31 12:34:25 timour@stripped +26 -0 Handle the case when there is no MIN/MAX aggregate function, and a keypart of the index being considered, that is after the GROUP BY prefix, is used in the WHERE clause and the condition where it is used cannot be pushed to the index. If this is the case, we rule out this index. sql/item.h 1.186 06/03/31 12:34:25 timour@stripped +2 -0 Added new method [Item | Item_field]::find_item_in_field_list_processor. sql/item.cc 1.205 06/03/31 12:34:25 timour@stripped +33 -1 Added new method [Item | Item_field]::find_item_in_field_list_processor. mysql-test/t/group_min_max.test 1.19 06/03/31 12:34:25 timour@stripped +8 -0 Added test for BUG#16710. mysql-test/r/group_min_max.result 1.21 06/03/31 12:34:25 timour@stripped +9 -0 Added test for BUG#16710. # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: timour # Host: lamia.home # Root: /home/timka/mysql/src/5.0-bug-16710 --- 1.204/sql/item.cc 2006-01-24 19:15:08 +02:00 +++ 1.205/sql/item.cc 2006-03-31 12:34:25 +03:00 @@ -499,7 +499,7 @@ arguments in a condition the method must return false. RETURN - false to force the evaluation of collect_item_field_processor + FALSE to force the evaluation of collect_item_field_processor for the subsequent items. */ @@ -517,6 +517,38 @@ } item_list->push_back(this); DBUG_RETURN(FALSE); +} + + +/* + Check if an Item_field references some field from a list of fields. + + SYNOPSIS + Item_field::find_item_in_field_list_processor + arg Field being compared, arg must be of type Field + + DESCRIPTION + Check whether the Item_field represented by 'this' references any + of the fields in the keyparts passed via 'arg'. Used with the + method Item::walk() to test whether any keypart in a sequence of + keyparts is referenced in an expression. + + RETURN + TRUE if 'this' references the field 'arg' + FALE otherwise +*/ +bool Item_field::find_item_in_field_list_processor(byte *arg) +{ + KEY_PART_INFO *first_non_group_part= *((KEY_PART_INFO **) arg); + KEY_PART_INFO *last_part= *(((KEY_PART_INFO **) arg) + 1); + KEY_PART_INFO *cur_part; + + for (cur_part= first_non_group_part; cur_part != last_part; cur_part++) + { + if (field->eq(cur_part->field)) + return TRUE; + } + return FALSE; } --- 1.185/sql/item.h 2006-01-24 19:15:08 +02:00 +++ 1.186/sql/item.h 2006-03-31 12:34:25 +03:00 @@ -699,6 +699,7 @@ virtual bool remove_fixed(byte * arg) { fixed= 0; return 0; } virtual bool cleanup_processor(byte *arg); virtual bool collect_item_field_processor(byte * arg) { return 0; } + virtual bool find_item_in_field_list_processor(byte *arg) { return 0; } virtual bool change_context_processor(byte *context) { return 0; } virtual bool reset_query_id_processor(byte *query_id) { return 0; } @@ -1146,6 +1147,7 @@ bool is_null() { return field->is_null(); } Item *get_tmp_table_item(THD *thd); bool collect_item_field_processor(byte * arg); + bool find_item_in_field_list_processor(byte *arg); bool reset_query_id_processor(byte *arg) { field->query_id= *((query_id_t *) arg); --- 1.204/sql/opt_range.cc 2006-02-06 21:35:06 +02:00 +++ 1.205/sql/opt_range.cc 2006-03-31 12:34:25 +03:00 @@ -6876,6 +6876,7 @@ bool have_min, bool have_max, double *read_cost, ha_rows *records); + /* Test if this access method is applicable to a GROUP query with MIN/MAX functions, and if so, construct a new TRP object. @@ -7282,11 +7283,36 @@ } else if (min_max_arg_part && (min_max_arg_part - first_non_group_part > 0)) + { /* There is a gap but no range tree, thus no predicates at all for the non-group keyparts. */ goto next_index; + } + else if (first_non_group_part && join->conds) + { + /* + If there is no MIN/MAX function in the query, but some index + key part is referenced in the WHERE clause, then this index + cannot be used because the WHERE condition over the keypart's + field cannot be 'pushed' to the index (because there is no + range 'tree'), and the WHERE clause must be evaluated before + GROUP BY/DISTINCT. + */ + /* + Store the first and last keyparts that need to be analyzed + into one array that can be passed as parameter. + */ + KEY_PART_INFO *key_part_range[2]; + key_part_range[0]= first_non_group_part; + key_part_range[1]= last_part; + + /* Check if cur_part is referenced in the WHERE clause. */ + if (join->conds->walk(&Item::find_item_in_field_list_processor, + (byte*) key_part_range)) + goto next_index; + } } /* --- 1.20/mysql-test/r/group_min_max.result 2006-02-06 21:35:05 +02:00 +++ 1.21/mysql-test/r/group_min_max.result 2006-03-31 12:34:25 +03:00 @@ -1954,6 +1954,15 @@ explain select sum(ord(a1)) from t1 where (a1 > 'a') group by a1,a2,b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index idx_t1_0,idx_t1_1,idx_t1_2 idx_t1_1 163 NULL 128 Using where; Using index +explain select distinct(a1) from t1 where ord(a2) = 98; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 index NULL idx_t1_1 163 NULL 128 Using where; Using index +select distinct(a1) from t1 where ord(a2) = 98; +a1 +a +b +c +d explain select a1 from t1 where a2 = 'b' group by a1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range NULL idx_t1_1 130 NULL 5 Using where; Using index for group-by --- 1.18/mysql-test/t/group_min_max.test 2006-02-06 21:35:06 +02:00 +++ 1.19/mysql-test/t/group_min_max.test 2006-03-31 12:34:25 +03:00 @@ -641,6 +641,14 @@ explain select a1,a2,count(a2) from t1 where (a1 > 'a') group by a1,a2,b; explain select sum(ord(a1)) from t1 where (a1 > 'a') group by a1,a2,b; + +# +# Bug #16710: select distinct doesn't return all it should +# + +explain select distinct(a1) from t1 where ord(a2) = 98; +select distinct(a1) from t1 where ord(a2) = 98; + # # BUG#11044: DISTINCT or GROUP BY queries with equality predicates instead of MIN/MAX. #