Merge branch 'master' into docs/perf-early-filters

Author: ajnavarro

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "749adb47d4bf0620e578641e59e8c63192362849"
+  revision = "541fde3b92093b3a449e803342a7a18c686275e6"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"
@@ -84,6 +84,10 @@
   name = "gopkg.in/src-d/go-vitess.v1"
   version = "1.6.0"
 
+[[constraint]]
+  name = "github.com/hhatto/gocloc"
+  revision = "c5379f7427f9a9a5bec11accdf8a2ef7fa414d3e"
+
 [prune]
   [[prune.project]]
     name = "gopkg.in/src-d/go-mysql-server.v0"

Gopkg.toml

@@ -26,8 +26,8 @@
 |:-----|:-----|:------------|
 |`INMEMORY_JOINS`|environment|If set it will perform all joins in memory. Default is off.|
 |`inmemory_joins`|session|If set it will perform all joins in memory. Default is off. This has precedence over `INMEMORY_JOINS`.|
-|`MAX_MEMORY_INNER_JOIN`|environment|The maximum number of memory, in megabytes, that can be consumed by go-mysql-server before switching to multipass mode in inner joins. Default is the 20% of all available physical memory.|
-|`max_memory_joins`|session|The maximum number of memory, in megabytes, that can be consumed by go-mysql-server before switching to multipass mode in inner joins. Default is the 20% of all available physical memory. This has precedence over `MAX_MEMORY_INNER_JOIN`.|
+|`MAX_MEMORY_JOIN`|environment|The maximum number of memory, in megabytes, that can be consumed by go-mysql-server before switching to multipass mode in joins. Default is the 20% of all available physical memory.|
+|`max_memory_joins`|session|The maximum number of memory, in megabytes, that can be consumed by go-mysql-server before switching to multipass mode in joins. Default is the 20% of all available physical memory. This has precedence over `MAX_MEMORY_JOIN`.|
 |`DEBUG_ANALYZER`|environment|If set, the analyzer will print debug messages. Default is off.|
 |`PILOSA_INDEX_THREADS`|environment|Number of threads used in index creation. Default is the number of cores available in the machine.|
 |`pilosa_index_threads`|environment|Number of threads used in index creation. Default is the number of cores available in the machine. This has precedence over `PILOSA_INDEX_THREADS`.|

docs/using-gitbase/configuration.md

@@ -26,6 +26,7 @@ These are all functions that are available because they are implemented in `go-m
 |`AVG(expr)`|Returns the average value of expr in all rows.|
 |`CEIL(number)`|Return the smallest integer value that is greater than or equal to `number`.|
 |`CEILING(number)`|Return the smallest integer value that is greater than or equal to `number`.|
+|`CHAR_LENGTH(str)`|Return the length of the string in characters.|
 |`COALESCE(...)`|The function returns the first non-null value in a list.|
 |`CONCAT(...)`|Concatenate any group of fields into a single string.|
 |`CONCAT_WS(sep, ...)`|Concatenate any group of fields into a single string. The first argument is the separator for the rest of the arguments. The separator is added between the strings to be concatenated. The separator can be a string, as can the rest of the arguments. If the separator is NULL, the result is NULL.|
@@ -46,6 +47,7 @@ These are all functions that are available because they are implemented in `go-m
 |`IS_BINARY(blob)`|Returns whether a BLOB is a binary file or not.|
 |`JSON_EXTRACT(json_doc, path, ...)`|Extracts data from a json document using json paths.|
 |`LEAST(...)`|Returns the smaller numeric or string value.|
+|`LENGTH(str)`|Return the length of the string in bytes.|
 |`LN(X)`|Return the natural logarithm of X.|
 |`LOG(X), LOG(B, X)`|If called with one parameter, this function returns the natural logarithm of X. If called with two parameters, this function returns the logarithm of X to the base B. If X is less than or equal to 0, or if B is less than or equal to 1, then NULL is returned.|
 |`LOG10(X)`|Returns the base-10 logarithm of X.|

docs/using-gitbase/functions.md

@@ -26,4 +26,4 @@ and for the second query also two indexes will be used and the result will be a
 
 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/749adb47d4bf0620e578641e59e8c63192362849#indexes) documentation for more details
+See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/541fde3b92093b3a449e803342a7a18c686275e6#indexes) documentation for more details

docs/using-gitbase/indexes.md

@@ -23,7 +23,7 @@ func TestLoc(t *testing.T) {
 		{"too many args given", sql.NewRow("foo.rb", "bar", "baz"), nil, sql.ErrInvalidArgumentNumber},
 		{"invalid blob type given", sql.NewRow("foo", 5), nil, sql.ErrInvalidType},
 		{"path and blob are given", sql.NewRow("foo", "#!/usr/bin/env python\n\nprint 'foo'"), &gocloc.ClocFile{
-			Code: 2, Comments: 0, Blanks: 1, Name: "foo", Lang: "",
+			Code: 2, Comments: 0, Blanks: 1, Name: "foo", Lang: "Python",
 		}, nil},
 	}