vttablet: deprecate StrictMode in favor of RBR

StrictMode was an old flag and pretty much unsafe to turn off.
It's now been removed. Instead, if we detect that we're in RBR
mode, we use that to just pass-through queries that are otherwise
too complex.

Author: sougou

go/vt/vttablet/endtoend/config_test.go

@@ -12,9 +12,9 @@ import (
 	"time"
 
 	vtrpcpb "github.com/youtube/vitess/go/vt/proto/vtrpc"
+	"github.com/youtube/vitess/go/vt/vterrors"
 	"github.com/youtube/vitess/go/vt/vttablet/endtoend/framework"
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/tabletenv"
-	"github.com/youtube/vitess/go/vt/vterrors"
 )
 
 // compareIntDiff returns an error if end[tag] != start[tag]+diff.
@@ -328,57 +328,3 @@ func TestQueryTimeout(t *testing.T) {
 		t.Error(err)
 	}
 }
-
-func TestStrictMode(t *testing.T) {
-	queries := []string{
-		"insert into vitess_a(eid, id, name, foo) values (7, 1+1, '', '')",
-		"insert into vitess_d(eid, id) values (1, 1)",
-		"update vitess_a set eid = 1+1 where eid = 1 and id = 1",
-		"insert into vitess_d(eid, id) values (1, 1)",
-		"insert into upsert_test(id1, id2) values " +
-			"(1, 1), (2, 2) on duplicate key update id1 = 1",
-		"insert into upsert_test(id1, id2) select eid, id " +
-			"from vitess_a limit 1 on duplicate key update id2 = id1",
-		"insert into upsert_test(id1, id2) values " +
-			"(1, 1) on duplicate key update id1 = 2+1",
-	}
-
-	// Strict mode on.
-	func() {
-		client := framework.NewClient()
-		err := client.Begin()
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		defer client.Rollback()
-
-		want := "DML too complex"
-		for _, query := range queries {
-			_, err = client.Execute(query, nil)
-			if err == nil || err.Error() != want {
-				t.Errorf("Execute(%s): %v, want %s", query, err, want)
-			}
-		}
-	}()
-
-	// Strict mode off.
-	func() {
-		framework.Server.SetStrictMode(false)
-		defer framework.Server.SetStrictMode(true)
-
-		for _, query := range queries {
-			client := framework.NewClient()
-			err := client.Begin()
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			_, err = client.Execute(query, nil)
-			if err != nil {
-				t.Error(err)
-			}
-			client.Rollback()
-		}
-	}()
-}

go/vt/vttablet/tabletserver/query_engine.go

@@ -120,7 +120,6 @@ type QueryEngine struct {
 	streamQList  *QueryList
 
 	// Vars
-	strictMode       sync2.AtomicBool
 	binlogFormat     connpool.BinlogFormat
 	autoCommit       sync2.AtomicBool
 	maxResultSize    sync2.AtomicInt64
@@ -171,7 +170,6 @@ func NewQueryEngine(checker connpool.MySQLChecker, se *schema.Engine, config tab
 		config.HotRowProtectionMaxQueueSize, config.HotRowProtectionMaxGlobalQueueSize)
 	qe.streamQList = NewQueryList()
 
-	qe.strictMode.Set(config.StrictMode)
 	qe.autoCommit.Set(config.EnableAutoCommit)
 	qe.strictTableACL = config.StrictTableACL
 	qe.enableTableACLDryRun = config.EnableTableACLDryRun

go/vt/vttablet/tabletserver/query_engine_test.go

@@ -20,26 +20,6 @@ import (
 	"github.com/youtube/vitess/go/vt/vttablet/tabletserver/tabletenv"
 )
 
-func TestStrictMode(t *testing.T) {
-	db := fakesqldb.New(t)
-	defer db.Close()
-	for query, result := range schematest.Queries() {
-		db.AddQuery(query, result)
-	}
-	db.AddRejectedQuery("select @@global.sql_mode", errRejected)
-
-	qe := newTestQueryEngine(10, 10*time.Second, true)
-	testUtils := newTestUtils()
-	dbconfigs := testUtils.newDBConfigs(db)
-	qe.se.Open(db.ConnParams())
-
-	err := qe.Open(dbconfigs)
-	want := "could not verify mode"
-	if err == nil || !strings.Contains(err.Error(), want) {
-		t.Errorf("se.Open: %v, must contain %s", err, want)
-	}
-}
-
 func TestGetPlanPanicDuetoEmptyQuery(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
@@ -144,6 +124,5 @@ func newTestQueryEngine(queryCacheSize int, idleTimeout time.Duration, strict bo
 	config := tabletenv.DefaultQsConfig
 	config.QueryCacheSize = queryCacheSize
 	config.IdleTimeout = float64(idleTimeout) / 1e9
-	config.StrictMode = strict
 	return NewQueryEngine(DummyChecker, schema.NewEngine(DummyChecker, config), config)
 }

go/vt/vttablet/tabletserver/query_executor.go

@@ -90,7 +90,7 @@ func (qre *QueryExecutor) Execute() (reply *sqltypes.Result, err error) {
 		defer conn.Recycle()
 		switch qre.plan.PlanID {
 		case planbuilder.PlanPassDML:
-			if qre.tsv.qe.strictMode.Get() {
+			if qre.tsv.qe.binlogFormat != connpool.BinlogFormatRow {
 				return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "DML too complex")
 			}
 			return qre.txFetch(conn, qre.plan.FullQuery, qre.bindVars, nil, false, true)
@@ -168,7 +168,7 @@ func (qre *QueryExecutor) execDmlAutoCommit() (reply *sqltypes.Result, err error
 	return qre.execAsTransaction(func(conn *TxConnection) (reply *sqltypes.Result, err error) {
 		switch qre.plan.PlanID {
 		case planbuilder.PlanPassDML:
-			if qre.tsv.qe.strictMode.Get() {
+			if qre.tsv.qe.binlogFormat != connpool.BinlogFormatRow {
 				return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "DML too complex")
 			}
 			reply, err = qre.txFetch(conn, qre.plan.FullQuery, qre.bindVars, nil, false, true)