Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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@stripped, 2007-03-09 17:57:51+02:00, gkodinov@stripped +12 -0
Bug #24484:
To correctly decide which predicates can be evaluated with a given table
the optimizer must know the exact set of tables that a predicate depends
on. If that mask is too wide (refer to non-existing tables) the optimizer
can erroneously skip a predicate.
One such case of wrong table usage mask were the aggregate functions.
The have a all-1 mask (meaning depend on all tables, including non-existent
ones).
Fixed by making a real used_tables mask for the aggregates. The mask is
constructed in the following way :
1. OR the table dependency masks of all the arguments of the aggregate.
2. If all the arguments of the function are from the local name resolution
context; it's not a MAX/MIN and it is evaluated in the same name resolution
context where it is referenced all the tables from that name resolution
context are OR-ed to the dependency mask. This is to denote that an
aggregate function depends on the number of rows it processes.
3. Handle correctly the case of an aggregate function optimization (such that
the aggregate function can be pre-calculated and made a constant).
Made sure that an aggregate function is never a constant (unless subject of a
specific optimization and pre-calculation).
One other flaw was revealed and fixed in the process : references were
not calling the recalculation method for used_tables of their targets.
mysql-test/r/subselect3.result@stripped, 2007-03-09 17:57:36+02:00, gkodinov@stripped +23 -0
Bug #24484: test case
mysql-test/t/subselect3.test@stripped, 2007-03-09 17:57:37+02:00, gkodinov@stripped +22 -0
Bug #24484: test case
sql/item.h@stripped, 2007-03-09 17:57:38+02:00, gkodinov@stripped +5 -0
Bug #24484: Item_ref must update the used tables.
sql/item_sum.cc@stripped, 2007-03-09 17:57:38+02:00, gkodinov@stripped +30 -6
Bug #24484: correct calculation of used_tables for aggregates.
sql/item_sum.h@stripped, 2007-03-09 17:57:39+02:00, gkodinov@stripped +36 -23
Bug #24484: correct calculation of used_tables for aggregates.
sql/mysql_priv.h@stripped, 2007-03-09 17:57:40+02:00, gkodinov@stripped +1 -1
Bug #24484: moved counting of leaf tables inside
setup_tables_and_check_access.
sql/sql_base.cc@stripped, 2007-03-09 17:57:40+02:00, gkodinov@stripped +6 -0
Bug #24484: moved counting of leaf tables inside
setup_tables_and_check_access.
sql/sql_delete.cc@stripped, 2007-03-09 17:57:41+02:00, gkodinov@stripped +2 -2
Bug #24484: moved counting of leaf tables inside
setup_tables_and_check_access.
sql/sql_insert.cc@stripped, 2007-03-09 17:57:42+02:00, gkodinov@stripped +1 -1
Bug #24484: moved counting of leaf tables inside
setup_tables_and_check_access.
sql/sql_load.cc@stripped, 2007-03-09 17:57:43+02:00, gkodinov@stripped +2 -1
Bug #24484: moved counting of leaf tables inside
setup_tables_and_check_access.
sql/sql_select.cc@stripped, 2007-03-09 17:57:43+02:00, gkodinov@stripped +13 -9
Bug #24484: correct check for aggregates
sql/sql_update.cc@stripped, 2007-03-09 17:57:44+02:00, gkodinov@stripped +2 -2
Bug #24484: moved counting of leaf tables inside
setup_tables_and_check_access.
# 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: gkodinov
# Host: macbook.gmz
# Root: /Users/kgeorge/mysql/work/B24484-5.0
--- 1.219/sql/item.h 2007-01-26 19:33:16 +02:00
+++ 1.220/sql/item.h 2007-03-09 17:57:38 +02:00
@@ -1881,6 +1881,11 @@ public:
{
return depended_from ? OUTER_REF_TABLE_BIT : (*ref)->used_tables();
}
+ void update_used_tables()
+ {
+ if (!depended_from)
+ (*ref)->update_used_tables();
+ }
table_map not_null_tables() const { return (*ref)->not_null_tables(); }
void set_result_field(Field *field) { result_field= field; }
bool is_result_field() { return 1; }
--- 1.194/sql/item_sum.cc 2006-12-27 07:28:20 +02:00
+++ 1.195/sql/item_sum.cc 2007-03-09 17:57:38 +02:00
@@ -61,6 +61,7 @@ bool Item_sum::init_sum_func_check(THD *
/* Save a pointer to object to be used in items for nested set functions */
thd->lex->in_sum_func= this;
nest_level= thd->lex->current_select->nest_level;
+ nest_level_tables_count= thd->lex->current_select->join->tables;
ref_by= 0;
aggr_level= -1;
max_arg_level= -1;
@@ -176,6 +177,7 @@ bool Item_sum::check_sum_func(THD *thd,
*/
set_if_bigger(in_sum_func->max_sum_func_level, aggr_level);
}
+ update_used_tables();
thd->lex->in_sum_func= in_sum_func;
return FALSE;
}
@@ -271,8 +273,8 @@ bool Item_sum::register_sum_func(THD *th
}
-Item_sum::Item_sum(List<Item> &list)
- :arg_count(list.elements)
+Item_sum::Item_sum(List<Item> &list) :arg_count(list.elements),
+ forced_const(FALSE)
{
if ((args=(Item**) sql_alloc(sizeof(Item*)*arg_count)))
{
@@ -296,7 +298,10 @@ Item_sum::Item_sum(List<Item> &list)
Item_sum::Item_sum(THD *thd, Item_sum *item):
Item_result_field(thd, item), arg_count(item->arg_count),
- quick_group(item->quick_group)
+ nest_level(item->nest_level), aggr_level(item->aggr_level),
+ quick_group(item->quick_group), used_tables_cache(item->used_tables_cache),
+ forced_const(item->forced_const),
+ nest_level_tables_count(item->nest_level_tables_count)
{
if (arg_count <= 2)
args=tmp_args;
@@ -425,6 +430,26 @@ case DECIMAL_RESULT:
}
+void Item_sum::update_used_tables ()
+{
+ if (!forced_const)
+ {
+ used_tables_cache= 0;
+ for (uint i=0 ; i < arg_count ; i++)
+ {
+ args[i]->update_used_tables();
+ used_tables_cache|= args[i]->used_tables();
+ }
+
+ used_tables_cache&= PSEUDO_TABLE_BITS;
+
+ /* the aggregate function is aggregated into its local context */
+ if (aggr_level == nest_level)
+ used_tables_cache |= (1 << nest_level_tables_count) - 1;
+ }
+}
+
+
String *
Item_sum_num::val_str(String *str)
{
@@ -484,7 +509,7 @@ Item_sum_num::fix_fields(THD *thd, Item
Item_sum_hybrid::Item_sum_hybrid(THD *thd, Item_sum_hybrid *item)
:Item_sum(thd, item), value(item->value), hybrid_type(item->hybrid_type),
hybrid_field_type(item->hybrid_field_type), cmp_sign(item->cmp_sign),
- used_table_cache(item->used_table_cache), was_values(item->was_values)
+ was_values(item->was_values)
{
/* copy results from old value */
switch (hybrid_type) {
@@ -1072,7 +1097,6 @@ void Item_sum_count::cleanup()
DBUG_ENTER("Item_sum_count::cleanup");
count= 0;
Item_sum_int::cleanup();
- used_table_cache= ~(table_map) 0;
DBUG_VOID_RETURN;
}
@@ -1553,7 +1577,7 @@ void Item_sum_hybrid::cleanup()
{
DBUG_ENTER("Item_sum_hybrid::cleanup");
Item_sum::cleanup();
- used_table_cache= ~(table_map) 0;
+ forced_const= FALSE;
/*
by default it is TRUE to avoid TRUE reporting by
--- 1.110/sql/item_sum.h 2007-01-11 16:40:02 +02:00
+++ 1.111/sql/item_sum.h 2007-03-09 17:57:39 +02:00
@@ -215,7 +215,9 @@
TODO: to catch queries where the limit is exceeded to make the
code clean here.
-*/
+*/
+
+class st_select_lex;
class Item_sum :public Item_result_field
{
@@ -237,19 +239,26 @@ public:
int8 max_sum_func_level;/* max level of aggregation for embedded functions */
bool quick_group; /* If incremental update of fields */
+protected:
+ table_map used_tables_cache;
+ bool forced_const;
+ uint nest_level_tables_count;
+
+public:
+
void mark_as_sum_func();
- Item_sum() :arg_count(0), quick_group(1)
+ Item_sum() :arg_count(0), quick_group(1), forced_const(FALSE)
{
mark_as_sum_func();
}
- Item_sum(Item *a)
- :args(tmp_args), arg_count(1), quick_group(1)
+ Item_sum(Item *a) :args(tmp_args), arg_count(1), quick_group(1),
+ forced_const(FALSE)
{
args[0]=a;
mark_as_sum_func();
}
- Item_sum( Item *a, Item *b )
- :args(tmp_args), arg_count(2), quick_group(1)
+ Item_sum( Item *a, Item *b ) :args(tmp_args), arg_count(2), quick_group(1),
+ forced_const(FALSE)
{
args[0]=a; args[1]=b;
mark_as_sum_func();
@@ -319,10 +328,20 @@ public:
virtual const char *func_name() const= 0;
virtual Item *result_item(Field *field)
{ return new Item_field(field); }
- table_map used_tables() const { return ~(table_map) 0; } /* Not used */
- bool const_item() const { return 0; }
+ table_map used_tables() const { return used_tables_cache; }
+ void update_used_tables ();
+ void cleanup()
+ {
+ Item::cleanup();
+ forced_const= FALSE;
+ }
bool is_null() { return null_value; }
- void update_used_tables() { }
+ void make_const ()
+ {
+ used_tables_cache= 0;
+ forced_const= TRUE;
+ }
+ virtual bool const_item() const { return forced_const; }
void make_field(Send_field *field);
void print(String *str);
void fix_num_length_and_dec();
@@ -509,23 +528,23 @@ public:
class Item_sum_count :public Item_sum_int
{
longlong count;
- table_map used_table_cache;
public:
Item_sum_count(Item *item_par)
- :Item_sum_int(item_par),count(0),used_table_cache(~(table_map) 0)
+ :Item_sum_int(item_par),count(0)
{}
Item_sum_count(THD *thd, Item_sum_count *item)
- :Item_sum_int(thd, item), count(item->count),
- used_table_cache(item->used_table_cache)
+ :Item_sum_int(thd, item), count(item->count)
{}
- table_map used_tables() const { return used_table_cache; }
- bool const_item() const { return !used_table_cache; }
enum Sumfunctype sum_func () const { return COUNT_FUNC; }
void clear();
void no_rows_in_result() { count=0; }
bool add();
- void make_const(longlong count_arg) { count=count_arg; used_table_cache=0; }
+ void make_const(longlong count_arg)
+ {
+ count=count_arg;
+ Item_sum::make_const();
+ }
longlong val_int();
void reset_field();
void cleanup();
@@ -805,28 +824,22 @@ protected:
Item_result hybrid_type;
enum_field_types hybrid_field_type;
int cmp_sign;
- table_map used_table_cache;
bool was_values; // Set if we have found at least one row (for max/min only)
public:
Item_sum_hybrid(Item *item_par,int sign)
:Item_sum(item_par), sum(0.0), sum_int(0),
hybrid_type(INT_RESULT), hybrid_field_type(FIELD_TYPE_LONGLONG),
- cmp_sign(sign), used_table_cache(~(table_map) 0),
- was_values(TRUE)
+ cmp_sign(sign), was_values(TRUE)
{ collation.set(&my_charset_bin); }
Item_sum_hybrid(THD *thd, Item_sum_hybrid *item);
bool fix_fields(THD *, Item **);
- table_map used_tables() const { return used_table_cache; }
- bool const_item() const { return !used_table_cache; }
-
void clear();
double val_real();
longlong val_int();
my_decimal *val_decimal(my_decimal *);
void reset_field();
String *val_str(String *);
- void make_const() { used_table_cache=0; }
bool keep_field_type(void) const { return 1; }
enum Item_result result_type () const { return hybrid_type; }
enum enum_field_types field_type() const { return hybrid_field_type; }
--- 1.432/sql/mysql_priv.h 2007-01-31 16:12:41 +02:00
+++ 1.433/sql/mysql_priv.h 2007-03-09 17:57:40 +02:00
@@ -1012,7 +1012,7 @@ bool setup_tables_and_check_access (THD
Name_resolution_context *context,
List<TABLE_LIST> *from_clause,
TABLE_LIST *tables, Item **conds,
- TABLE_LIST **leaves,
+ TABLE_LIST **leaves, uint *leaf_count,
bool select_insert,
ulong want_access_first,
ulong want_access);
--- 1.365/sql/sql_base.cc 2007-01-31 16:04:28 +02:00
+++ 1.366/sql/sql_base.cc 2007-03-09 17:57:40 +02:00
@@ -4632,6 +4632,7 @@ bool setup_tables(THD *thd, Name_resolut
tables Table list (select_lex->table_list)
conds Condition of current SELECT (can be changed by VIEW)
leaves List of join table leaves list (select_lex->leaf_tables)
+ leaf_count Optional. Pointer to an plase to accumulate the count.
refresh It is onle refresh for subquery
select_insert It is SELECT ... INSERT command
want_access what access is needed
@@ -4649,12 +4650,14 @@ bool setup_tables_and_check_access(THD *
List<TABLE_LIST> *from_clause,
TABLE_LIST *tables,
Item **conds, TABLE_LIST **leaves,
+ uint *leaf_count,
bool select_insert,
ulong want_access_first,
ulong want_access)
{
TABLE_LIST *leaves_tmp = NULL;
bool first_table= true;
+ uint leaf_count_tmp= 0;
if (setup_tables (thd, context, from_clause, tables, conds,
&leaves_tmp, select_insert))
@@ -4673,7 +4676,10 @@ bool setup_tables_and_check_access(THD *
return TRUE;
}
first_table= false;
+ leaf_count_tmp++;
}
+ if (leaf_count)
+ *leaf_count= leaf_count_tmp;
return FALSE;
}
--- 1.191/sql/sql_delete.cc 2007-02-01 10:54:43 +02:00
+++ 1.192/sql/sql_delete.cc 2007-03-09 17:57:41 +02:00
@@ -358,7 +358,7 @@ bool mysql_prepare_delete(THD *thd, TABL
if (setup_tables_and_check_access(thd, &thd->lex->select_lex.context,
&thd->lex->select_lex.top_join_list,
table_list, conds,
- &select_lex->leaf_tables, FALSE,
+ &select_lex->leaf_tables, NULL, FALSE,
DELETE_ACL, SELECT_ACL) ||
setup_conds(thd, table_list, select_lex->leaf_tables, conds) ||
setup_ftfuncs(select_lex))
@@ -421,7 +421,7 @@ bool mysql_multi_delete_prepare(THD *thd
if (setup_tables_and_check_access(thd, &thd->lex->select_lex.context,
&thd->lex->select_lex.top_join_list,
lex->query_tables, &lex->select_lex.where,
- &lex->select_lex.leaf_tables, FALSE,
+ &lex->select_lex.leaf_tables, NULL, FALSE,
DELETE_ACL, SELECT_ACL))
DBUG_RETURN(TRUE);
--- 1.214/sql/sql_insert.cc 2007-01-23 12:04:15 +02:00
+++ 1.215/sql/sql_insert.cc 2007-03-09 17:57:42 +02:00
@@ -903,7 +903,7 @@ static bool mysql_prepare_insert_check_t
if (setup_tables_and_check_access(thd, &thd->lex->select_lex.context,
&thd->lex->select_lex.top_join_list,
table_list, where,
- &thd->lex->select_lex.leaf_tables,
+ &thd->lex->select_lex.leaf_tables, NULL,
select_insert, INSERT_ACL, SELECT_ACL))
DBUG_RETURN(TRUE);
--- 1.104/sql/sql_load.cc 2006-12-30 22:02:07 +02:00
+++ 1.105/sql/sql_load.cc 2007-03-09 17:57:43 +02:00
@@ -151,7 +151,8 @@ bool mysql_load(THD *thd,sql_exchange *e
if (setup_tables_and_check_access(thd, &thd->lex->select_lex.context,
&thd->lex->select_lex.top_join_list,
table_list, &unused_conds,
- &thd->lex->select_lex.leaf_tables, FALSE,
+ &thd->lex->select_lex.leaf_tables, NULL,
+ FALSE,
INSERT_ACL | UPDATE_ACL,
INSERT_ACL | UPDATE_ACL))
DBUG_RETURN(-1);
--- 1.488/sql/sql_select.cc 2007-02-01 10:50:33 +02:00
+++ 1.489/sql/sql_select.cc 2007-03-09 17:57:43 +02:00
@@ -345,9 +345,17 @@ JOIN::prepare(Item ***rref_pointer_array
if ((!(select_options & OPTION_SETUP_TABLES_DONE) &&
setup_tables_and_check_access(thd, &select_lex->context, join_list,
tables_list, &conds,
- &select_lex->leaf_tables, FALSE,
- SELECT_ACL, SELECT_ACL)) ||
- setup_wild(thd, tables_list, fields_list, &all_fields, wild_num) ||
+ &select_lex->leaf_tables, &tables,
+ FALSE,
+ SELECT_ACL, SELECT_ACL)))
+ DBUG_RETURN(-1);
+
+ TABLE_LIST *table_ptr;
+ for (table_ptr= select_lex->leaf_tables, tables=0; table_ptr;
+ table_ptr= table_ptr->next_leaf)
+ tables++;
+
+ if (setup_wild(thd, tables_list, fields_list, &all_fields, wild_num) ||
select_lex->setup_ref_array(thd, og_num) ||
setup_fields(thd, (*rref_pointer_array), fields_list, 1,
&all_fields, 1) ||
@@ -437,11 +445,6 @@ JOIN::prepare(Item ***rref_pointer_array
DBUG_RETURN(-1);
}
}
- TABLE_LIST *table_ptr;
- for (table_ptr= select_lex->leaf_tables;
- table_ptr;
- table_ptr= table_ptr->next_leaf)
- tables++;
}
{
/* Caclulate the number of groups */
@@ -6376,7 +6379,8 @@ static void update_depend_map(JOIN *join
order->item[0]->update_used_tables();
order->depend_map=depend_map=order->item[0]->used_tables();
// Not item_sum(), RAND() and no reference to table outside of sub select
- if (!(order->depend_map & (OUTER_REF_TABLE_BIT | RAND_TABLE_BIT)))
+ if (!(order->depend_map & (OUTER_REF_TABLE_BIT | RAND_TABLE_BIT))
+ && !order->item[0]->with_sum_func)
{
for (JOIN_TAB **tab=join->map2table;
depend_map ;
--- 1.210/sql/sql_update.cc 2007-01-26 14:36:48 +02:00
+++ 1.211/sql/sql_update.cc 2007-03-09 17:57:44 +02:00
@@ -624,7 +624,7 @@ bool mysql_prepare_update(THD *thd, TABL
if (setup_tables_and_check_access(thd, &select_lex->context,
&select_lex->top_join_list,
table_list, conds,
- &select_lex->leaf_tables,
+ &select_lex->leaf_tables, NULL,
FALSE, UPDATE_ACL, SELECT_ACL) ||
setup_conds(thd, table_list, select_lex->leaf_tables, conds) ||
select_lex->setup_ref_array(thd, order_num) ||
@@ -719,7 +719,7 @@ reopen_tables:
if (setup_tables_and_check_access(thd, &lex->select_lex.context,
&lex->select_lex.top_join_list,
table_list, &lex->select_lex.where,
- &lex->select_lex.leaf_tables, FALSE,
+ &lex->select_lex.leaf_tables, NULL, FALSE,
UPDATE_ACL, SELECT_ACL))
DBUG_RETURN(TRUE);
--- 1.4/mysql-test/r/subselect3.result 2007-01-27 03:10:42 +02:00
+++ 1.5/mysql-test/r/subselect3.result 2007-03-09 17:57:36 +02:00
@@ -645,3 +645,26 @@ a b Z
2 2 0
3 3 1
drop table t1,t2;
+CREATE TABLE t1 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));
+INSERT INTO t1 VALUES (1,1,'a'), (1,2,'b'), (1,3,'c'), (1,4,'d'), (1,5,'e'),
+(2,1,'f'), (2,2,'g'), (2,3,'h'), (3,4,'i'),(3,3,'j'), (3,2,'k'), (3,1,'l'),
+(1,9,'m');
+CREATE TABLE t2 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));
+INSERT INTO t2 SELECT * FROM t1;
+SELECT a, MAX(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b))
+as test FROM t1 GROUP BY a;
+a MAX(b) test
+1 9 m
+2 3 h
+3 4 i
+SELECT * FROM t1 GROUP by t1.a
+HAVING (MAX(t1.b) > (SELECT MAX(t2.b) FROM t2 WHERE t2.c < t1.c
+HAVING MAX(t2.b+t1.a) < 10));
+a b c
+SELECT a, AVG(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=AVG(t1.b))
+AS test FROM t1 GROUP BY a;
+a AVG(b) test
+1 4.0000 NULL
+2 2.0000 k
+3 2.5000 NULL
+DROP TABLE t1, t2;
--- 1.5/mysql-test/t/subselect3.test 2007-01-27 03:10:42 +02:00
+++ 1.6/mysql-test/t/subselect3.test 2007-03-09 17:57:37 +02:00
@@ -489,3 +489,25 @@ select a, b, (a,b) in (select a, min(b)
drop table t1,t2;
+#
+# Bug #24484: Aggregate function used in column list subquery gives erroneous
+# error
+#
+CREATE TABLE t1 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));
+INSERT INTO t1 VALUES (1,1,'a'), (1,2,'b'), (1,3,'c'), (1,4,'d'), (1,5,'e'),
+ (2,1,'f'), (2,2,'g'), (2,3,'h'), (3,4,'i'),(3,3,'j'), (3,2,'k'), (3,1,'l'),
+ (1,9,'m');
+CREATE TABLE t2 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));
+INSERT INTO t2 SELECT * FROM t1;
+
+# Gives error, but should work since it is (a, b) is the PK so only one
+# given match possible
+SELECT a, MAX(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b))
+ as test FROM t1 GROUP BY a;
+SELECT * FROM t1 GROUP by t1.a
+ HAVING (MAX(t1.b) > (SELECT MAX(t2.b) FROM t2 WHERE t2.c < t1.c
+ HAVING MAX(t2.b+t1.a) < 10));
+SELECT a, AVG(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=AVG(t1.b))
+ AS test FROM t1 GROUP BY a;
+
+DROP TABLE t1, t2;
| Thread |
|---|
| • bk commit into 5.0 tree (gkodinov:1.2400) BUG#24484 | kgeorge | 9 Mar |
