update vendor (#138)

Author: siddontang

Makefile

@@ -16,6 +16,6 @@ clean:
 update_vendor:
 	which glide >/dev/null || curl https://glide.sh/get | sh
 	which glide-vc || go get -v -u github.com/sgotti/glide-vc
-	glide --verbose update --strip-vendor --skip-test
+	glide update --strip-vendor --skip-test
 	@echo "removing test files"
 	glide vc --only-code --no-tests

glide.lock

@@ -7,7 +7,7 @@ import:
 - package: github.com/satori/go.uuid
   version: ^1.1.0
 - package: github.com/siddontang/go-mysql
-  version: 96156dbfdf7556c67eb0889781c072f93295078d
+  version: 426eb5688c9b950431673ef104deb5da8ab04648
   subpackages:
   - canal
   - client

glide.yaml

@@ -2,11 +2,11 @@ package river
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"reflect"
 	"strings"
 	"time"
-	"encoding/json"
 
 	"github.com/juju/errors"
 	"github.com/ngaut/log"
@@ -86,6 +86,14 @@ func (h *eventHandler) OnRow(e *canal.RowsEvent) error {
 	return h.r.ctx.Err()
 }
 
+func (h *eventHandler) OnGTID(gtid mysql.GTIDSet) error {
+	return nil
+}
+
+func (h *eventHandler) OnPosSynced(pos mysql.Position, force bool) error {
+	return nil
+}
+
 func (h *eventHandler) String() string {
 	return "ESRiverEventHandler"
 }
@@ -401,8 +409,8 @@ func (r *River) makeUpdateReqData(req *elastic.BulkRequest, rule *Rule,
 // Else get the ID's column in one row and format them into a string
 func (r *River) getDocID(rule *Rule, row []interface{}) (string, error) {
 	var (
-  		ids []interface{}
-  		err error 
+		ids []interface{}
+		err error
 	)
 	if rule.ID == nil {
 		ids, err = canal.GetPKValues(rule.TableInfo, row)
@@ -452,7 +460,7 @@ func (r *River) doBulk(reqs []*elastic.BulkRequest) error {
 	if resp, err := r.es.Bulk(reqs); err != nil {
 		log.Errorf("sync docs err %v after binlog %s", err, r.canal.SyncedPosition())
 		return errors.Trace(err)
-	} else if resp.Code / 100 == 2 || resp.Errors {
+	} else if resp.Code/100 == 2 || resp.Errors {
 		for i := 0; i < len(resp.Items); i++ {
 			for action, item := range resp.Items[i] {
 				if len(item.Error) > 0 {