Skip to content

Commit dc0820d

Browse files
authored
Merge pull request #875 from ajnavarro/update-mysql-180619
Update go-mysql-server dependency
2 parents cd912d7 + 605b5d7 commit dc0820d

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010

1111
- Added `commit_file_stats` function.
1212
- Added documentation about `commit_stats`.
13-
13+
- Add metrics (engine, analyzer, regex, pilosa) based on go-kit interface. ([#744](https://github.com/src-d/go-mysql-server/pull/744))
1414
### Changed
1515

1616
- internal/function: gracefully handle errors in commit_stats.

docs/using-gitbase/functions.md

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ These are all functions that are available because they are implemented in `go-m
4949
|`IFNULL(expr1, expr2)`|If expr1 is not NULL, IFNULL() returns expr1; otherwise it returns expr2.|
5050
|`IS_BINARY(blob)`|Returns whether a BLOB is a binary file or not.|
5151
|`JSON_EXTRACT(json_doc, path, ...)`|Extracts data from a json document using json paths.|
52+
|`JSON_UNQUOTE(json)`|Unquotes JSON value and returns the result as a utf8mb4 string.|
5253
|`LEAST(...)`|Returns the smaller numeric or string value.|
5354
|`LENGTH(str)`|Return the length of the string in bytes.|
5455
|`LN(X)`|Return the natural logarithm of X.|

docs/using-gitbase/supported-syntax.md

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
- IS_BINARY
9999
- IS_BINARY
100100
- JSON_EXTRACT
101+
- JSON_UNQUOTE
101102
- LEAST
102103
- LN
103104
- LOG10

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/src-d/enry/v2 v2.0.0
1717
github.com/src-d/go-git v4.7.0+incompatible
1818
github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible
19-
github.com/src-d/go-mysql-server v0.4.1-0.20190607090451-cf9bb2a992da
19+
github.com/src-d/go-mysql-server v0.4.1-0.20190617130801-5f48ea31ce99
2020
github.com/stretchr/testify v1.3.0
2121
github.com/uber-go/atomic v1.4.0 // indirect
2222
github.com/uber/jaeger-client-go v2.16.0+incompatible

go.sum

+6-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE
1313
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
1414
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s=
1515
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
16+
github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
17+
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
1618
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
1719
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
1820
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
@@ -53,6 +55,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
5355
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
5456
github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw=
5557
github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
58+
github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
59+
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
5660
github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
5761
github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
5862
github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
@@ -200,8 +204,8 @@ github.com/src-d/go-git v4.7.0+incompatible h1:IYSSnbAHeKmsfbQFi9ozbid+KNh0bKjlo
200204
github.com/src-d/go-git v4.7.0+incompatible/go.mod h1:1bQciz+hn0jzPQNsYj0hDFZHLJBdV7gXE2mWhC7EkFk=
201205
github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible h1:A5bKevhs9C//Nh8QV0J+1KphEaIa25cDe1DTs/yPxDI=
202206
github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible/go.mod h1:XcIQp7L+k0pgfTqfbaTKj3kxlBv8kYOKZ/tKNXbZFLg=
203-
github.com/src-d/go-mysql-server v0.4.1-0.20190607090451-cf9bb2a992da h1:k98uJPIP1kysgYtidyDRgYXIXKj0HZ4d7jf9d+ztSmg=
204-
github.com/src-d/go-mysql-server v0.4.1-0.20190607090451-cf9bb2a992da/go.mod h1:6jO9OOna9loQFrf5XlB+fTD68ABnL7iMZu6IpUEIyxk=
207+
github.com/src-d/go-mysql-server v0.4.1-0.20190617130801-5f48ea31ce99 h1:oZMn2HmQlDRHxWvyXRZnE9uUwUaVXVE/qrcvuFFDJ7s=
208+
github.com/src-d/go-mysql-server v0.4.1-0.20190617130801-5f48ea31ce99/go.mod h1:GO8SmBnN9LcKSXy6DYuBbqKtJvrRnHsBrlXvlVOX+NM=
205209
github.com/src-d/go-oniguruma v1.0.0 h1:JDk5PUAjreGsGAKLsoDLNmrsaryjJ5RqT3h+Si6aw/E=
206210
github.com/src-d/go-oniguruma v1.0.0/go.mod h1:chVbff8kcVtmrhxtZ3yBVLLquXbzCS6DrxQaAK/CeqM=
207211
github.com/src-d/go-oniguruma v1.1.0 h1:EG+Nm5n2JqWUaCjtM0NtutPxU7ZN5Tp50GWrrV8bTww=

0 commit comments

Comments
 (0)