update vendor (#232)

Author: siddontang

.travis.install-mysql-5.7.sh

@@ -1,26 +1,33 @@
 language: go
 
 go:
-  - 1.7
-  - 1.8
+  - "1.9"
+  - "1.10"
 
 services:
   - elasticsearch
-  - mysql
+
+addons:
+  apt:
+    sources:
+      - mysql-5.7-trusty
+    packages:
+      - mysql-server
+      - mysql-client
 
 before_install:
-  - go install -race std
+  - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
+  - sudo mysql_upgrade
 
   # stop mysql and use row-based format binlog
-  - "bash .travis.install-mysql-5.7.sh"
-  - "sudo /etc/init.d/mysql stop || true"
+  - "sudo service mysql stop || true"
   - "echo '[mysqld]'            | sudo tee /etc/mysql/conf.d/replication.cnf"
   - "echo 'server-id=1'         | sudo tee -a /etc/mysql/conf.d/replication.cnf"
   - "echo 'log-bin=mysql-bin'   | sudo tee -a /etc/mysql/conf.d/replication.cnf"
   - "echo 'binlog-format = row' | sudo tee -a /etc/mysql/conf.d/replication.cnf"
 
   # Start mysql (avoid errors to have logs)
-  - "sudo /etc/init.d/mysql start || true"
+  - "sudo service mysql start || true"
   - "sudo tail -1000 /var/log/syslog"
 
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot

.travis.yml

@@ -0,0 +1,54 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/BurntSushi/toml"
+  version = "0.3.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/juju/errors"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/pingcap/check"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/siddontang/go"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/siddontang/go-mysql"
+
+[[constraint]]
+  name = "github.com/sirupsen/logrus"
+  version = "1.0.3"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Gopkg.lock

@@ -10,12 +10,4 @@ test:
 
 clean:
 	go clean -i ./...
-	@rm -rf bin
-
-
-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 update --strip-vendor
-	@echo "removing test files"
-	glide-vc --only-code --no-tests --use-lock-file
+	@rm -rf bin

Gopkg.toml

@@ -0,0 +1,6 @@
+find vendor \( -type f -or -type l \)  -not -name "*.go" -not -name "LICENSE" -not -name "*.s" -not -name "PATENTS" -not -name "*.h" -not -name "*.c" | xargs -I {} rm {}
+# delete all test files
+find vendor -type f -name "*_generated.go" | xargs -I {} rm {}
+find vendor -type f -name "*_test.go" | xargs -I {} rm {}
+find vendor -type d -name "_vendor" | xargs -I {} rm -rf {}
+find vendor -type d -empty | xargs -I {} rm -rf {}

Makefile

@@ -204,6 +204,7 @@ type = "river"
 }
 
 func (s *riverTestSuite) testExecute(c *C, query string, args ...interface{}) {
+	c.Logf("query %s, args: %v", query, args)
 	_, err := s.c.Execute(query, args...)
 	c.Assert(err, IsNil)
 }

clear_vendor.sh

@@ -50,6 +50,10 @@ func (h *eventHandler) OnRotate(e *replication.RotateEvent) error {
 	return h.r.ctx.Err()
 }
 
+func (h *eventHandler) OnTableChanged(schema, table string) error {
+	return nil
+}
+
 func (h *eventHandler) OnDDL(nextPos mysql.Position, _ *replication.QueryEvent) error {
 	h.r.syncCh <- posSaver{nextPos, true}
 	return h.r.ctx.Err()