Merge branch 'master' into fix/squash-unsquashable

Author: ajnavarro

.travis.yml

@@ -38,9 +38,9 @@ jobs:
 
       before_deploy:
         - make packages
-
-      after_deploy:
-        - DOCKER_PUSH_LATEST=1 make docker-push
+        - export DOCKER_PUSH_LATEST=$(echo ${TRAVIS_BRANCH} | grep -E '^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$') || true
+        - make docker-push
+        - make static-package
 
       deploy:
         provider: releases

Dockerfile

@@ -1,16 +1,16 @@
-FROM golang:1.10 as builder
+FROM golang:1.11-alpine as builder
 
 RUN mkdir -p /go/src/github.com/src-d/gitbase
 WORKDIR /go/src/github.com/src-d/gitbase
 COPY . .
 
-RUN apt-get update && apt-get install libxml2-dev -y
+RUN apk add --update libxml2-dev git make bash gcc g++ curl oniguruma-dev
 RUN go get github.com/golang/dep/...
 RUN dep ensure
 RUN cd vendor/gopkg.in/bblfsh/client-go.v2 && make dependencies
-RUN go install -v github.com/src-d/gitbase/...
+RUN go install -v -tags oniguruma -ldflags "-linkmode external -extldflags '-static -lz'" github.com/src-d/gitbase/...
 
-FROM ubuntu:16.04
+FROM alpine:3.8
 
 COPY --from=builder /go/bin/gitbase /bin
 RUN mkdir -p /opt/repos
@@ -21,14 +21,9 @@ ENV GITBASE_REPOS=/opt/repos
 EXPOSE 3306
 
 ENV TINI_VERSION v0.17.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static /tini
 RUN chmod +x /tini
 
-RUN apt-get update \
-    && apt-get install libxml2-dev git -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
 ENTRYPOINT ["/tini", "--"]
 
 CMD gitbase server -v \

Gopkg.lock

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

Gopkg.toml

@@ -24,3 +24,13 @@ dependencies: bblfsh-client
 
 upgrade:
 	go run tools/rev-upgrade/main.go -p $(UPGRADE_PRJ) -r $(UPGRADE_REV)
+
+static-package:
+	PACKAGE_NAME=gitbase_$(VERSION)_static_linux_amd64 ; \
+	docker rm gitbase-temp ; \
+	docker create --rm --name gitbase-temp $(DOCKER_ORG)/gitbase:$(VERSION) && \
+	mkdir -p build/$${PACKAGE_NAME} && \
+	docker cp gitbase-temp:/bin/gitbase build/$${PACKAGE_NAME} && \
+	cd build && \
+	tar czvf $${PACKAGE_NAME}.tar.gz $${PACKAGE_NAME} && \
+	docker rm gitbase-temp

Makefile

@@ -21,7 +21,7 @@ import (
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/index/pilosa"
-	"gopkg.in/src-d/go-vitess.v0/mysql"
+	"gopkg.in/src-d/go-vitess.v1/mysql"
 )
 
 const (

cmd/gitbase/command/server.go

@@ -11,8 +11,9 @@
 | `GITBASE_INDEX_DIR`          | directory to save indexes, default `/var/lib/gitbase/index`                        |
 | `GITBASE_TRACE`              | enable jaeger tracing, default disabled                                            |
 | `GITBASE_READONLY`           | allow read queries only, disabling creating and deleting indexes, default disabled |
-| `GITBASE_LANGUAGE_CACHE_SIZE`           | size of the cache for the `language` UDF. The size is the maximum number of elements kept in the cache, 10000 by default |
-| `GITBASE_UAST_CACHE_SIZE`           | size of the cache for the `uast` and `uast_mode` UDFs. The size is the maximum number of elements kept in the cache, 10000 by default |
+| `GITBASE_LANGUAGE_CACHE_SIZE`| size of the cache for the `language` UDF. The size is the maximum number of elements kept in the cache, 10000 by default |
+| `GITBASE_UAST_CACHE_SIZE`    | size of the cache for the `uast` and `uast_mode` UDFs. The size is the maximum number of elements kept in the cache, 10000 by default |
+| `GITBASE_CACHESIZE_MB`       | size of the cache for git objects specified as MB                                  |
 
 ### Jaeger tracing variables
 
@@ -73,6 +74,8 @@ Help Options:
       -u, --user=        User name used for connection (default: root)
       -P, --password=    Password used for connection
       -i, --index=       Directory where the gitbase indexes information will be persisted. (default: /var/lib/gitbase/index) [$GITBASE_INDEX_DIR]
+          --cache=       Object cache size in megabytes (default: 512) [$GITBASE_CACHESIZE_MB]
+          --parallelism= Maximum number of parallel threads per table. By default, it's the number of CPU cores. 0 means default, 1 means disabled.
           --no-squash    Disables the table squashing.
           --trace        Enables jaeger tracing [$GITBASE_TRACE]
       -r, --readonly     Only allow read queries. This disables creating and deleting indexes as well. [$GITBASE_READONLY]

docs/using-gitbase/configuration.md

@@ -15,6 +15,21 @@ To make some common tasks easier for the user, there are some functions to inter
 |uast_extract(blob, key)| extracts information identified by the given key from the uast nodes                                                  |
 |uast_children(blob)| returns a flattened array of the children UAST nodes from each one of the UAST nodes in the given sequence                |
 
+
+## Note about uast and uast_mode functions
+
+The data returned by these functions are a list of UAST nodes serialized as explained below.
+
+Each node is serialized sequentially using [protobuf](https://developers.google.com/protocol-buffers/) and prefixed by an Int32 (in big endian byte order) specifying the length of the serialized node. The [bblfsh/sdk](https://github.com/bblfsh/sdk) contains the proto files and the tools to do it.
+
+It results in a byte stream following this structure:
+```
+BigEndianInt32(len(marhsal(node))+marshal(node)+
+BigEndianInt32(len(marhsal(node))+marshal(node)+
+BigEndianInt32(len(marhsal(node))+marshal(node)+
+...
+```
+
 ## Standard functions
 
-You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/95285948912f7edaf92e2e66e44fa6c6ad509942#custom-functions).
+You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/1fa8e98aab8f06ae1569c4d381ccc9d3051f761a#custom-functions).

docs/using-gitbase/functions.md

@@ -43,6 +43,8 @@ go get -u github.com/src-d/gitbase/...
 
 #### Oniguruma support
 
+**Note:** Oniguruma is enabled in the docker container and "static" linux binary.
+
 On linux and macOS you can choose to build gitbase with oniguruma support, resulting in faster results for queries using the `language` UDF.
 
 macOS:

docs/using-gitbase/getting-started.md

@@ -10,4 +10,4 @@ Note that you can create an index either **on one or more columns** or **on a si
 
 You can find some more examples in the [examples](./examples.md#create-an-index-for-columns-on-a-table) section.
 
-See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/95285948912f7edaf92e2e66e44fa6c6ad509942#indexes) documentation for more details
+See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/1fa8e98aab8f06ae1569c4d381ccc9d3051f761a#indexes) documentation for more details