Skip to content

Commit 50f8bf8

Browse files
martianzhangmartianzhang
committed
fix XiaoMi#5 && daily build update
 XiaoMi#5 Go version large than 1.8 has default GOPATH. use `go env GOPATH` get GOPATH envirment variable. daily build update update vitess vendor package update document about installation and configration
1 parent 77b9ef4 commit 50f8bf8

File tree

13 files changed

+3040
-3030
lines changed

13 files changed

+3040
-3030
lines changed

‎Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
# $ checkmake Makefile
55
#
66
BINARY=soar
7+
GOPATH ?= $(shell go env GOPATH)
8+
# Ensure GOPATH is set before running build process.
9+
ifeq "$(GOPATH)" ""
10+
$(error Please set the environment variable GOPATH before running `make`)
11+
endif
712
PATH := ${GOPATH}/bin:$(PATH)
813

914
# These are the values we want to pass for VERSION and BUILD

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![SOAR](https://raw.githubusercontent.com/XiaoMi/soar/master/doc/images/logo.png)
22

3-
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/xiaomi-dba/soar) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://github.com/XiaoMi/soar/blob/master/LICENSE)
3+
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/xiaomi-dba/soar) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://github.com/XiaoMi/soar/blob/master/LICENSE) [![Go Report Card](https://goreportcard.com/badge/github.com/XiaoMi/soar)](https://goreportcard.com/report/github.com/XiaoMi/soar)
44

55
[文档](http://github.com/XiaoMi/soar/tree/master/doc) | [FAQ](http://github.com/XiaoMi/soar/blob/master/doc/FAQ.md) | [变更记录](http://github.com/XiaoMi/soar/blob/master/CHANGES.md) | [路线图](http://github.com/XiaoMi/soar/blob/master/doc/roadmap.md) | [English](http://github.com/XiaoMi/soar/blob/master/README_EN.md)
66

‎README_EN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![SOAR](https://raw.githubusercontent.com/XiaoMi/soar/master/doc/images/logo.png)
22

3-
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/xiaomi-dba/soar) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://github.com/XiaoMi/soar/blob/master/LICENSE)
3+
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/xiaomi-dba/soar) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://github.com/XiaoMi/soar/blob/master/LICENSE) [![Go Report Card](https://goreportcard.com/badge/github.com/XiaoMi/soar)](https://goreportcard.com/report/github.com/XiaoMi/soar)
44

55
[Docs](http://github.com/XiaoMi/soar/tree/master/doc) | [FAQ](http://github.com/XiaoMi/soar/blob/master/doc/FAQ_en.md) | [中文](http://github.com/XiaoMi/soar/blob/master/README.md)
66

‎common/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ var Config = &Configration{
158158
SpaghettiQueryLength: 2048,
159159
AllowDropIndex: false,
160160
LogLevel: 3,
161-
LogOutput: "/dev/stderr",
161+
LogOutput: os.Stderr.Name(),
162162
ReportType: "markdown",
163163
ReportCSS: "",
164164
ReportJavascript: "",

‎doc/config.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
配置文件为[yaml](https://en.wikipedia.org/wiki/YAML)格式。一般情况下只需要配置online-dsn, test-dsn, log-output等少数几个参数。即使不创建配置文件SOAR仍然会给出基本的启发式建议。
44

5+
默认文件会按照`/etc/soar.yaml`, `./etc/soar.yaml`, `./soar.yaml`顺序加载，找到第一个后不再继续加载后面的配置文件。如需指定其他配置文件可以通过`-config`参数指定。
6+
57
```text
68
# 线上环境配置
79
online-dsn:

‎doc/install.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
```bash
44
wget https://github.com/XiaoMi/soar/releases/download/${tag}/soar.linux-amd64 -O soar
5-
5+
chmod a+x soar
66
如：
77
wget https://github.com/XiaoMi/soar/releases/download/v0.8.0/soar.linux-amd64 -O soar
8+
chmod a+x soar
89
```
910

1011
## 源码安装

‎doc/install_en.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
```bash
44
wget https://github.com/XiaoMi/soar/releases/download/${tag}/soar.linux-amd64 -O soar
5-
5+
chmod a+x soar
66
eg.
77
wget https://github.com/XiaoMi/soar/releases/download/v0.8.0/soar.linux-amd64 -O soar
8+
chmod a+x soar
89
```
910

1011
## Build From Source

‎vendor/vendor.json

+23-23
Original file line numberDiff line numberDiff line change
@@ -1016,68 +1016,68 @@
10161016
{
10171017
"checksumSHA1": "xN9m8UZAFzUvCzxPCbai/y3N3fg=",
10181018
"path": "vitess.io/vitess",
1019-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1020-
"revisionTime": "2018-10-18T14:55:22Z"
1019+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1020+
"revisionTime": "2018-10-20T13:54:35Z"
10211021
},
10221022
{
10231023
"checksumSHA1": "aKn1oKcY74N8TRLm3Ayt7Q4bbI4=",
10241024
"path": "vitess.io/vitess/go/bytes2",
1025-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1026-
"revisionTime": "2018-10-18T14:55:22Z"
1025+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1026+
"revisionTime": "2018-10-20T13:54:35Z"
10271027
},
10281028
{
10291029
"checksumSHA1": "JVCEN4UGRmg3TofIBdzZMZ3G0Ww=",
10301030
"path": "vitess.io/vitess/go/hack",
1031-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1032-
"revisionTime": "2018-10-18T14:55:22Z"
1031+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1032+
"revisionTime": "2018-10-20T13:54:35Z"
10331033
},
10341034
{
10351035
"checksumSHA1": "L7ROM3XZyVXSD799Isv3bcFFhuQ=",
10361036
"path": "vitess.io/vitess/go/sqltypes",
1037-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1038-
"revisionTime": "2018-10-18T14:55:22Z"
1037+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1038+
"revisionTime": "2018-10-20T13:54:35Z"
10391039
},
10401040
{
10411041
"checksumSHA1": "ntFIQYkBS51G6y+FEkjFW40+HOU=",
10421042
"path": "vitess.io/vitess/go/vt/log",
1043-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1044-
"revisionTime": "2018-10-18T14:55:22Z"
1043+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1044+
"revisionTime": "2018-10-20T13:54:35Z"
10451045
},
10461046
{
10471047
"checksumSHA1": "+AyVYXW7XGu+R8AUNU0YY8DcE8k=",
10481048
"path": "vitess.io/vitess/go/vt/proto/query",
1049-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1050-
"revisionTime": "2018-10-18T14:55:22Z"
1049+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1050+
"revisionTime": "2018-10-20T13:54:35Z"
10511051
},
10521052
{
10531053
"checksumSHA1": "OnWsUHLDKcO3spwH0jD55SvKD24=",
10541054
"path": "vitess.io/vitess/go/vt/proto/topodata",
1055-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1056-
"revisionTime": "2018-10-18T14:55:22Z"
1055+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1056+
"revisionTime": "2018-10-20T13:54:35Z"
10571057
},
10581058
{
10591059
"checksumSHA1": "jUgYgOnOM36Zs1GMRVV+vG1hfnw=",
10601060
"path": "vitess.io/vitess/go/vt/proto/vtgate",
1061-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1062-
"revisionTime": "2018-10-18T14:55:22Z"
1061+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1062+
"revisionTime": "2018-10-20T13:54:35Z"
10631063
},
10641064
{
10651065
"checksumSHA1": "pLWM+SPGZs3k+IhjktE/cGUlpM0=",
10661066
"path": "vitess.io/vitess/go/vt/proto/vtrpc",
1067-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1068-
"revisionTime": "2018-10-18T14:55:22Z"
1067+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1068+
"revisionTime": "2018-10-20T13:54:35Z"
10691069
},
10701070
{
1071-
"checksumSHA1": "SxnOqBYDRN+csdXa9Stf4Q145ak=",
1071+
"checksumSHA1": "LDXjimRADIzASesUnWUOJ6smswg=",
10721072
"path": "vitess.io/vitess/go/vt/sqlparser",
1073-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1074-
"revisionTime": "2018-10-18T14:55:22Z"
1073+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1074+
"revisionTime": "2018-10-20T13:54:35Z"
10751075
},
10761076
{
10771077
"checksumSHA1": "oF4XzuOzwvj1iduX/lYqNSyY/HM=",
10781078
"path": "vitess.io/vitess/go/vt/vterrors",
1079-
"revision": "97d94af8696ea8b846cf75d2b1f35cf5f17a4dfe",
1080-
"revisionTime": "2018-10-18T14:55:22Z"
1079+
"revision": "8ed64fbeb8c63e4d9e9102d24c2ccf30e341005c",
1080+
"revisionTime": "2018-10-20T13:54:35Z"
10811081
}
10821082
],
10831083
"rootPath": "github.com/XiaoMi/soar"

‎vendor/vitess.io/vitess/go/vt/sqlparser/analyzer.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/vitess.io/vitess/go/vt/sqlparser/ast.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)