fix panic due incorrect usage of plan.PreparedPlanCacheEnabled (pingc…

…ap#39)
YuJuncen · Apr 25, 2018 · aff81ad · aff81ad
1 parent 221e7d9
commit aff81ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/pingcap/tidb-lightning/lightning"
 	"github.com/pingcap/tidb-lightning/lightning/config"
+	"github.com/pingcap/tidb/plan"
 )
 
 func onExitSignal() {
@@ -28,7 +29,15 @@ func onExitSignal() {
 	log.Infof("Got signal %d to exit.", sig)
 }
 
+func setGlobalVars() {
+	// hardcode it
+	plan.PreparedPlanCacheEnabled = true
+	plan.PreparedPlanCacheCapacity = 10
+}
+
 func main() {
+	setGlobalVars()
+
 	cfg, err := config.LoadConfig(os.Args[1:])
 	switch errors.Cause(err) {
 	case nil:

diff --git a/lightning/kv/sql2kv.go b/lightning/kv/sql2kv.go
@@ -4,7 +4,6 @@ import (
 	"github.com/juju/errors"
 	sqltool "github.com/pingcap/tidb-lightning/lightning/sql"
 	"github.com/pingcap/tidb/kv"
-	"github.com/pingcap/tidb/plan"
 	kvec "github.com/pingcap/tidb/util/kvencoder"
 	log "github.com/sirupsen/logrus"
 )
@@ -17,12 +16,6 @@ var (
 	PrepareStmtMode = false
 )
 
-func setGlobalVars() {
-	// hardcode it
-	plan.PreparedPlanCacheEnabled = true
-	plan.PreparedPlanCacheCapacity = 10
-}
-
 func InitMembufCap(batchSQLLength int64) {
 	kv.ImportingTxnMembufCap = int(batchSQLLength) * 4
 	// TODO : calculate predicted ratio, bwtween sql and kvs' size, base on specified DDL
@@ -60,8 +53,6 @@ func NewTableKVEncoder(
 	}
 	log.Debugf("set sql_mode=%s", sqlMode)
 
-	setGlobalVars()
-
 	kvcodec := &TableKVEncoder{
 		db:          db,
 		table:       table,