skip master data (#116)

Author: siddontang

elastic/client_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "github.com/pingcap/check"
 )
 
 var host = flag.String("host", "127.0.0.1", "Elasticsearch host")
@@ -104,15 +104,15 @@ func (s *elasticTestSuite) TestParent(c *C) {
 	ParentType := "parent"
 
 	mapping := map[string]interface{}{
-			docType: map[string]interface{}{
-				"_parent": map[string]string{"type": ParentType},
+		docType: map[string]interface{}{
+			"_parent": map[string]string{"type": ParentType},
 		},
 	}
-	err := s.c.CreateMapping(index, docType,  mapping)
+	err := s.c.CreateMapping(index, docType, mapping)
 	c.Assert(err, IsNil)
-	
+
 	items := make([]*BulkRequest, 10)
-	
+
 	for i := 0; i < 10; i++ {
 		id := fmt.Sprintf("%d", i)
 		req := new(BulkRequest)

etc/river.toml

@@ -29,6 +29,10 @@ flavor = "mysql"
 # if not set or empty, ignore mysqldump.
 mysqldump = "mysqldump"
 
+# if we have no privilege to use mysqldump with --master-data,
+# we must skip it.
+#skip_master_data = false
+
 # minimal items to be inserted in one bulk
 bulk_size = 128
 

glide.lock

@@ -7,7 +7,7 @@ import:
 - package: github.com/satori/go.uuid
   version: ^1.1.0
 - package: github.com/siddontang/go-mysql
-  version: ead11cac47bd127a8c667efa07f171a9143d8a25
+  version: 96156dbfdf7556c67eb0889781c072f93295078d
   subpackages:
   - canal
   - client
@@ -22,5 +22,5 @@ import:
   - hack
   - ioutil2
   - sync2
-- package: gopkg.in/check.v1
-  version: 11d3bc7aa68e238947792f30573146a3231fc0f1
+- package: github.com/pingcap/check
+  version: ce8a2f822ab1e245a4eefcef2996531c79c943f1

glide.yaml

@@ -29,7 +29,8 @@ type Config struct {
 	Flavor   string `toml:"flavor"`
 	DataDir  string `toml:"data_dir"`
 
-	DumpExec string `toml:"mysqldump"`
+	DumpExec       string `toml:"mysqldump"`
+	SkipMasterData bool   `toml:"skip_master_data"`
 
 	Sources []SourceConfig `toml:"source"`
 

river/config.go

@@ -72,7 +72,6 @@ func NewRiver(c *Config) (*River, error) {
 	cfg.Password = r.c.ESPassword
 	r.es = elastic.NewClient(cfg)
 
-
 	r.st = &stat{r: r}
 	go r.st.Run(r.c.StatAddr)
 
@@ -90,6 +89,7 @@ func (r *River) newCanal() error {
 	cfg.ServerID = r.c.ServerID
 	cfg.Dump.ExecutionPath = r.c.DumpExec
 	cfg.Dump.DiscardErr = false
+	cfg.Dump.SkipMasterData = r.c.SkipMasterData
 
 	var err error
 	r.canal, err = canal.NewCanal(cfg)

river/river.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	. "gopkg.in/check.v1"
+	. "github.com/pingcap/check"
 )
 
 func (s *riverTestSuite) setupExtra(c *C) (r *River) {

river/river_extra_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
+	. "github.com/pingcap/check"
 	"github.com/siddontang/go-mysql-elasticsearch/elastic"
 	"github.com/siddontang/go-mysql/client"
-	. "gopkg.in/check.v1"
 )
 
 var my_addr = flag.String("my_addr", "127.0.0.1:3306", "MySQL addr")
@@ -110,9 +110,9 @@ func (s *riverTestSuite) SetUpSuite(c *C) {
 		},
 
 		&Rule{Schema: "test",
-			Table:        "test_for_json",
-			Index:        "river",
-			Type:         "river",
+			Table: "test_for_json",
+			Index: "river",
+			Type:  "river",
 		},
 	}
 
@@ -263,11 +263,11 @@ func (s *riverTestSuite) TestRiver(c *C) {
 	c.Assert(r.Found, Equals, true)
 	switch v := r.Source["info"].(type) {
 	case map[string]interface{}:
-	    	c.Assert(v["first"], Equals, "a")
-	    	c.Assert(v["second"], Equals, "b")
+		c.Assert(v["first"], Equals, "a")
+		c.Assert(v["second"], Equals, "b")
 	default:
 		c.Assert(v, Equals, nil)
-	    	c.Assert(true, Equals, false)
+		c.Assert(true, Equals, false)
 	}
 
 	r = s.testElasticGet(c, "100")