Skip to content

update vendor #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 12 additions & 4 deletions river/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package river

import (
"bytes"
"encoding/json"
"fmt"
"reflect"
"strings"
"time"
"encoding/json"

"github.com/juju/errors"
"github.com/ngaut/log"
Expand Down Expand Up @@ -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"
}
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down
14 changes: 13 additions & 1 deletion vendor/github.com/pingcap/check/check.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/github.com/pingcap/check/helpers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion vendor/github.com/pingcap/check/run.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 24 additions & 10 deletions vendor/github.com/siddontang/go-mysql/canal/canal.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions vendor/github.com/siddontang/go-mysql/canal/config.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions vendor/github.com/siddontang/go-mysql/canal/dump.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions vendor/github.com/siddontang/go-mysql/canal/handler.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions vendor/github.com/siddontang/go-mysql/canal/master.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading