Merge branch 'master' into fix/uast-panic

Author: ajnavarro

CONTRIBUTING.md

@@ -0,0 +1,57 @@
+# source{d} Contributing Guidelines
+
+source{d} projects accept contributions via GitHub pull requests.
+This document outlines some of the
+conventions on development workflow, commit message formatting, contact points,
+and other resources to make it easier to get your contribution accepted.
+
+## Certificate of Origin
+
+By contributing to this project you agree to the [Developer Certificate of
+Origin (DCO)](DCO). This document was created by the Linux Kernel community and is a
+simple statement that you, as a contributor, have the legal right to make the
+contribution.
+
+In order to show your agreement with the DCO you should include at the end of commit message,
+the following line: `Signed-off-by: John Doe <[email protected]>`, using your real name.
+
+This can be done easily using the [`-s`](https://github.com/git/git/blob/b2c150d3aa82f6583b9aadfecc5f8fa1c74aca09/Documentation/git-commit.txt#L154-L161) flag on the `git commit`.
+
+## Support Channels
+
+The official support channels, for both users and contributors, are:
+
+- GitHub issues: each repository has its own list of issues.
+- Slack: join the [source{d} Slack](https://join.slack.com/t/sourced-community/shared_invite/enQtMjc4Njk5MzEyNzM2LTFjNzY4NjEwZGEwMzRiNTM4MzRlMzQ4MmIzZjkwZmZlM2NjODUxZmJjNDI1OTcxNDAyMmZlNmFjODZlNTg0YWM) community.
+
+*Before opening a new issue or submitting a new pull request, it's helpful to
+search the project - it's likely that another user has already reported the
+issue you're facing, or it's a known issue that we're already aware of.
+
+## How to Contribute
+
+Pull Requests (PRs) are the main and exclusive way to contribute code to source{d} projects.
+In order for a PR to be accepted it needs to pass a list of requirements:
+
+- The contribution must be correctly explained with natural language and providing a minimum working example that reproduces it.
+- All PRs must be written idiomaticly:
+    - for Go: formatted according to [gofmt](https://golang.org/cmd/gofmt/), and without any warnings from [go lint](https://github.com/golang/lint) nor [go vet](https://golang.org/cmd/vet/)
+    - for other languages, similar constraints apply.
+- They should in general include tests, and those shall pass.
+    - If the PR is a bug fix, it has to include a new unit test that fails before the patch is merged.
+    - If the PR is a new feature, it has to come with a suite of unit tests, that tests the new functionality.
+    - In any case, all the PRs have to pass the personal evaluation of at least one of the [maintainers](MAINTAINERS).
+
+### Format of the commit message
+
+Every commit message should describe what was changed, under which context and, if applicable, the GitHub issue it relates to:
+
+```
+plumbing: packp, Skip argument validations for unknown capabilities. Fixes #623
+```
+
+The format can be described more formally as follows:
+
+```
+<package>: <subpackage>, <what changed>. [Fixes #<issue-number>]
+```

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "7030a31bb89087929ad0f5401a5e8ae0e7e18aa2"
+  revision = "44e416bff2e89a515172814e3f688afe5d875deb"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"

Gopkg.toml

@@ -20,11 +20,11 @@ You can see some [query examples](/docs/using-gitbase/examples.md) in [gitbase d
 
 ## Motivation and scope
 
-gitbase was born to ease the analysis of git repositories and its source code.
+gitbase was born to ease the analysis of git repositories and their source code.
 
 Also, making it MySQL compatible, we provide the maximum compatibility between languages and existing tools.
 
-As a single binary allows use it as a standalone service. The service is able to process local repositories or integrate with existing tools and frameworks (e.g. spark) to make source code analysis on the large scale.
+It comes as a single self-contained binary and it can be used as a standalone service. The service is able to process local repositories or integrate with existing tools and frameworks (e.g. spark) to make source code analysis on a large scale.
 
 ## Further reading
 

README.md

@@ -27,7 +27,7 @@ NATURAL JOIN
 	ref_commits
 WHERE
 	ref_commits.ref_name = 'HEAD'
-	AND ref_commits.index = 0;
+	AND ref_commits.history_index = 0;
 ```
 
 ## Commits that appear in more than one reference
@@ -86,7 +86,7 @@ NATURAL JOIN
 	ref_commits
 WHERE
 	ref_commits.ref_name = 'HEAD'
-	AND ref_commits.index BETWEEN 0 AND 5
+	AND ref_commits.history_index BETWEEN 0 AND 5
 	AND is_binary(blob_content) = false
     AND files.file_path NOT REGEXP '^vendor.*'
 	AND (

docs/using-gitbase/examples.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/9c3b77f244b0909fed15a669be2cdeb355462a7d#custom-functions).
+You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/44e416bff2e89a515172814e3f688afe5d875deb#custom-functions).

docs/using-gitbase/functions.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/9c3b77f244b0909fed15a669be2cdeb355462a7d#indexes) documentation for more details
+See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/44e416bff2e89a515172814e3f688afe5d875deb#indexes) documentation for more details

docs/using-gitbase/indexes.md

@@ -173,11 +173,11 @@ This table represents the relation between commits and [files](#files). Using th
 | repository_id | TEXT  |
 | commit_hash   | TEXT  |
 | ref_name      | TEXT  |
-| index         | INT64 |
+| history_index | INT64 |
 +---------------+-------+
 ```
 
-This table allow us to get the commit history from a specific reference name. `index` column represent the position of the commit from a specific reference.
+This table allow us to get the commit history from a specific reference name. `history_index` column represents the position of the commit from a specific reference.
 
 This table it's like the [log](https://git-scm.com/docs/git-log) from a specific reference.
 

docs/using-gitbase/schema.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/9c3b77f244b0909fed15a669be2cdeb355462a7d/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/44e416bff2e89a515172814e3f688afe5d875deb/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).

docs/using-gitbase/supported-syntax.md

@@ -351,6 +351,25 @@ func TestSquashCorrectness(t *testing.T) {
 			ON r.commit_hash = c.commit_hash
 			AND r.ref_name = c.ref_name
 			AND c.repository_id = r.repository_id`,
+
+		`SELECT COUNT(r.*) as repos FROM repositories r`,
+
+		`SELECT repository_id, num_files FROM (
+			SELECT COUNT(f.*) num_files, f.repository_id
+			FROM ref_commits r
+			INNER JOIN commit_files cf 
+				ON r.commit_hash = cf.commit_hash 
+				AND r.repository_id = cf.repository_id
+			INNER JOIN files f
+				ON cf.repository_id = f.repository_id
+				AND cf.blob_hash = f.blob_hash
+				AND cf.tree_hash = f.tree_hash
+				AND cf.file_path = f.file_path
+			WHERE r.ref_name = 'HEAD'
+			GROUP BY f.repository_id
+		) t
+		ORDER BY num_files DESC
+		LIMIT 10`,
 	}
 
 	for _, q := range queries {