Skip to content

Commit

Permalink
executor: refine the usage of expression blacklist (#11940) (#11975)
Browse files Browse the repository at this point in the history
  • Loading branch information
@XuHuaiyu @sre-bot
XuHuaiyu authored and sre-bot committed Sep 2, 2019
1 parent 6377a58 commit 2b99cdd
Show file tree
Hide file tree
Showing 3 changed files with 303 additions and 2 deletions.
21 changes: 21 additions & 0 deletions cmd/explaintest/r/black_list.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,22 @@ Selection_5 8000.00 root lt(test.t.a, 1)
delete from mysql.opt_rule_blacklist where name='predicate_push_down';
admin reload opt_rule_blacklist;

explain select * from t where a < 1;
id count task operator info
TableReader_7 3323.33 root data:Selection_6
└─Selection_6 3323.33 cop lt(test.t.a, 1)
└─TableScan_5 10000.00 cop table:t, range:[-inf,+inf], keep order:false, stats:pseudo
insert into mysql.expr_pushdown_blacklist values('<');
admin reload expr_pushdown_blacklist;

explain select * from t where a < 1;
id count task operator info
Selection_5 8000.00 root lt(test.t.a, 1)
└─TableReader_7 10000.00 root data:TableScan_6
└─TableScan_6 10000.00 cop table:t, range:[-inf,+inf], keep order:false, stats:pseudo
delete from mysql.expr_pushdown_blacklist where name='<';
admin reload expr_pushdown_blacklist;

explain select * from t where a < 1;
id count task operator info
TableReader_7 3323.33 root data:Selection_6
Expand All @@ -33,3 +49,8 @@ Selection_5 8000.00 root lt(test.t.a, 1)
delete from mysql.expr_pushdown_blacklist where name='lt';
admin reload expr_pushdown_blacklist;

explain select * from t where a < 1;
id count task operator info
TableReader_7 3323.33 root data:Selection_6
└─Selection_6 3323.33 cop lt(test.t.a, 1)
└─TableScan_5 10000.00 cop table:t, range:[-inf,+inf], keep order:false, stats:pseudo
16 changes: 15 additions & 1 deletion cmd/explaintest/t/black_list.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ admin reload opt_rule_blacklist;

explain select * from t where a < 1;

insert into mysql.expr_pushdown_blacklist values('<');

admin reload expr_pushdown_blacklist;

explain select * from t where a < 1;

delete from mysql.expr_pushdown_blacklist where name='<';

admin reload expr_pushdown_blacklist;

explain select * from t where a < 1;

insert into mysql.expr_pushdown_blacklist values('lt');

admin reload expr_pushdown_blacklist;
Expand All @@ -24,4 +36,6 @@ explain select * from t where a < 1;

delete from mysql.expr_pushdown_blacklist where name='lt';

admin reload expr_pushdown_blacklist;
admin reload expr_pushdown_blacklist;

explain select * from t where a < 1;
268 changes: 267 additions & 1 deletion executor/reload_expr_pushdown_blacklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ package executor

import (
"context"
"strings"

"github.com/pingcap/parser/ast"
"github.com/pingcap/tidb/expression"
"github.com/pingcap/tidb/sessionctx"
"github.com/pingcap/tidb/util/chunk"
Expand All @@ -41,9 +43,273 @@ func LoadExprPushdownBlacklist(ctx sessionctx.Context) (err error) {
}
newBlacklist := make(map[string]struct{})
for _, row := range rows {
name := row.GetString(0)
name := strings.ToLower(row.GetString(0))
if alias, ok := funcName2Alias[name]; ok {
name = alias
}
newBlacklist[name] = struct{}{}
}
expression.DefaultExprPushdownBlacklist.Store(newBlacklist)
return nil
}

// funcName2Alias indicates map of the origin function name to the name used in TiDB.
var funcName2Alias = map[string]string{
"and": ast.LogicAnd,
"cast": ast.Cast,
"<<": ast.LeftShift,
">>": ast.RightShift,
"or": ast.LogicOr,
">=": ast.GE,
"<=": ast.LE,
"=": ast.EQ,
"!=": ast.NE,
"<>": ast.NE,
"<": ast.LT,
">": ast.GT,
"+": ast.Plus,
"-": ast.Minus,
"&&": ast.And,
"||": ast.Or,
"%": ast.Mod,
"xor_bit": ast.Xor,
"/": ast.Div,
"*": ast.Mul,
"!": ast.UnaryNot,
"~": ast.BitNeg,
"div": ast.IntDiv,
"xor_logic": ast.LogicXor, // Avoid name conflict with "xor_bit".,
"<=>": ast.NullEQ,
"+_unary": ast.UnaryPlus, // Avoid name conflict with `plus`.,
"-_unary": ast.UnaryMinus,
"in": ast.In,
"like": ast.Like,
"case": ast.Case,
"regexp": ast.Regexp,
"is null": ast.IsNull,
"is true": ast.IsTruth,
"is false": ast.IsFalsity,
"values": ast.Values,
"bit_count": ast.BitCount,
"coalesce": ast.Coalesce,
"greatest": ast.Greatest,
"least": ast.Least,
"interval": ast.Interval,
"abs": ast.Abs,
"acos": ast.Acos,
"asin": ast.Asin,
"atan": ast.Atan,
"atan2": ast.Atan2,
"ceil": ast.Ceil,
"ceiling": ast.Ceiling,
"conv": ast.Conv,
"cos": ast.Cos,
"cot": ast.Cot,
"crc32": ast.CRC32,
"degrees": ast.Degrees,
"exp": ast.Exp,
"floor": ast.Floor,
"ln": ast.Ln,
"log": ast.Log,
"log2": ast.Log2,
"log10": ast.Log10,
"pi": ast.PI,
"pow": ast.Pow,
"power": ast.Power,
"radians": ast.Radians,
"rand": ast.Rand,
"round": ast.Round,
"sign": ast.Sign,
"sin": ast.Sin,
"sqrt": ast.Sqrt,
"tan": ast.Tan,
"truncate": ast.Truncate,
"adddate": ast.AddDate,
"addtime": ast.AddTime,
"convert_tz": ast.ConvertTz,
"curdate": ast.Curdate,
"current_date": ast.CurrentDate,
"current_time": ast.CurrentTime,
"current_timestamp": ast.CurrentTimestamp,
"curtime": ast.Curtime,
"date": ast.Date,
"date_add": ast.DateAdd,
"date_format": ast.DateFormat,
"date_sub": ast.DateSub,
"datediff": ast.DateDiff,
"day": ast.Day,
"dayname": ast.DayName,
"dayofmonth": ast.DayOfMonth,
"dayofweek": ast.DayOfWeek,
"dayofyear": ast.DayOfYear,
"extract": ast.Extract,
"from_days": ast.FromDays,
"from_unixtime": ast.FromUnixTime,
"get_format": ast.GetFormat,
"hour": ast.Hour,
"localtime": ast.LocalTime,
"localtimestamp": ast.LocalTimestamp,
"makedate": ast.MakeDate,
"maketime": ast.MakeTime,
"microsecond": ast.MicroSecond,
"minute": ast.Minute,
"month": ast.Month,
"monthname": ast.MonthName,
"now": ast.Now,
"period_add": ast.PeriodAdd,
"period_diff": ast.PeriodDiff,
"quarter": ast.Quarter,
"sec_to_time": ast.SecToTime,
"second": ast.Second,
"str_to_date": ast.StrToDate,
"subdate": ast.SubDate,
"subtime": ast.SubTime,
"sysdate": ast.Sysdate,
"time": ast.Time,
"time_format": ast.TimeFormat,
"time_to_sec": ast.TimeToSec,
"timediff": ast.TimeDiff,
"timestamp": ast.Timestamp,
"timestampadd": ast.TimestampAdd,
"timestampdiff": ast.TimestampDiff,
"to_days": ast.ToDays,
"to_seconds": ast.ToSeconds,
"unix_timestamp": ast.UnixTimestamp,
"utc_date": ast.UTCDate,
"utc_time": ast.UTCTime,
"utc_timestamp": ast.UTCTimestamp,
"week": ast.Week,
"weekday": ast.Weekday,
"weekofyear": ast.WeekOfYear,
"year": ast.Year,
"yearweek": ast.YearWeek,
"last_day": ast.LastDay,
"ascii": ast.ASCII,
"bin": ast.Bin,
"concat": ast.Concat,
"concat_ws": ast.ConcatWS,
"convert": ast.Convert,
"elt": ast.Elt,
"export_set": ast.ExportSet,
"field": ast.Field,
"format": ast.Format,
"from_base64": ast.FromBase64,
"insert_func": ast.InsertFunc,
"instr": ast.Instr,
"lcase": ast.Lcase,
"left": ast.Left,
"length": ast.Length,
"load_file": ast.LoadFile,
"locate": ast.Locate,
"lower": ast.Lower,
"lpad": ast.Lpad,
"ltrim": ast.LTrim,
"make_set": ast.MakeSet,
"mid": ast.Mid,
"oct": ast.Oct,
"ord": ast.Ord,
"position": ast.Position,
"quote": ast.Quote,
"repeat": ast.Repeat,
"replace": ast.Replace,
"reverse": ast.Reverse,
"right": ast.Right,
"rtrim": ast.RTrim,
"space": ast.Space,
"strcmp": ast.Strcmp,
"substring": ast.Substring,
"substr": ast.Substr,
"substring_index": ast.SubstringIndex,
"to_base64": ast.ToBase64,
"trim": ast.Trim,
"upper": ast.Upper,
"ucase": ast.Ucase,
"hex": ast.Hex,
"unhex": ast.Unhex,
"rpad": ast.Rpad,
"bit_length": ast.BitLength,
"char_func": ast.CharFunc,
"char_length": ast.CharLength,
"character_length": ast.CharacterLength,
"find_in_set": ast.FindInSet,
"benchmark": ast.Benchmark,
"charset": ast.Charset,
"coercibility": ast.Coercibility,
"collation": ast.Collation,
"connection_id": ast.ConnectionID,
"current_user": ast.CurrentUser,
"current_role": ast.CurrentRole,
"database": ast.Database,
"found_rows": ast.FoundRows,
"last_insert_id": ast.LastInsertId,
"row_count": ast.RowCount,
"schema": ast.Schema,
"session_user": ast.SessionUser,
"system_user": ast.SystemUser,
"user": ast.User,
"if": ast.If,
"ifnull": ast.Ifnull,
"nullif": ast.Nullif,
"any_value": ast.AnyValue,
"default_func": ast.DefaultFunc,
"inet_aton": ast.InetAton,
"inet_ntoa": ast.InetNtoa,
"inet6_aton": ast.Inet6Aton,
"inet6_ntoa": ast.Inet6Ntoa,
"is_free_lock": ast.IsFreeLock,
"is_ipv4": ast.IsIPv4,
"is_ipv4_compat": ast.IsIPv4Compat,
"is_ipv4_mapped": ast.IsIPv4Mapped,
"is_ipv6": ast.IsIPv6,
"is_used_lock": ast.IsUsedLock,
"master_pos_wait": ast.MasterPosWait,
"name_const": ast.NameConst,
"release_all_locks": ast.ReleaseAllLocks,
"sleep": ast.Sleep,
"uuid": ast.UUID,
"uuid_short": ast.UUIDShort,
"get_lock": ast.GetLock,
"release_lock": ast.ReleaseLock,
"aes_decrypt": ast.AesDecrypt,
"aes_encrypt": ast.AesEncrypt,
"compress": ast.Compress,
"decode": ast.Decode,
"des_decrypt": ast.DesDecrypt,
"des_encrypt": ast.DesEncrypt,
"encode": ast.Encode,
"encrypt": ast.Encrypt,
"md5": ast.MD5,
"old_password": ast.OldPassword,
"password_func": ast.PasswordFunc,
"random_bytes": ast.RandomBytes,
"sha1": ast.SHA1,
"sha": ast.SHA,
"sha2": ast.SHA2,
"uncompress": ast.Uncompress,
"uncompressed_length": ast.UncompressedLength,
"validate_password_strength": ast.ValidatePasswordStrength,
"json_type": ast.JSONType,
"json_extract": ast.JSONExtract,
"json_unquote": ast.JSONUnquote,
"json_array": ast.JSONArray,
"json_object": ast.JSONObject,
"json_merge": ast.JSONMerge,
"json_set": ast.JSONSet,
"json_insert": ast.JSONInsert,
"json_replace": ast.JSONReplace,
"json_remove": ast.JSONRemove,
"json_contains": ast.JSONContains,
"json_contains_path": ast.JSONContainsPath,
"json_valid": ast.JSONValid,
"json_array_append": ast.JSONArrayAppend,
"json_array_insert": ast.JSONArrayInsert,
"json_merge_patch": ast.JSONMergePatch,
"json_merge_preserve": ast.JSONMergePreserve,
"json_pretty": ast.JSONPretty,
"json_quote": ast.JSONQuote,
"json_search": ast.JSONSearch,
"json_storage_size": ast.JSONStorageSize,
"json_depth": ast.JSONDepth,
"json_keys": ast.JSONKeys,
"json_length": ast.JSONLength,
}

0 comments on commit 2b99cdd

Please sign in to comment.