Merge branch 'master' into fix-sysvar-race

ddl/db_integration_test.go

@@ -41,7 +41,6 @@ import (
  "github.com/pingcap/tidb/sessionctx/variable"
  "github.com/pingcap/tidb/store/mockstore"
  "github.com/pingcap/tidb/store/tikv/mockstore/cluster"
- "github.com/pingcap/tidb/store/tikv/oracle"
  "github.com/pingcap/tidb/table"
  "github.com/pingcap/tidb/tablecodec"
  "github.com/pingcap/tidb/types"
@@ -1343,7 +1342,7 @@ func getMaxTableHandle(ctx *testMaxTableRowIDContext, store kv.Storage) (kv.Hand
  c := ctx.c
  d := ctx.d
  tbl := ctx.tbl
- curVer, err := store.CurrentVersion(oracle.GlobalTxnScope)
+ curVer, err := store.CurrentVersion(kv.GlobalTxnScope)
  c.Assert(err, IsNil)
  maxHandle, emptyTable, err := d.GetTableMaxHandle(curVer.Ver, tbl.(table.PhysicalTable))
  c.Assert(err, IsNil)

ddl/delete_range.go

@@ -27,7 +27,6 @@ import (
  "github.com/pingcap/tidb/ddl/util"
  "github.com/pingcap/tidb/kv"
  "github.com/pingcap/tidb/sessionctx"
- "github.com/pingcap/tidb/store/tikv/oracle"
  "github.com/pingcap/tidb/tablecodec"
  "github.com/pingcap/tidb/util/logutil"
  "github.com/pingcap/tidb/util/sqlexec"
@@ -451,7 +450,7 @@ func doBatchInsert(s sqlexec.SQLExecutor, jobID int64, tableIDs []int64, ts uint
 
 // getNowTS gets the current timestamp, in TSO.
 func getNowTSO(ctx sessionctx.Context) (uint64, error) {
- currVer, err := ctx.GetStore().CurrentVersion(oracle.GlobalTxnScope)
+ currVer, err := ctx.GetStore().CurrentVersion(kv.GlobalTxnScope)
  if err != nil {
  return 0, errors.Trace(err)
  }

ddl/reorg.go

@@ -33,7 +33,6 @@ import (
  "github.com/pingcap/tidb/sessionctx"
  "github.com/pingcap/tidb/sessionctx/stmtctx"
  "github.com/pingcap/tidb/statistics"
- "github.com/pingcap/tidb/store/tikv/oracle"
  "github.com/pingcap/tidb/table"
  "github.com/pingcap/tidb/table/tables"
  "github.com/pingcap/tidb/tablecodec"
@@ -534,7 +533,7 @@ func getTableRange(d *ddlCtx, tbl table.PhysicalTable, snapshotVer uint64, prior
 }
 
 func getValidCurrentVersion(store kv.Storage) (ver kv.Version, err error) {
- ver, err = store.CurrentVersion(oracle.GlobalTxnScope)
+ ver, err = store.CurrentVersion(kv.GlobalTxnScope)
  if err != nil {
  return ver, errors.Trace(err)
  } else if ver.Ver <= 0 {

distsql/request_builder.go

@@ -27,7 +27,6 @@ import (
  "github.com/pingcap/tidb/sessionctx/stmtctx"
  "github.com/pingcap/tidb/sessionctx/variable"
  "github.com/pingcap/tidb/statistics"
- "github.com/pingcap/tidb/store/tikv/oracle"
  "github.com/pingcap/tidb/tablecodec"
  "github.com/pingcap/tidb/types"
  "github.com/pingcap/tidb/util/codec"
@@ -236,7 +235,7 @@ func (builder *RequestBuilder) SetFromSessionVars(sv *variable.SessionVars) *Req
  }
  builder.txnScope = sv.TxnCtx.TxnScope
  builder.IsStaleness = sv.TxnCtx.IsStaleness
- if builder.IsStaleness && builder.txnScope != oracle.GlobalTxnScope {
+ if builder.IsStaleness && builder.txnScope != kv.GlobalTxnScope {
  builder.MatchStoreLabels = []*metapb.StoreLabel{
  {
  Key: placement.DCLabelKey,
@@ -279,9 +278,9 @@ func (builder *RequestBuilder) SetFromInfoSchema(is infoschema.InfoSchema) *Requ
 
 func (builder *RequestBuilder) verifyTxnScope() error {
  if builder.txnScope == "" {
- builder.txnScope = oracle.GlobalTxnScope
+ builder.txnScope = kv.GlobalTxnScope
  }
- if builder.txnScope == oracle.GlobalTxnScope || builder.is == nil {
+ if builder.txnScope == kv.GlobalTxnScope || builder.is == nil {
  return nil
  }
  visitPhysicalTableID := make(map[int64]struct{})
@@ -600,7 +599,7 @@ func CommonHandleRangesToKVRanges(sc *stmtctx.StatementContext, tids []int64, ra
 
 // VerifyTxnScope verify whether the txnScope and visited physical table break the leader rule's dcLocation.
 func VerifyTxnScope(txnScope string, physicalTableID int64, is infoschema.InfoSchema) bool {
- if txnScope == "" || txnScope == oracle.GlobalTxnScope {
+ if txnScope == "" || txnScope == kv.GlobalTxnScope {
  return true
  }
  bundle, ok := is.BundleByName(placement.GroupID(physicalTableID))

domain/domain.go

@@ -48,7 +48,6 @@ import (
  "github.com/pingcap/tidb/sessionctx/variable"
  "github.com/pingcap/tidb/statistics/handle"
  "github.com/pingcap/tidb/store/tikv"
- "github.com/pingcap/tidb/store/tikv/oracle"
  "github.com/pingcap/tidb/telemetry"
  "github.com/pingcap/tidb/util"
  "github.com/pingcap/tidb/util/dbterror"
@@ -336,7 +335,7 @@ func (do *Domain) Reload() error {
  defer do.m.Unlock()
 
  startTime := time.Now()
- ver, err := do.store.CurrentVersion(oracle.GlobalTxnScope)
+ ver, err := do.store.CurrentVersion(kv.GlobalTxnScope)
  if err != nil {
  return err
  }

domain/domain_test.go

@@ -347,7 +347,7 @@ func (*testSuite) TestT(c *C) {
 
  // for schemaValidator
  schemaVer := dom.SchemaValidator.(*schemaValidator).LatestSchemaVersion()
- ver, err := store.CurrentVersion(oracle.GlobalTxnScope)
+ ver, err := store.CurrentVersion(kv.GlobalTxnScope)
  c.Assert(err, IsNil)
  ts := ver.Ver
 
@@ -360,7 +360,7 @@ func (*testSuite) TestT(c *C) {
  c.Assert(succ, Equals, ResultSucc)
  time.Sleep(ddlLease)
 
- ver, err = store.CurrentVersion(oracle.GlobalTxnScope)
+ ver, err = store.CurrentVersion(kv.GlobalTxnScope)
  c.Assert(err, IsNil)
  ts = ver.Ver
  _, succ = dom.SchemaValidator.Check(ts, schemaVer, nil)

domain/infosync/info.go

@@ -554,7 +554,7 @@ func (is *InfoSyncer) ReportMinStartTS(store kv.Storage) {
  pl := is.manager.ShowProcessList()
 
  // Calculate the lower limit of the start timestamp to avoid extremely old transaction delaying GC.
- currentVer, err := store.CurrentVersion(oracle.GlobalTxnScope)
+ currentVer, err := store.CurrentVersion(kv.GlobalTxnScope)
  if err != nil {
  logutil.BgLogger().Error("update minStartTS failed", zap.Error(err))
  return

executor/batch_point_get.go

@@ -30,7 +30,6 @@ import (
  driver "github.com/pingcap/tidb/store/driver/txn"
  "github.com/pingcap/tidb/store/tikv"
  tikvstore "github.com/pingcap/tidb/store/tikv/kv"
- "github.com/pingcap/tidb/store/tikv/oracle"
  "github.com/pingcap/tidb/tablecodec"
  "github.com/pingcap/tidb/types"
  "github.com/pingcap/tidb/util/chunk"
@@ -122,7 +121,7 @@ func (e *BatchPointGetExec) Open(context.Context) error {
  snapshot.SetOption(kv.TaskID, e.ctx.GetSessionVars().StmtCtx.TaskID)
  isStaleness := e.ctx.GetSessionVars().TxnCtx.IsStaleness
  snapshot.SetOption(kv.IsStalenessReadOnly, isStaleness)
- if isStaleness && e.ctx.GetSessionVars().TxnCtx.TxnScope != oracle.GlobalTxnScope {
+ if isStaleness && e.ctx.GetSessionVars().TxnCtx.TxnScope != kv.GlobalTxnScope {
  snapshot.SetOption(kv.MatchStoreLabels, []*metapb.StoreLabel{
  {
  Key: placement.DCLabelKey,

executor/executor_test.go

@@ -2693,11 +2693,11 @@ func (s *testSuiteP2) TestHistoryRead(c *C) {
  // SnapshotTS Is not updated if check failed.
  c.Assert(tk.Se.GetSessionVars().SnapshotTS, Equals, uint64(0))
 
- curVer1, _ := s.store.CurrentVersion(oracle.GlobalTxnScope)
+ curVer1, _ := s.store.CurrentVersion(kv.GlobalTxnScope)
  time.Sleep(time.Millisecond)
  snapshotTime := time.Now()
  time.Sleep(time.Millisecond)
- curVer2, _ := s.store.CurrentVersion(oracle.GlobalTxnScope)
+ curVer2, _ := s.store.CurrentVersion(kv.GlobalTxnScope)
  tk.MustExec("insert history_read values (2)")
  tk.MustQuery("select * from history_read").Check(testkit.Rows("1", "2"))
  tk.MustExec("set @@tidb_snapshot = '" + snapshotTime.Format("2006-01-02 15:04:05.999999") + "'")
@@ -8153,3 +8153,79 @@ func (s *testSerialSuite) TestIssue24210(c *C) {
  c.Assert(err, IsNil)
 
 }
+
+func (s testSerialSuite) TestExprBlackListForEnum(c *C) {
+ tk := testkit.NewTestKit(c, s.store)
+
+ tk.MustExec("use test")
+ tk.MustExec("drop table if exists t;")
+ tk.MustExec("create table t(a enum('a','b','c'), b enum('a','b','c'), c int, index idx(b,a));")
+ tk.MustExec("insert into t values(1,1,1),(2,2,2),(3,3,3);")
+
+ checkFuncPushDown := func(rows [][]interface{}, keyWord string) bool {
+ for _, line := range rows {
+ // Agg/Expr push down
+ if line[2].(string) == "cop[tikv]" && strings.Contains(line[4].(string), keyWord) {
+ return true
+ }
+ // access index
+ if line[2].(string) == "cop[tikv]" && strings.Contains(line[3].(string), keyWord) {
+ return true
+ }
+ }
+ return false
+ }
+
+ // Test agg(enum) push down
+ tk.MustExec("insert into mysql.expr_pushdown_blacklist(name) values('enum');")
+ tk.MustExec("admin reload expr_pushdown_blacklist;")
+ rows := tk.MustQuery("desc format='brief' select /*+ HASH_AGG() */ max(a) from t;").Rows()
+ c.Assert(checkFuncPushDown(rows, "max"), IsFalse)
+ rows = tk.MustQuery("desc format='brief' select /*+ STREAM_AGG() */ max(a) from t;").Rows()
+ c.Assert(checkFuncPushDown(rows, "max"), IsFalse)
+
+ tk.MustExec("delete from mysql.expr_pushdown_blacklist;")
+ tk.MustExec("admin reload expr_pushdown_blacklist;")
+ rows = tk.MustQuery("desc format='brief' select /*+ HASH_AGG() */ max(a) from t;").Rows()
+ c.Assert(checkFuncPushDown(rows, "max"), IsTrue)
+ rows = tk.MustQuery("desc format='brief' select /*+ STREAM_AGG() */ max(a) from t;").Rows()
+ c.Assert(checkFuncPushDown(rows, "max"), IsTrue)
+
+ // Test expr(enum) push down
+ tk.MustExec("insert into mysql.expr_pushdown_blacklist(name) values('enum');")
+ tk.MustExec("admin reload expr_pushdown_blacklist;")
+ rows = tk.MustQuery("desc format='brief' select * from t where a + b;").Rows()
+ c.Assert(checkFuncPushDown(rows, "plus"), IsFalse)
+ rows = tk.MustQuery("desc format='brief' select * from t where a + b;").Rows()
+ c.Assert(checkFuncPushDown(rows, "plus"), IsFalse)
+
+ tk.MustExec("delete from mysql.expr_pushdown_blacklist;")
+ tk.MustExec("admin reload expr_pushdown_blacklist;")
+ rows = tk.MustQuery("desc format='brief' select * from t where a + b;").Rows()
+ c.Assert(checkFuncPushDown(rows, "plus"), IsTrue)
+ rows = tk.MustQuery("desc format='brief' select * from t where a + b;").Rows()
+ c.Assert(checkFuncPushDown(rows, "plus"), IsTrue)
+
+ // Test enum index
+ tk.MustExec("insert into mysql.expr_pushdown_blacklist(name) values('enum');")
+ tk.MustExec("admin reload expr_pushdown_blacklist;")
+ rows = tk.MustQuery("desc format='brief' select * from t where b = 1;").Rows()
+ c.Assert(checkFuncPushDown(rows, "index:idx(b)"), IsFalse)
+ rows = tk.MustQuery("desc format='brief' select * from t where b = 'a';").Rows()
+ c.Assert(checkFuncPushDown(rows, "index:idx(b)"), IsFalse)
+ rows = tk.MustQuery("desc format='brief' select * from t where b > 1;").Rows()
+ c.Assert(checkFuncPushDown(rows, "index:idx(b)"), IsFalse)
+ rows = tk.MustQuery("desc format='brief' select * from t where b > 'a';").Rows()
+ c.Assert(checkFuncPushDown(rows, "index:idx(b)"), IsFalse)
+
+ tk.MustExec("delete from mysql.expr_pushdown_blacklist;")
+ tk.MustExec("admin reload expr_pushdown_blacklist;")
+ rows = tk.MustQuery("desc format='brief' select * from t where b = 1 and a = 1;").Rows()
+ c.Assert(checkFuncPushDown(rows, "index:idx(b, a)"), IsTrue)
+ rows = tk.MustQuery("desc format='brief' select * from t where b = 'a' and a = 'a';").Rows()
+ c.Assert(checkFuncPushDown(rows, "index:idx(b, a)"), IsTrue)
+ rows = tk.MustQuery("desc format='brief' select * from t where b = 1 and a > 1;").Rows()
+ c.Assert(checkFuncPushDown(rows, "index:idx(b, a)"), IsTrue)
+ rows = tk.MustQuery("desc format='brief' select * from t where b = 1 and a > 'a'").Rows()
+ c.Assert(checkFuncPushDown(rows, "index:idx(b, a)"), IsTrue)
+}