Skip to content

M
MariaDB
Commit c78ae205 authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua
Browse files
Options

ALL/ANY/SOME 

decreasing number of rules in sql_yacc.yy to satisfy bison limitation
fixed subselect Items initializer methods
parent 7e8b8cdd
Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 52 deletions
mysql-test/r/subselect.result
View file @ c78ae205
...@@ -106,6 +106,36 @@ select * from t3 where a not in (select b from t2); ...@@ -106,6 +106,36 @@ select * from t3 where a not in (select b from t2);
a a
6 6
3 3
select * from t3 where a = some (select b from t2);
a
7
select * from t3 where a <> any (select b from t2);
a
6
3
select * from t3 where a = all (select b from t2);
a
7
select * from t3 where a <> all (select b from t2);
a
6
3
insert into t2 values (100, 5);
select * from t3 where a < any (select b from t2);
a
6
3
select * from t3 where a < all (select b from t2);
a
3
select * from t3 where a >= any (select b from t2);
a
6
7
select * from t3 where a >= all (select b from t2);
a
7
delete from t2 where a=100;
select * from t3 where a in (select a,b from t2); select * from t3 where a in (select a,b from t2);
Subselect returns more than 1 field Subselect returns more than 1 field
select * from t3 where a in (select * from t2); select * from t3 where a in (select * from t2);
...@@ -241,6 +271,26 @@ topic date pseudo ...@@ -241,6 +271,26 @@ topic date pseudo
43506 2002-10-02 joce 43506 2002-10-02 joce
SELECT * from searchconthardwarefr3 where topic IN (SELECT SUM(topic) FROM searchconthardwarefr3); SELECT * from searchconthardwarefr3 where topic IN (SELECT SUM(topic) FROM searchconthardwarefr3);
topic date pseudo topic date pseudo
SELECT * from searchconthardwarefr3 where topic = any (SELECT topic FROM searchconthardwarefr3 GROUP BY date);
topic date pseudo
40143 2002-08-03 joce
43506 2002-10-02 joce
SELECT * from searchconthardwarefr3 where topic = any (SELECT topic FROM searchconthardwarefr3 GROUP BY date HAVING topic < 4100);
topic date pseudo
43506 2002-10-02 joce
SELECT * from searchconthardwarefr3 where topic = any (SELECT SUM(topic) FROM searchconthardwarefr3);
topic date pseudo
SELECT * from searchconthardwarefr3 where topic = all (SELECT topic FROM searchconthardwarefr3 GROUP BY date);
topic date pseudo
SELECT * from searchconthardwarefr3 where topic = all (SELECT topic FROM searchconthardwarefr3 GROUP BY date HAVING topic < 4100);
topic date pseudo
40143 2002-08-03 joce
SELECT * from searchconthardwarefr3 where topic = all (SELECT SUM(topic) FROM searchconthardwarefr3);
topic date pseudo
SELECT * from searchconthardwarefr3 where topic <> any (SELECT SUM(topic) FROM searchconthardwarefr3);
topic date pseudo
40143 2002-08-03 joce
43506 2002-10-02 joce
CREATE TABLE `forumconthardwarefr7` ( CREATE TABLE `forumconthardwarefr7` (
`numeropost` mediumint(8) unsigned NOT NULL auto_increment, `numeropost` mediumint(8) unsigned NOT NULL auto_increment,
`maxnumrep` int(10) unsigned NOT NULL default '0', `maxnumrep` int(10) unsigned NOT NULL default '0',
......
mysql-test/t/subselect.test
View file @ c78ae205
...@@ -36,6 +36,16 @@ select * from t3 where exists (select * from t2 where t2.b=t3.a); ...@@ -36,6 +36,16 @@ select * from t3 where exists (select * from t2 where t2.b=t3.a);
select * from t3 where not exists (select * from t2 where t2.b=t3.a); select * from t3 where not exists (select * from t2 where t2.b=t3.a);
select * from t3 where a in (select b from t2); select * from t3 where a in (select b from t2);
select * from t3 where a not in (select b from t2); select * from t3 where a not in (select b from t2);
select * from t3 where a = some (select b from t2);
select * from t3 where a <> any (select b from t2);
select * from t3 where a = all (select b from t2);
select * from t3 where a <> all (select b from t2);
insert into t2 values (100, 5);
select * from t3 where a < any (select b from t2);
select * from t3 where a < all (select b from t2);
select * from t3 where a >= any (select b from t2);
select * from t3 where a >= all (select b from t2);
delete from t2 where a=100;
-- error 1239 -- error 1239
select * from t3 where a in (select a,b from t2); select * from t3 where a in (select a,b from t2);
-- error 1239 -- error 1239
...@@ -125,6 +135,13 @@ SELECT 1 IN (SELECT 1 FROM searchconthardwarefr3 HAVING a); ...@@ -125,6 +135,13 @@ SELECT 1 IN (SELECT 1 FROM searchconthardwarefr3 HAVING a);
SELECT * from searchconthardwarefr3 where topic IN (SELECT topic FROM searchconthardwarefr3 GROUP BY date); SELECT * from searchconthardwarefr3 where topic IN (SELECT topic FROM searchconthardwarefr3 GROUP BY date);
SELECT * from searchconthardwarefr3 where topic IN (SELECT topic FROM searchconthardwarefr3 GROUP BY date HAVING topic < 4100); SELECT * from searchconthardwarefr3 where topic IN (SELECT topic FROM searchconthardwarefr3 GROUP BY date HAVING topic < 4100);
SELECT * from searchconthardwarefr3 where topic IN (SELECT SUM(topic) FROM searchconthardwarefr3); SELECT * from searchconthardwarefr3 where topic IN (SELECT SUM(topic) FROM searchconthardwarefr3);
SELECT * from searchconthardwarefr3 where topic = any (SELECT topic FROM searchconthardwarefr3 GROUP BY date);
SELECT * from searchconthardwarefr3 where topic = any (SELECT topic FROM searchconthardwarefr3 GROUP BY date HAVING topic < 4100);
SELECT * from searchconthardwarefr3 where topic = any (SELECT SUM(topic) FROM searchconthardwarefr3);
SELECT * from searchconthardwarefr3 where topic = all (SELECT topic FROM searchconthardwarefr3 GROUP BY date);
SELECT * from searchconthardwarefr3 where topic = all (SELECT topic FROM searchconthardwarefr3 GROUP BY date HAVING topic < 4100);
SELECT * from searchconthardwarefr3 where topic = all (SELECT SUM(topic) FROM searchconthardwarefr3);
SELECT * from searchconthardwarefr3 where topic <> any (SELECT SUM(topic) FROM searchconthardwarefr3);
CREATE TABLE `forumconthardwarefr7` ( CREATE TABLE `forumconthardwarefr7` (
`numeropost` mediumint(8) unsigned NOT NULL auto_increment, `numeropost` mediumint(8) unsigned NOT NULL auto_increment,
`maxnumrep` int(10) unsigned NOT NULL default '0', `maxnumrep` int(10) unsigned NOT NULL default '0',
......
sql/item_cmpfunc.cc
View file @ c78ae205
...@@ -24,6 +24,30 @@ ...@@ -24,6 +24,30 @@
#include "mysql_priv.h" #include "mysql_priv.h"
#include <m_ctype.h> #include <m_ctype.h>
Item_bool_func2* Item_bool_func2::eq_creator(Item *a, Item *b)
{
return new Item_func_eq(a, b);
}
Item_bool_func2* Item_bool_func2::ne_creator(Item *a, Item *b)
{
return new Item_func_ne(a, b);
}
Item_bool_func2* Item_bool_func2::gt_creator(Item *a, Item *b)
{
return new Item_func_gt(a, b);
}
Item_bool_func2* Item_bool_func2::lt_creator(Item *a, Item *b)
{
return new Item_func_lt(a, b);
}
Item_bool_func2* Item_bool_func2::ge_creator(Item *a, Item *b)
{
return new Item_func_ge(a, b);
}
Item_bool_func2* Item_bool_func2::le_creator(Item *a, Item *b)
{
return new Item_func_le(a, b);
}
/* /*
Test functions Test functions
......
sql/item_cmpfunc.h
View file @ c78ae205
...@@ -47,6 +47,13 @@ class Item_bool_func2 :public Item_int_func ...@@ -47,6 +47,13 @@ class Item_bool_func2 :public Item_int_func
bool have_rev_func() const { return rev_functype() != UNKNOWN_FUNC; } bool have_rev_func() const { return rev_functype() != UNKNOWN_FUNC; }
void print(String *str) { Item_func::print_op(str); } void print(String *str) { Item_func::print_op(str); }
bool is_null() { return test(args[0]->is_null() || args[1]->is_null()); } bool is_null() { return test(args[0]->is_null() || args[1]->is_null()); }
static Item_bool_func2* eq_creator(Item *a, Item *b);
static Item_bool_func2* ne_creator(Item *a, Item *b);
static Item_bool_func2* gt_creator(Item *a, Item *b);
static Item_bool_func2* lt_creator(Item *a, Item *b);
static Item_bool_func2* ge_creator(Item *a, Item *b);
static Item_bool_func2* le_creator(Item *a, Item *b);
}; };
......
sql/item_subselect.cc
View file @ c78ae205
...@@ -44,13 +44,13 @@ Item_subselect::Item_subselect(): ...@@ -44,13 +44,13 @@ Item_subselect::Item_subselect():
} }
void Item_subselect::init(THD *thd, st_select_lex *select_lex, void Item_subselect::init(THD *thd, st_select_lex *select_lex,
select_subselect *result, Item *left_expr) select_subselect *result)
{ {
DBUG_ENTER("Item_subselect::init"); DBUG_ENTER("Item_subselect::init");
DBUG_PRINT("subs", ("select_lex 0x%xl", (ulong) select_lex)); DBUG_PRINT("subs", ("select_lex 0x%xl", (ulong) select_lex));
select_transformer(select_lex, left_expr); select_transformer(select_lex);
if (select_lex->next_select()) if (select_lex->next_select())
engine= new subselect_union_engine(thd, select_lex->master_unit(), result, engine= new subselect_union_engine(thd, select_lex->master_unit(), result,
this); this);
...@@ -66,8 +66,7 @@ Item_subselect::~Item_subselect() ...@@ -66,8 +66,7 @@ Item_subselect::~Item_subselect()
delete engine; delete engine;
} }
void Item_subselect::select_transformer(st_select_lex *select_lex, void Item_subselect::select_transformer(st_select_lex *select_lex)
Item *left_expr)
{ {
DBUG_ENTER("Item_subselect::select_transformer"); DBUG_ENTER("Item_subselect::select_transformer");
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
...@@ -119,7 +118,7 @@ Item_singleval_subselect::Item_singleval_subselect(THD *thd, ...@@ -119,7 +118,7 @@ Item_singleval_subselect::Item_singleval_subselect(THD *thd,
Item_subselect() Item_subselect()
{ {
DBUG_ENTER("Item_singleval_subselect::Item_singleval_subselect"); DBUG_ENTER("Item_singleval_subselect::Item_singleval_subselect");
init(thd, select_lex, new select_singleval_subselect(this), 0); init(thd, select_lex, new select_singleval_subselect(this));
max_columns= 1; max_columns= 1;
maybe_null= 1; maybe_null= 1;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
...@@ -167,12 +166,11 @@ String *Item_singleval_subselect::val_str (String *str) ...@@ -167,12 +166,11 @@ String *Item_singleval_subselect::val_str (String *str)
} }
Item_exists_subselect::Item_exists_subselect(THD *thd, Item_exists_subselect::Item_exists_subselect(THD *thd,
st_select_lex *select_lex, st_select_lex *select_lex):
Item *left_expr):
Item_subselect() Item_subselect()
{ {
DBUG_ENTER("Item_exists_subselect::Item_exists_subselect"); DBUG_ENTER("Item_exists_subselect::Item_exists_subselect");
init(thd, select_lex, new select_exists_subselect(this), left_expr); init(thd, select_lex, new select_exists_subselect(this));
max_columns= UINT_MAX; max_columns= UINT_MAX;
null_value= 0; //can't be NULL null_value= 0; //can't be NULL
maybe_null= 0; //can't be NULL maybe_null= 0; //can't be NULL
...@@ -182,12 +180,31 @@ Item_exists_subselect::Item_exists_subselect(THD *thd, ...@@ -182,12 +180,31 @@ Item_exists_subselect::Item_exists_subselect(THD *thd,
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
Item_in_subselect::Item_in_subselect(THD *thd, Item * left_expr, Item_in_subselect::Item_in_subselect(THD *thd, Item * left_exp,
st_select_lex *select_lex): st_select_lex *select_lex):
Item_exists_subselect() Item_exists_subselect()
{ {
DBUG_ENTER("Item_in_subselect::Item_in_subselect"); DBUG_ENTER("Item_in_subselect::Item_in_subselect");
init(thd, select_lex, new select_exists_subselect(this), left_expr); left_expr= left_exp;
init(thd, select_lex, new select_exists_subselect(this));
max_columns= UINT_MAX;
null_value= 0; //can't be NULL
maybe_null= 0; //can't be NULL
value= 0;
// We need only 1 row to determinate existence
select_lex->master_unit()->global_parameters->select_limit= 1;
DBUG_VOID_RETURN;
}
Item_allany_subselect::Item_allany_subselect(THD *thd, Item * left_exp,
compare_func_creator f,
st_select_lex *select_lex):
Item_in_subselect()
{
DBUG_ENTER("Item_in_subselect::Item_in_subselect");
left_expr= left_exp;
func= f;
init(thd, select_lex, new select_exists_subselect(this));
max_columns= UINT_MAX; max_columns= UINT_MAX;
null_value= 0; //can't be NULL null_value= 0; //can't be NULL
maybe_null= 0; //can't be NULL maybe_null= 0; //can't be NULL
...@@ -201,7 +218,6 @@ Item_in_subselect::Item_in_subselect(THD *thd, Item * left_expr, ...@@ -201,7 +218,6 @@ Item_in_subselect::Item_in_subselect(THD *thd, Item * left_expr,
void Item_exists_subselect::fix_length_and_dec() void Item_exists_subselect::fix_length_and_dec()
{ {
max_length= 1; max_length= 1;
} }
double Item_exists_subselect::val () double Item_exists_subselect::val ()
...@@ -238,12 +254,20 @@ String *Item_exists_subselect::val_str(String *str) ...@@ -238,12 +254,20 @@ String *Item_exists_subselect::val_str(String *str)
Item_in_subselect::Item_in_subselect(Item_in_subselect *item): Item_in_subselect::Item_in_subselect(Item_in_subselect *item):
Item_exists_subselect(item) Item_exists_subselect(item)
{ {
left_expr= item->left_expr;
} }
void Item_in_subselect::select_transformer(st_select_lex *select_lex, Item_allany_subselect::Item_allany_subselect(Item_allany_subselect *item):
Item *left_expr) Item_in_subselect(item)
{ {
DBUG_ENTER("Item_in_subselect::select_transformer"); func= item->func;
}
void Item_in_subselect::single_value_transformer(st_select_lex *select_lex,
Item *left_expr,
compare_func_creator func)
{
DBUG_ENTER("Item_in_subselect::single_value_transformer");
for(SELECT_LEX * sl= select_lex; sl; sl= sl->next_select()) for(SELECT_LEX * sl= select_lex; sl; sl= sl->next_select())
{ {
Item *item; Item *item;
...@@ -260,28 +284,38 @@ void Item_in_subselect::select_transformer(st_select_lex *select_lex, ...@@ -260,28 +284,38 @@ void Item_in_subselect::select_transformer(st_select_lex *select_lex,
if (sl->having || sl->with_sum_func || sl->group_list.first) if (sl->having || sl->with_sum_func || sl->group_list.first)
{ {
sl->item_list.push_back(item); sl->item_list.push_back(item);
item= new Item_ref(sl->item_list.head_ref(), 0, "<result>"); item= (*func)(left_expr, new Item_ref(sl->item_list.head_ref(),
0, "<result>"));
if (sl->having) if (sl->having)
sl->having= new Item_cond_and(sl->having, sl->having= new Item_cond_and(sl->having, item);
new Item_func_eq(item, left_expr));
else else
sl->having= new Item_func_eq(item, left_expr); sl->having= item;
} }
else else
{ {
sl->item_list.empty(); sl->item_list.empty();
sl->item_list.push_back(new Item_int(1)); sl->item_list.push_back(new Item_int(1));
item= new Item_asterisk_remover(item); item= (*func)(left_expr, new Item_asterisk_remover(item));
if (sl->where) if (sl->where)
sl->where= new Item_cond_and(sl->where, sl->where= new Item_cond_and(sl->where, item);
new Item_func_eq(item, left_expr));
else else
sl->where= new Item_func_eq(item, left_expr); sl->where= item;
} }
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
void Item_in_subselect::select_transformer(st_select_lex *select_lex)
{
single_value_transformer(select_lex, left_expr,
&Item_bool_func2::eq_creator);
}
void Item_allany_subselect::select_transformer(st_select_lex *select_lex)
{
single_value_transformer(select_lex, left_expr, func);
}
subselect_single_select_engine::subselect_single_select_engine(THD *thd, subselect_single_select_engine::subselect_single_select_engine(THD *thd,
st_select_lex *select, st_select_lex *select,
select_subselect *result, select_subselect *result,
......
sql/item_subselect.h
View file @ c78ae205
...@@ -25,6 +25,9 @@ class st_select_lex_unit; ...@@ -25,6 +25,9 @@ class st_select_lex_unit;
class JOIN; class JOIN;
class select_subselect; class select_subselect;
class subselect_engine; class subselect_engine;
class Item_bool_func2;
typedef Item_bool_func2* (*compare_func_creator)(Item*, Item*);
/* base class for subselects */ /* base class for subselects */
...@@ -56,15 +59,14 @@ class Item_subselect :public Item ...@@ -56,15 +59,14 @@ class Item_subselect :public Item
to subselect Item class to select_subselect classes constructor. to subselect Item class to select_subselect classes constructor.
*/ */
virtual void init (THD *thd, st_select_lex *select_lex, virtual void init (THD *thd, st_select_lex *select_lex,
select_subselect *result, select_subselect *result);
Item *left_expr= 0);
~Item_subselect(); ~Item_subselect();
virtual void assign_null() virtual void assign_null()
{ {
null_value= 1; null_value= 1;
} }
virtual void select_transformer(st_select_lex *select_lex, Item *left_expr); virtual void select_transformer(st_select_lex *select_lex);
bool assigned() { return value_assigned; } bool assigned() { return value_assigned; }
void assigned(bool a) { value_assigned= a; } void assigned(bool a) { value_assigned= a; }
enum Type type() const; enum Type type() const;
...@@ -129,8 +131,7 @@ class Item_exists_subselect :public Item_subselect ...@@ -129,8 +131,7 @@ class Item_exists_subselect :public Item_subselect
longlong value; /* value of this item (boolean: exists/not-exists) */ longlong value; /* value of this item (boolean: exists/not-exists) */
public: public:
Item_exists_subselect(THD *thd, st_select_lex *select_lex, Item_exists_subselect(THD *thd, st_select_lex *select_lex);
Item *left_expr= 0);
Item_exists_subselect(Item_exists_subselect *item): Item_exists_subselect(Item_exists_subselect *item):
Item_subselect(item) Item_subselect(item)
{ {
...@@ -156,10 +157,29 @@ class Item_exists_subselect :public Item_subselect ...@@ -156,10 +157,29 @@ class Item_exists_subselect :public Item_subselect
class Item_in_subselect :public Item_exists_subselect class Item_in_subselect :public Item_exists_subselect
{ {
protected:
Item * left_expr;
public: public:
Item_in_subselect(THD *thd, Item * left_expr, st_select_lex *select_lex); Item_in_subselect(THD *thd, Item * left_expr, st_select_lex *select_lex);
Item_in_subselect(Item_in_subselect *item); Item_in_subselect(Item_in_subselect *item);
virtual void select_transformer(st_select_lex *select_lex, Item *left_exp); Item_in_subselect(): Item_exists_subselect() {}
virtual void select_transformer(st_select_lex *select_lex);
void single_value_transformer(st_select_lex *select_lex,
Item *left_expr, compare_func_creator func);
};
/* ALL/ANY/SOME subselect */
class Item_allany_subselect :public Item_in_subselect
{
protected:
compare_func_creator func;
public:
Item_allany_subselect(THD *thd, Item * left_expr, compare_func_creator f,
st_select_lex *select_lex);
Item_allany_subselect(Item_allany_subselect *item);
virtual void select_transformer(st_select_lex *select_lex);
}; };
class subselect_engine class subselect_engine
......
sql/lex.h
View file @ c78ae205
...@@ -56,6 +56,7 @@ static SYMBOL symbols[] = { ...@@ -56,6 +56,7 @@ static SYMBOL symbols[] = {
{ "AGAINST", SYM(AGAINST),0,0}, { "AGAINST", SYM(AGAINST),0,0},
{ "ANALYZE", SYM(ANALYZE_SYM),0,0}, { "ANALYZE", SYM(ANALYZE_SYM),0,0},
{ "AND", SYM(AND),0,0}, { "AND", SYM(AND),0,0},
{ "ANY", SYM(ANY_SYM),0,0},
{ "AS", SYM(AS),0,0}, { "AS", SYM(AS),0,0},
{ "ASC", SYM(ASC),0,0}, { "ASC", SYM(ASC),0,0},
{ "AVG", SYM(AVG_SYM),0,0}, { "AVG", SYM(AVG_SYM),0,0},
...@@ -323,6 +324,7 @@ static SYMBOL symbols[] = { ...@@ -323,6 +324,7 @@ static SYMBOL symbols[] = {
{ "SHUTDOWN", SYM(SHUTDOWN),0,0}, { "SHUTDOWN", SYM(SHUTDOWN),0,0},
{ "SLAVE", SYM(SLAVE),0,0}, { "SLAVE", SYM(SLAVE),0,0},
{ "SMALLINT", SYM(SMALLINT),0,0}, { "SMALLINT", SYM(SMALLINT),0,0},
{ "SOME", SYM(ANY_SYM),0,0},
{ "SONAME", SYM(UDF_SONAME_SYM),0,0}, { "SONAME", SYM(UDF_SONAME_SYM),0,0},
{ "SPATIAL", SYM(SPATIAL_SYM),0,0}, { "SPATIAL", SYM(SPATIAL_SYM),0,0},
{ "SQL_BIG_RESULT", SYM(SQL_BIG_RESULT),0,0}, { "SQL_BIG_RESULT", SYM(SQL_BIG_RESULT),0,0},
......
sql/mysql_priv.h
View file @ c78ae205
...@@ -263,6 +263,7 @@ inline THD *_current_thd(void) ...@@ -263,6 +263,7 @@ inline THD *_current_thd(void)
#include "field.h" /* Field definitions */ #include "field.h" /* Field definitions */
#include "sql_udf.h" #include "sql_udf.h"
#include "item.h" #include "item.h"
typedef compare_func_creator (*chooser_compare_func_creator)(bool invert);
#include "sql_class.h" #include "sql_class.h"
#include "opt_range.h" #include "opt_range.h"
...@@ -867,3 +868,11 @@ inline void mark_as_null_row(TABLE *table) ...@@ -867,3 +868,11 @@ inline void mark_as_null_row(TABLE *table)
table->status|=STATUS_NULL_ROW; table->status|=STATUS_NULL_ROW;
bfill(table->null_flags,table->null_bytes,255); bfill(table->null_flags,table->null_bytes,255);
} }
compare_func_creator comp_eq_creator(bool invert);
compare_func_creator comp_ge_creator(bool invert);
compare_func_creator comp_gt_creator(bool invert);
compare_func_creator comp_le_creator(bool invert);
compare_func_creator comp_lt_creator(bool invert);
compare_func_creator comp_ne_creator(bool invert);
sql/sql_parse.cc
View file @ c78ae205
...@@ -3706,3 +3706,33 @@ bool check_simple_select() ...@@ -3706,3 +3706,33 @@ bool check_simple_select()
} }
return 0; return 0;
} }
compare_func_creator comp_eq_creator(bool invert)
{
return invert?&Item_bool_func2::ne_creator:&Item_bool_func2::eq_creator;
}
compare_func_creator comp_ge_creator(bool invert)
{
return invert?&Item_bool_func2::lt_creator:&Item_bool_func2::ge_creator;
}
compare_func_creator comp_gt_creator(bool invert)
{
return invert?&Item_bool_func2::le_creator:&Item_bool_func2::gt_creator;
}
compare_func_creator comp_le_creator(bool invert)
{
return invert?&Item_bool_func2::gt_creator:&Item_bool_func2::le_creator;
}
compare_func_creator comp_lt_creator(bool invert)
{
return invert?&Item_bool_func2::ge_creator:&Item_bool_func2::lt_creator;
}
compare_func_creator comp_ne_creator(bool invert)
{
return invert?&Item_bool_func2::eq_creator:&Item_bool_func2::ne_creator;
}
sql/sql_yacc.yy
View file @ c78ae205
...@@ -71,6 +71,7 @@ inline Item *or_or_concat(Item* A, Item* B) ...@@ -71,6 +71,7 @@ inline Item *or_or_concat(Item* A, Item* B)
CHARSET_INFO *charset; CHARSET_INFO *charset;
interval_type interval; interval_type interval;
st_select_lex *select_lex; st_select_lex *select_lex;
chooser_compare_func_creator boolfunc2creator;
} }
%{ %{
...@@ -104,6 +105,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); ...@@ -104,6 +105,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
%token AFTER_SYM %token AFTER_SYM
%token ALTER %token ALTER
%token ANALYZE_SYM %token ANALYZE_SYM
%token ANY_SYM
%token AVG_SYM %token AVG_SYM
%token BEGIN_SYM %token BEGIN_SYM
%token BINLOG_SYM %token BINLOG_SYM
...@@ -551,7 +553,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); ...@@ -551,7 +553,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
type int_type real_type order_dir opt_field_spec lock_option type int_type real_type order_dir opt_field_spec lock_option
udf_type if_exists opt_local opt_table_options table_options udf_type if_exists opt_local opt_table_options table_options
table_option opt_if_not_exists opt_var_type opt_var_ident_type table_option opt_if_not_exists opt_var_type opt_var_ident_type
delete_option delete_option all_or_any
%type <ulong_num> %type <ulong_num>
ULONG_NUM raid_types merge_insert_types ULONG_NUM raid_types merge_insert_types
...@@ -616,6 +618,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); ...@@ -616,6 +618,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
%type <select_lex> in_subselect in_subselect_init %type <select_lex> in_subselect in_subselect_init
%type <boolfunc2creator> comp_op
%type <NONE> %type <NONE>
query verb_clause create change select do drop insert replace insert2 query verb_clause create change select do drop insert replace insert2
insert_values update delete truncate rename insert_values update delete truncate rename
...@@ -641,7 +645,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); ...@@ -641,7 +645,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
opt_mi_check_type opt_to mi_check_types normal_join opt_mi_check_type opt_to mi_check_types normal_join
table_to_table_list table_to_table opt_table_list opt_as table_to_table_list table_to_table opt_table_list opt_as
handler_rkey_function handler_read_or_scan handler_rkey_function handler_read_or_scan
single_multi table_wild_list table_wild_one opt_wild union union_list single_multi table_wild_list table_wild_one opt_wild union
precision union_option opt_on_delete_item subselect_start opt_and precision union_option opt_on_delete_item subselect_start opt_and
subselect_end select_var_list select_var_list_init help subselect_end select_var_list select_var_list_init help
END_OF_INPUT END_OF_INPUT
...@@ -1723,6 +1727,18 @@ optional_braces: ...@@ -1723,6 +1727,18 @@ optional_braces:
expr: expr_expr { $$= $1; } expr: expr_expr { $$= $1; }
| simple_expr { $$= $1; }; | simple_expr { $$= $1; };
comp_op: EQ { $$ = &comp_eq_creator; }
| GE { $$ = &comp_ge_creator; }
| GT_SYM { $$ = &comp_gt_creator; }
| LE { $$ = &comp_le_creator; }
| LT { $$ = &comp_lt_creator; }
| NE { $$ = &comp_ne_creator; }
;
all_or_any: ALL { $$ = 1; }
| ANY_SYM { $$ = 0; }
;
/* expressions that begin with 'expr' */ /* expressions that begin with 'expr' */
expr_expr: expr_expr:
expr IN_SYM '(' expr_list ')' expr IN_SYM '(' expr_list ')'
...@@ -1749,13 +1765,17 @@ expr_expr: ...@@ -1749,13 +1765,17 @@ expr_expr:
| expr NOT REGEXP expr { $$= new Item_func_not(new Item_func_regex($1,$4)); } | expr NOT REGEXP expr { $$= new Item_func_not(new Item_func_regex($1,$4)); }
| expr IS NULL_SYM { $$= new Item_func_isnull($1); } | expr IS NULL_SYM { $$= new Item_func_isnull($1); }
| expr IS NOT NULL_SYM { $$= new Item_func_isnotnull($1); } | expr IS NOT NULL_SYM { $$= new Item_func_isnotnull($1); }
| expr EQ expr { $$= new Item_func_eq($1,$3); }
| expr EQUAL_SYM expr { $$= new Item_func_equal($1,$3); } | expr EQUAL_SYM expr { $$= new Item_func_equal($1,$3); }
| expr GE expr { $$= new Item_func_ge($1,$3); } | expr comp_op expr %prec EQ { $$= (*((*$2)(0)))($1,$3); }
| expr GT_SYM expr { $$= new Item_func_gt($1,$3); } | expr comp_op all_or_any in_subselect %prec EQ
| expr LE expr { $$= new Item_func_le($1,$3); } {
| expr LT expr { $$= new Item_func_lt($1,$3); } Item_allany_subselect *it=
| expr NE expr { $$= new Item_func_ne($1,$3); } new Item_allany_subselect(current_thd, $1, (*$2)($3), $4);
if ($3)
$$ = new Item_func_not(it); /* ALL */
else
$$ = it; /* ANY/SOME */
}
| expr SHIFT_LEFT expr { $$= new Item_func_shift_left($1,$3); } | expr SHIFT_LEFT expr { $$= new Item_func_shift_left($1,$3); }
| expr SHIFT_RIGHT expr { $$= new Item_func_shift_right($1,$3); } | expr SHIFT_RIGHT expr { $$= new Item_func_shift_right($1,$3); }
| expr '+' expr { $$= new Item_func_plus($1,$3); } | expr '+' expr { $$= new Item_func_plus($1,$3); }
...@@ -1789,13 +1809,17 @@ no_in_expr: ...@@ -1789,13 +1809,17 @@ no_in_expr:
| no_in_expr NOT REGEXP expr { $$= new Item_func_not(new Item_func_regex($1,$4)); } | no_in_expr NOT REGEXP expr { $$= new Item_func_not(new Item_func_regex($1,$4)); }
| no_in_expr IS NULL_SYM { $$= new Item_func_isnull($1); } | no_in_expr IS NULL_SYM { $$= new Item_func_isnull($1); }
| no_in_expr IS NOT NULL_SYM { $$= new Item_func_isnotnull($1); } | no_in_expr IS NOT NULL_SYM { $$= new Item_func_isnotnull($1); }
| no_in_expr EQ expr { $$= new Item_func_eq($1,$3); }
| no_in_expr EQUAL_SYM expr { $$= new Item_func_equal($1,$3); } | no_in_expr EQUAL_SYM expr { $$= new Item_func_equal($1,$3); }
| no_in_expr GE expr { $$= new Item_func_ge($1,$3); } | no_in_expr comp_op expr %prec EQ { $$= (*((*$2)(0)))($1,$3); }
| no_in_expr GT_SYM expr { $$= new Item_func_gt($1,$3); } | no_in_expr comp_op all_or_any in_subselect %prec EQ
| no_in_expr LE expr { $$= new Item_func_le($1,$3); } {
| no_in_expr LT expr { $$= new Item_func_lt($1,$3); } Item_allany_subselect *it=
| no_in_expr NE expr { $$= new Item_func_ne($1,$3); } new Item_allany_subselect(current_thd, $1, (*$2)($3), $4);
if ($3)
$$ = new Item_func_not(it); /* ALL */
else
$$ = it; /* ANY/SOME */
}
| no_in_expr SHIFT_LEFT expr { $$= new Item_func_shift_left($1,$3); } | no_in_expr SHIFT_LEFT expr { $$= new Item_func_shift_left($1,$3); }
| no_in_expr SHIFT_RIGHT expr { $$= new Item_func_shift_right($1,$3); } | no_in_expr SHIFT_RIGHT expr { $$= new Item_func_shift_right($1,$3); }
| no_in_expr '+' expr { $$= new Item_func_plus($1,$3); } | no_in_expr '+' expr { $$= new Item_func_plus($1,$3); }
...@@ -1837,13 +1861,17 @@ no_and_expr: ...@@ -1837,13 +1861,17 @@ no_and_expr:
| no_and_expr NOT REGEXP expr { $$= new Item_func_not(new Item_func_regex($1,$4)); } | no_and_expr NOT REGEXP expr { $$= new Item_func_not(new Item_func_regex($1,$4)); }
| no_and_expr IS NULL_SYM { $$= new Item_func_isnull($1); } | no_and_expr IS NULL_SYM { $$= new Item_func_isnull($1); }
| no_and_expr IS NOT NULL_SYM { $$= new Item_func_isnotnull($1); } | no_and_expr IS NOT NULL_SYM { $$= new Item_func_isnotnull($1); }
| no_and_expr EQ expr { $$= new Item_func_eq($1,$3); }
| no_and_expr EQUAL_SYM expr { $$= new Item_func_equal($1,$3); } | no_and_expr EQUAL_SYM expr { $$= new Item_func_equal($1,$3); }
| no_and_expr GE expr { $$= new Item_func_ge($1,$3); } | no_and_expr comp_op expr %prec EQ { $$= (*((*$2)(0)))($1,$3); }
| no_and_expr GT_SYM expr { $$= new Item_func_gt($1,$3); } | no_and_expr comp_op all_or_any in_subselect %prec EQ
| no_and_expr LE expr { $$= new Item_func_le($1,$3); } {
| no_and_expr LT expr { $$= new Item_func_lt($1,$3); } Item_allany_subselect *it=
| no_and_expr NE expr { $$= new Item_func_ne($1,$3); } new Item_allany_subselect(current_thd, $1, (*$2)($3), $4);
if ($3)
$$ = new Item_func_not(it); /* ALL */
else
$$ = it; /* ANY/SOME */
}
| no_and_expr SHIFT_LEFT expr { $$= new Item_func_shift_left($1,$3); } | no_and_expr SHIFT_LEFT expr { $$= new Item_func_shift_left($1,$3); }
| no_and_expr SHIFT_RIGHT expr { $$= new Item_func_shift_right($1,$3); } | no_and_expr SHIFT_RIGHT expr { $$= new Item_func_shift_right($1,$3); }
| no_and_expr '+' expr { $$= new Item_func_plus($1,$3); } | no_and_expr '+' expr { $$= new Item_func_plus($1,$3); }
...@@ -3495,6 +3523,7 @@ keyword: ...@@ -3495,6 +3523,7 @@ keyword:
| AFTER_SYM {} | AFTER_SYM {}
| AGAINST {} | AGAINST {}
| AGGREGATE_SYM {} | AGGREGATE_SYM {}
| ANY_SYM {}
| AUTO_INC {} | AUTO_INC {}
| AVG_ROW_LENGTH {} | AVG_ROW_LENGTH {}
| AVG_SYM {} | AVG_SYM {}
...@@ -4173,10 +4202,7 @@ rollback: ...@@ -4173,10 +4202,7 @@ rollback:
union: union:
/* empty */ {} /* empty */ {}
| union_list; |UNION_SYM union_option
union_list:
UNION_SYM union_option
{ {
LEX *lex=Lex; LEX *lex=Lex;
if (lex->exchange) if (lex->exchange)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7