Merge pull request #362 from kuba--/mysql

Upgrade go-mysql-server

Author: ajnavarro

.travis.yml

@@ -75,7 +75,7 @@ jobs:
       deploy:
         provider: releases
         api_key: $GITHUB_TOKEN
-        file_glob: true,
+        file_glob: true
         file: build/*darwin_amd64.tar.gz
         skip_cleanup: true
         on:

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "24a5925748096dd3116b0073833a438ecb0c34f9"
+  revision = "dcc1c537eb7e2bc20ce69d03732e8aa8feaa8612"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"

Gopkg.toml

@@ -1,6 +1,7 @@
 package command
 
 import (
+	"fmt"
 	"net"
 	"os"
 	"path/filepath"
@@ -13,6 +14,7 @@ import (
 	"github.com/opentracing/opentracing-go"
 	gopilosa "github.com/pilosa/go-pilosa"
 	"github.com/sirupsen/logrus"
+	jaeger "github.com/uber/jaeger-client-go"
 	"github.com/uber/jaeger-client-go/config"
 	sqle "gopkg.in/src-d/go-mysql-server.v0"
 	"gopkg.in/src-d/go-mysql-server.v0/server"
@@ -79,17 +81,17 @@ func (c *Server) Execute(args []string) error {
 
 	var tracer opentracing.Tracer
 	if c.TraceEnabled {
+		if os.Getenv("JAEGER_SERVICE_NAME") == "" {
+			os.Setenv("JAEGER_SERVICE_NAME", TracerServiceName)
+		}
+
 		cfg, err := config.FromEnv()
 		if err != nil {
 			logrus.WithField("error", err).
 				Fatal("unable to read jaeger environment")
 			return err
 		}
 
-		if cfg.ServiceName == "" {
-			cfg.ServiceName = TracerServiceName
-		}
-
 		logger := &jaegerLogrus{logrus.WithField("subsystem", "jaeger")}
 
 		t, closer, err := cfg.NewTracer(
@@ -104,7 +106,18 @@ func (c *Server) Execute(args []string) error {
 		tracer = t
 		defer closer.Close()
 
-		logrus.Info("tracing enabled")
+		jaegerHost := os.Getenv("JAEGER_AGENT_HOST")
+		if jaegerHost == "" {
+			jaegerHost = jaeger.DefaultUDPSpanServerHost
+		}
+
+		jaegerPort := os.Getenv("JAEGER_AGENT_PORT")
+		if jaegerPort == "" {
+			jaegerPort = strconv.Itoa(jaeger.DefaultUDPSpanServerPort)
+		}
+
+		endpoint := fmt.Sprintf("%s:%s", jaegerHost, jaegerPort)
+		logrus.WithField("endpoint", endpoint).Info("tracing enabled")
 	}
 
 	hostString := net.JoinHostPort(c.Host, strconv.Itoa(c.Port))

cmd/gitbase/command/server.go

@@ -56,7 +56,7 @@ Usage:
 
 Starts a gitbase server instance
 
-By default when gitbase encounters an error in a repository it
+By default when gitbase encounters and error in a repository it
 stops the query. With GITBASE_SKIP_GIT_ERRORS variable it won't
 complain and just skip those rows or repositories.
 

docs/using-gitbase/configuration.md

@@ -14,4 +14,4 @@ To make some common tasks easier for the user, there are some functions to inter
 
 ## Standard functions
 
-You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/24a5925748096dd3116b0073833a438ecb0c34f9#custom-functions).
+You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/dcc1c537eb7e2bc20ce69d03732e8aa8feaa8612#custom-functions).

docs/using-gitbase/functions.md

@@ -1,3 +1,3 @@
 ## Supported syntax
 
-To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/24a5925748096dd3116b0073833a438ecb0c34f9/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).
+To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/dcc1c537eb7e2bc20ce69d03732e8aa8feaa8612/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).

docs/using-gitbase/supported-syntax.md

@@ -5,6 +5,6 @@ All PRs must keep the documentation up to date. If this PR changes or adds some
 - Schema changes
 - Syntax changes
 - Add or update examples
-- go-mysql-server version hash. Change it on documentation links too.
+- ./rev-upgrade.sh "gopkg.in/src-d/go-mysql-server.v0" "the latest go-mysql-server revision"
 
  -->

pull_request_template.md

@@ -0,0 +1,71 @@
+#!/bin/bash
+#
+# Upgrade project's revision
+# $ ./rev-upgrade.sh project rev-new
+# e.g.:
+# ./rev-upgrade.sh "gopkg.in/src-d/go-mysql-server.v0" "0123456789abcdef"
+#
+#set -x
+
+read -d '' SCRIPT << 'EOF'
+BEGIN {
+    PRJ = ARGV[2]
+    gsub(/^[ \t\r\n\'\"]+/, "", PRJ)
+    gsub(/[ \t\r\n\'\"]+$/, "", PRJ)
+    ARGC = 2
+
+    DEPTH = 0
+}
+
+/\[\[projects\]\]/ {
+    DEPTH = 1
+}
+
+/name/ {
+        if (DEPTH == 1) {
+            split($0, name, "=")
+            prj = name[2]
+            gsub(/^[ \t\r\n\'\"]+/, "", prj)
+            gsub(/[ \t\r\n\'\"]+$/, "", prj)
+            if (prj == PRJ) {
+                DEPTH = 2
+            }
+        }
+}
+
+/revision/ {
+        if (DEPTH == 2) {
+            split($0, revision, "=")
+            gsub(/^[ \t\r\n\'\"]+/, "", revision[2])
+            gsub(/[ \t\r\n\'\"]+$/, "", revision[2])
+            print revision[2]
+            DEPTH = 0
+        }
+}
+EOF
+
+GOPKG="$(git rev-parse --show-toplevel)/Gopkg.lock"
+PRJ="$1"
+shift
+REV_NEW="$1"
+REV_OLD="$(awk  "$SCRIPT" "$GOPKG" "$PRJ")"
+
+echo "Project: $PRJ"
+echo "Old rev: $REV_OLD"
+echo "New rev: $REV_NEW"
+
+if [ $REV_OLD == $REV_NEW ]; then
+    exit 0
+fi
+
+for file in $(git ls-files | xargs egrep -l $REV_OLD); do
+    echo "# $file"
+    sed -i '' "s/$REV_OLD/$REV_NEW/g" $file
+done
+
+err=$?
+if [ $err -ne 0 ]; then
+    exit $err
+fi
+
+dep ensure -v