*: fix gometalinter errors (#13)

Makefile

@@ -9,7 +9,7 @@ CURDIR := $(shell pwd)
 GO := GO111MODULE=on go
 GOBUILD := CGO_ENABLED=0 $(GO) build
 GOTEST := CGO_ENABLED=1 $(GO) test
-PACKAGES := $$(go list ./... | grep -vE 'vendor|cmd|tests')
+PACKAGES  := $$(go list ./... | grep -vE 'tests|cmd|vendor')
 FILES := $$(find . -name "*.go" | grep -vE "vendor")
 TOPDIRS := $$(ls -d */ | grep -vE "vendor")
 SHELL := /usr/bin/env bash
@@ -85,3 +85,11 @@ coverage:
  GO111MODULE=off go get github.com/wadey/gocovmerge
  gocovmerge "$(TEST_DIR)"/cov.* > "$(TEST_DIR)/all_cov.out"
  go tool cover -html "$(TEST_DIR)/all_cov.out" -o "$(TEST_DIR)/all_cov.html"
+
+check-static:
+ @echo "gometalinter"
+ gometalinter --disable-all --deadline 120s \
+ --enable misspell \
+ --enable megacheck \
+ --enable ineffassign \
+ ./...

checker/checker.go

@@ -271,13 +271,9 @@ func (c *Checker) Status() interface{} {
  res := c.result.detail
  c.result.RUnlock()
 
- var errs []*pb.ProcessError
- if !res.Summary.Passed {
- errs = append(errs, unit.NewProcessError(pb.ErrorType_CheckFailed, "check was failed, please see detail"))
- }
  rawResult, err := json.Marshal(res)
  if err != nil {
- errs = append(errs, unit.NewProcessError(pb.ErrorType_UnknownError, fmt.Sprintf("marshal error %v", err)))
+ rawResult = []byte(fmt.Sprintf("marshal %+v error %v", res, err))
  }
 
  return &pb.CheckStatus{

dm/worker/server.go

@@ -286,7 +286,7 @@ func (s *Server) FetchDDLInfo(stream pb.Worker_FetchDDLInfoServer) error {
  }
  log.Infof("[server] receive DDLLockInfo %v", in)
 
- ddlInfo = nil // clear and protect to put it back
+ //ddlInfo = nil // clear and protect to put it back
 
  err = s.worker.RecordDDLLockInfo(in)
  if err != nil {

pkg/streamer/utils.go

@@ -57,7 +57,7 @@ func ExtractPos(pos mysql.Position, uuids []string) (uuidWithSuffix string, uuid
  }
 
  // use the latest
- var suffixInt = 0
+ var suffixInt int
  uuid := uuids[len(uuids)-1]
  _, suffixInt, err = utils.ParseSuffixForUUID(uuid)
  if err != nil {

syncer/checkpoint_test.go

@@ -78,7 +78,7 @@ func (s *testSyncerSuite) testGlobalCheckPoint(c *C, cp CheckPoint) {
  err = ioutil.WriteFile(filename, []byte(
  fmt.Sprintf("SHOW MASTER STATUS:\n\tLog: %s\n\tPos: %d\n\tGTID:\n\nSHOW SLAVE STATUS:\n\tHost: %s\n\tLog: %s\n\tPos: %d\n\tGTID:\n\n", pos1.Name, pos1.Pos, "slave_host", pos1.Name, pos1.Pos+1000)),
  0644)
-
+ c.Assert(err, IsNil)
  s.cfg.Mode = config.ModeAll
  s.cfg.Dir = dir
  err = cp.Load()

syncer/ddl.go

@@ -434,6 +434,10 @@ func (s *Syncer) handleOnlineDDL(p *parser.Parser, schema, sql string) ([]string
  }
  for i := range sqls {
  stmt, err := p.ParseOneStmt(sqls[i], "", "")
+ if err != nil {
+ return nil, nil, errors.Trace(err)
+ }
+
  sqls[i], err = genDDLSQL(sqls[i], stmt, tableNames[:1], targetTables, false)
  if err != nil {
  return nil, nil, errors.Trace(err)

syncer/safe-mode/mode_test.go

@@ -38,31 +38,42 @@ func (t *testModeSuite) TestMode(c *C) {
  c.Assert(m.Enable(), IsTrue)
  err = m.Add(-1)
  c.Assert(m.Enable(), IsFalse)
+ c.Assert(err, IsNil)
 
  // Add n
  err = m.Add(101)
  c.Assert(m.Enable(), IsTrue)
+ c.Assert(err, IsNil)
  err = m.Add(-1)
  c.Assert(m.Enable(), IsTrue)
+ c.Assert(err, IsNil)
  err = m.Add(-100)
  c.Assert(m.Enable(), IsFalse)
+ c.Assert(err, IsNil)
 
  // IncrForTable
  schema := "schema"
  table := "table"
  err = m.IncrForTable(schema, table)
+ c.Assert(err, IsNil)
  err = m.IncrForTable(schema, table) // re-Add
+ c.Assert(err, IsNil)
  c.Assert(m.Enable(), IsTrue)
  err = m.DescForTable(schema, table)
+ c.Assert(err, IsNil)
  c.Assert(m.Enable(), IsFalse)
 
  // Add n + IncrForTable
  err = m.Add(100)
+ c.Assert(err, IsNil)
  err = m.IncrForTable(schema, table)
+ c.Assert(err, IsNil)
  c.Assert(m.Enable(), IsTrue)
  err = m.Add(-100)
+ c.Assert(err, IsNil)
  err = m.DescForTable(schema, table)
  c.Assert(m.Enable(), IsFalse)
+ c.Assert(err, IsNil)
 
  // Add becomes to negative
  err = m.Add(-1)

syncer/syncer.go

@@ -1443,9 +1443,13 @@ func (s *Syncer) Run(ctx context.Context) (err error) {
  if err != nil {
  return errors.Trace(err)
  }
- log.Infof("[syncer] add table %s to sharding group (%v)", source, needShardingHandle)
+ log.Infof("[syncer] add table %s to shard group (%v)", source, needShardingHandle)
  default:
  needShardingHandle, group, synced, remain, err = s.sgk.TrySync(ddlInfo.tableNames[1][0].Schema, ddlInfo.tableNames[1][0].Name, source, startPos, currentPos, needHandleDDLs)
+ if err != nil {
+ return errors.Trace(err)
+ }
+ log.Infof("[syncer] try to sync table %s to shard group (%v)", source, needShardingHandle)
  }
 
  if needShardingHandle {