Skip to content

Commit

Permalink
Removing some duplicate code: deriving Item_func_opt_neg from Item_bo…
Browse files Browse the repository at this point in the history
…ol_func.
  • Loading branch information
Alexander Barkov committed Nov 20, 2014
1 parent 52b3d95 commit cbc318f
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions sql/item_cmpfunc.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ class Item_bool_func :public Item_int_func
Item_bool_func() :Item_int_func() {}
Item_bool_func(Item *a) :Item_int_func(a) {}
Item_bool_func(Item *a,Item *b) :Item_int_func(a,b) {}
Item_bool_func(Item *a, Item *b, Item *c) :Item_int_func(a, b, c) {}
Item_bool_func(List<Item> &list) :Item_int_func(list) { }
Item_bool_func(THD *thd, Item_bool_func *item) :Item_int_func(thd, item) {}
bool is_bool_func() { return 1; }
void fix_length_and_dec() { decimals=0; max_length=1; }
Expand Down Expand Up @@ -644,16 +646,16 @@ class Item_func_ne :public Item_bool_rowready_func2
*/

class Item_func_opt_neg :public Item_int_func
class Item_func_opt_neg :public Item_bool_func
{
public:
bool negated; /* <=> the item represents NOT <func> */
bool pred_level; /* <=> [NOT] <func> is used on a predicate level */
public:
Item_func_opt_neg(Item *a, Item *b, Item *c)
:Item_int_func(a, b, c), negated(0), pred_level(0) {}
:Item_bool_func(a, b, c), negated(0), pred_level(0) {}
Item_func_opt_neg(List<Item> &list)
:Item_int_func(list), negated(0), pred_level(0) {}
:Item_bool_func(list), negated(0), pred_level(0) {}
public:
inline void negate() { negated= !negated; }
inline void top_level_item() { pred_level= 1; }
Expand Down Expand Up @@ -684,9 +686,7 @@ class Item_func_between :public Item_func_opt_neg
bool fix_fields(THD *, Item **);
void fix_length_and_dec();
virtual void print(String *str, enum_query_type query_type);
bool is_bool_func() { return 1; }
CHARSET_INFO *compare_collation() { return cmp_collation.collation; }
uint decimal_precision() const { return 1; }
bool eval_not_null_tables(uchar *opt_arg);
void fix_after_pullout(st_select_lex *new_parent, Item **ref);
bool count_sargable_conds(uchar *arg);
Expand Down Expand Up @@ -1352,7 +1352,6 @@ class Item_func_in :public Item_func_opt_neg
longlong val_int();
bool fix_fields(THD *, Item **);
void fix_length_and_dec();
uint decimal_precision() const { return 1; }
void cleanup()
{
uint i;
Expand All @@ -1373,7 +1372,6 @@ class Item_func_in :public Item_func_opt_neg
enum Functype functype() const { return IN_FUNC; }
const char *func_name() const { return " IN "; }
bool nulls_in_row();
bool is_bool_func() { return 1; }
CHARSET_INFO *compare_collation() { return cmp_collation.collation; }
bool eval_not_null_tables(uchar *opt_arg);
void fix_after_pullout(st_select_lex *new_parent, Item **ref);
Expand Down

0 comments on commit cbc318f

Please sign in to comment.