*:add opt_rule_blacklist in mysql tables. (#11096)

cmd/explaintest/r/black_list.result

@@ -0,0 +1,35 @@
+use test;
+drop table if exists t;
+create table t (a int);
+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.opt_rule_blacklist values('predicate_push_down');
+admin reload opt_rule_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.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('lt');
+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='lt';
+admin reload expr_pushdown_blacklist;
+

cmd/explaintest/t/black_list.test

@@ -0,0 +1,27 @@
+use test;
+drop table if exists t;
+create table t (a int);
+
+explain select * from t where a < 1;
+
+insert into mysql.opt_rule_blacklist values('predicate_push_down');
+
+admin reload opt_rule_blacklist;
+
+explain select * from t where 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;
+
+insert into mysql.expr_pushdown_blacklist values('lt');
+
+admin reload expr_pushdown_blacklist;
+
+explain select * from t where a < 1;
+
+delete from mysql.expr_pushdown_blacklist where name='lt';
+
+admin reload expr_pushdown_blacklist;

executor/analyze_test.go

@@ -255,7 +255,7 @@ func (s *testSuite1) TestFastAnalyze(c *C) {
 	c.Assert(err, IsNil)
 	tableInfo := table.Meta()
 	tbl := dom.StatsHandle().GetTableStats(tableInfo)
-	c.Assert(tbl.String(), Equals, "Table:41 Count:20\n"+
+	c.Assert(tbl.String(), Equals, "Table:43 Count:20\n"+
 		"column:1 ndv:20 totColSize:0\n"+
 		"num: 6 lower_bound: 3 upper_bound: 15 repeats: 1\n"+
 		"num: 7 lower_bound: 18 upper_bound: 33 repeats: 1\n"+

executor/builder.go

@@ -108,6 +108,8 @@ func (b *executorBuilder) build(p plannercore.Plan) Executor {
 		return b.buildChecksumTable(v)
 	case *plannercore.ReloadExprPushdownBlacklist:
 		return b.buildReloadExprPushdownBlacklist(v)
+	case *plannercore.ReloadOptRuleBlacklist:
+		return b.buildReloadOptRuleBlacklist(v)
 	case *plannercore.AdminPlugins:
 		return b.buildAdminPlugins(v)
 	case *plannercore.DDL:
@@ -516,6 +518,10 @@ func (b *executorBuilder) buildReloadExprPushdownBlacklist(v *plannercore.Reload
 	return &ReloadExprPushdownBlacklistExec{baseExecutor{ctx: b.ctx}}
 }
 
+func (b *executorBuilder) buildReloadOptRuleBlacklist(v *plannercore.ReloadOptRuleBlacklist) Executor {
+	return &ReloadOptRuleBlacklistExec{baseExecutor{ctx: b.ctx}}
+}
+
 func (b *executorBuilder) buildAdminPlugins(v *plannercore.AdminPlugins) Executor {
 	return &AdminPluginsExec{baseExecutor: baseExecutor{ctx: b.ctx}, Action: v.Action, Plugins: v.Plugins}
 }

executor/opt_rule_blacklist.go

@@ -0,0 +1,50 @@
+// Copyright 2019 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package executor
+
+import (
+	"context"
+
+	plannercore "github.com/pingcap/tidb/planner/core"
+	"github.com/pingcap/tidb/sessionctx"
+	"github.com/pingcap/tidb/util/chunk"
+	"github.com/pingcap/tidb/util/set"
+	"github.com/pingcap/tidb/util/sqlexec"
+)
+
+// ReloadOptRuleBlacklistExec indicates ReloadOptRuleBlacklist executor.
+type ReloadOptRuleBlacklistExec struct {
+	baseExecutor
+}
+
+// Next implements the Executor Next interface.
+func (e *ReloadOptRuleBlacklistExec) Next(ctx context.Context, _ *chunk.Chunk) error {
+	return LoadOptRuleBlacklist(e.ctx)
+}
+
+// LoadOptRuleBlacklist loads the latest data from table mysql.opt_rule_blacklist.
+func LoadOptRuleBlacklist(ctx sessionctx.Context) (err error) {
+	sql := "select HIGH_PRIORITY name from mysql.opt_rule_blacklist"
+	rows, _, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
+	if err != nil {
+		return err
+	}
+	newDisabledLogicalRules := set.NewStringSet()
+	for _, row := range rows {
+		name := row.GetString(0)
+		newDisabledLogicalRules.Insert(name)
+	}
+	plannercore.DefaultDisabledLogicalRulesList.Store(newDisabledLogicalRules)
+	return nil
+}

executor/reload_expr_pushdown_blacklist.go

@@ -15,7 +15,6 @@ package executor
 
 import (
 	"context"
-	"strings"
 
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/sessionctx"
@@ -43,7 +42,7 @@ func LoadExprPushdownBlacklist(ctx sessionctx.Context) (err error) {
 	newBlacklist := make(map[string]struct{})
 	for _, row := range rows {
 		name := row.GetString(0)
-		newBlacklist[strings.ToLower(name)] = struct{}{}
+		newBlacklist[name] = struct{}{}
 	}
 	expression.DefaultExprPushdownBlacklist.Store(newBlacklist)
 	return nil

go.mod

@@ -70,7 +70,6 @@ require (
 	golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e
 	golang.org/x/sys v0.0.0-20190109145017-48ac38b7c8cb // indirect
 	golang.org/x/text v0.3.0
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
 	golang.org/x/tools v0.0.0-20190130214255-bb1329dc71a0
 	google.golang.org/genproto v0.0.0-20190108161440-ae2f86662275 // indirect
 	google.golang.org/grpc v1.17.0

go.sum

@@ -280,9 +280,8 @@ golang.org/x/sys v0.0.0-20190109145017-48ac38b7c8cb h1:1w588/yEchbPNpa9sEvOcMZYb
 golang.org/x/sys v0.0.0-20190109145017-48ac38b7c8cb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 h1:+DCIGbF/swA92ohVg0//6X2IVY3KZs6p9mix0ziNYJM=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190130214255-bb1329dc71a0 h1:iRpjPej1fPzmfoBhMFkp3HdqzF+ytPmAwiQhJGV0zGw=
 golang.org/x/tools v0.0.0-20190130214255-bb1329dc71a0/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=