Skip to content

Commit aac2b56

Browse files
ajnavarroajnavarro
authored
Merge pull request #288 from mcarmonaa/fix/ref_commits-schema
Fix ref_commits schema and add this table to the README
2 parents 690d0d1 + 8866a9f commit aac2b56

File tree

3 files changed

+59
-58
lines changed

3 files changed

+59
-58
lines changed

‎README.md

+10-9
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ FROM (
5555
r.repository_id as repo_id,
5656
committer_email
5757
FROM repositories r
58-
INNER JOIN refs
58+
INNER JOIN refs
5959
ON refs.repository_id = r.repository_id AND refs.ref_name = 'HEAD'
60-
INNER JOIN commits c
60+
INNER JOIN commits c
6161
ON YEAR(committer_when) = 2015 AND history_idx(refs.commit_hash, c.commit_hash) >= 0
6262
) as t
6363
GROUP BY committer_email, month, repo_id
@@ -133,14 +133,15 @@ gitbase exposes the following tables:
133133

134134
| Name | Columns |
135135
|:-------------|:------------------------------------------------------------------------------------------------------------------|
136-
| repositories | repository_id |
137-
| remotes | repository_id, remote_name, remote_push_url, remote_fetch_url, remote_push_refspec, remote_fetch_refspec |
136+
| repositories | repository_id |
137+
| remotes | repository_id, remote_name, remote_push_url, remote_fetch_url, remote_push_refspec, remote_fetch_refspec |
138138
| commits | repository_id, commit_hash, commit_author_name, commit_author_email, commit_author_when, committer_name, committer_email, committer_when, commit_message, tree_hash |
139-
| blobs | repository_id, blob_hash, blob_size, blob_content |
140-
| refs | repository_id, ref_name, commit_hash |
141-
| tree_entries | repository_id, tree_hash, blob_hash, tree_entry_mode, tree_entry_name |
142-
| references | repository_id, ref_name, commit_hash |
143-
| commit_trees | repository_id, commit_hash, tree_hash |
139+
| blobs | repository_id, blob_hash, blob_size, blob_content |
140+
| refs | repository_id, ref_name, commit_hash |
141+
| tree_entries | repository_id, tree_hash, blob_hash, tree_entry_mode, tree_entry_name |
142+
| references | repository_id, ref_name, commit_hash |
143+
| ref_commits | repository_id, commit_hash, ref_name, index |
144+
| commit_trees | repository_id, commit_hash, tree_hash |
144145

145146
## Functions
146147

‎ref_commits.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var RefCommitsSchema = sql.Schema{
1919
{Name: "repository_id", Type: sql.Text, Source: RefCommitsTableName},
2020
{Name: "commit_hash", Type: sql.Text, Source: RefCommitsTableName},
2121
{Name: "ref_name", Type: sql.Text, Source: RefCommitsTableName},
22-
{Name: "index", Type: sql.Text, Source: RefCommitsTableName},
22+
{Name: "index", Type: sql.Int64, Source: RefCommitsTableName},
2323
}
2424

2525
var _ sql.PushdownProjectionAndFiltersTable = (*refCommitsTable)(nil)
@@ -217,7 +217,7 @@ func (i *refCommitsIter) Next() (sql.Row, error) {
217217
i.repo.ID,
218218
commit.Hash.String(),
219219
i.ref.Name().String(),
220-
idx,
220+
int64(idx),
221221
), nil
222222
}
223223
}

‎ref_commits_test.go

+47-47
Original file line numberDiff line numberDiff line change
@@ -25,41 +25,41 @@ func TestRefCommitsRowIter(t *testing.T) {
2525
}
2626

2727
expected := []sql.Row{
28-
{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "HEAD", 0},
29-
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "HEAD", 1},
30-
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "HEAD", 2},
31-
{"1669dce138d9b841a518c64b10914d88f5e488ea", "HEAD", 3},
32-
{"35e85108805c84807bc66a02d91535e1e24b38b9", "HEAD", 4},
33-
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "HEAD", 5},
34-
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "HEAD", 4},
35-
{"b8e471f58bcbca63b07bda20e428190409c2db47", "HEAD", 5},
36-
37-
{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "refs/heads/master", 0},
38-
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/heads/master", 1},
39-
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "refs/heads/master", 2},
40-
{"1669dce138d9b841a518c64b10914d88f5e488ea", "refs/heads/master", 3},
41-
{"35e85108805c84807bc66a02d91535e1e24b38b9", "refs/heads/master", 4},
42-
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "refs/heads/master", 5},
43-
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "refs/heads/master", 4},
44-
{"b8e471f58bcbca63b07bda20e428190409c2db47", "refs/heads/master", 5},
45-
46-
{"e8d3ffab552895c19b9fcf7aa264d277cde33881", "refs/remotes/origin/branch", 0},
47-
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/remotes/origin/branch", 1},
48-
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "refs/remotes/origin/branch", 2},
49-
{"1669dce138d9b841a518c64b10914d88f5e488ea", "refs/remotes/origin/branch", 3},
50-
{"35e85108805c84807bc66a02d91535e1e24b38b9", "refs/remotes/origin/branch", 4},
51-
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "refs/remotes/origin/branch", 5},
52-
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "refs/remotes/origin/branch", 4},
53-
{"b8e471f58bcbca63b07bda20e428190409c2db47", "refs/remotes/origin/branch", 5},
54-
55-
{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "refs/remotes/origin/master", 0},
56-
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/remotes/origin/master", 1},
57-
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "refs/remotes/origin/master", 2},
58-
{"1669dce138d9b841a518c64b10914d88f5e488ea", "refs/remotes/origin/master", 3},
59-
{"35e85108805c84807bc66a02d91535e1e24b38b9", "refs/remotes/origin/master", 4},
60-
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "refs/remotes/origin/master", 5},
61-
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "refs/remotes/origin/master", 4},
62-
{"b8e471f58bcbca63b07bda20e428190409c2db47", "refs/remotes/origin/master", 5},
28+
{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "HEAD", int64(0)},
29+
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "HEAD", int64(1)},
30+
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "HEAD", int64(2)},
31+
{"1669dce138d9b841a518c64b10914d88f5e488ea", "HEAD", int64(3)},
32+
{"35e85108805c84807bc66a02d91535e1e24b38b9", "HEAD", int64(4)},
33+
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "HEAD", int64(5)},
34+
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "HEAD", int64(4)},
35+
{"b8e471f58bcbca63b07bda20e428190409c2db47", "HEAD", int64(5)},
36+
37+
{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "refs/heads/master", int64(0)},
38+
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/heads/master", int64(1)},
39+
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "refs/heads/master", int64(2)},
40+
{"1669dce138d9b841a518c64b10914d88f5e488ea", "refs/heads/master", int64(3)},
41+
{"35e85108805c84807bc66a02d91535e1e24b38b9", "refs/heads/master", int64(4)},
42+
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "refs/heads/master", int64(5)},
43+
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "refs/heads/master", int64(4)},
44+
{"b8e471f58bcbca63b07bda20e428190409c2db47", "refs/heads/master", int64(5)},
45+
46+
{"e8d3ffab552895c19b9fcf7aa264d277cde33881", "refs/remotes/origin/branch", int64(0)},
47+
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/remotes/origin/branch", int64(1)},
48+
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "refs/remotes/origin/branch", int64(2)},
49+
{"1669dce138d9b841a518c64b10914d88f5e488ea", "refs/remotes/origin/branch", int64(3)},
50+
{"35e85108805c84807bc66a02d91535e1e24b38b9", "refs/remotes/origin/branch", int64(4)},
51+
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "refs/remotes/origin/branch", int64(5)},
52+
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "refs/remotes/origin/branch", int64(4)},
53+
{"b8e471f58bcbca63b07bda20e428190409c2db47", "refs/remotes/origin/branch", int64(5)},
54+
55+
{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "refs/remotes/origin/master", int64(0)},
56+
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/remotes/origin/master", int64(1)},
57+
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "refs/remotes/origin/master", int64(2)},
58+
{"1669dce138d9b841a518c64b10914d88f5e488ea", "refs/remotes/origin/master", int64(3)},
59+
{"35e85108805c84807bc66a02d91535e1e24b38b9", "refs/remotes/origin/master", int64(4)},
60+
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "refs/remotes/origin/master", int64(5)},
61+
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "refs/remotes/origin/master", int64(4)},
62+
{"b8e471f58bcbca63b07bda20e428190409c2db47", "refs/remotes/origin/master", int64(5)},
6363
}
6464

6565
require.Equal(expected, rows)
@@ -84,14 +84,14 @@ func TestRefCommitsPushdown(t *testing.T) {
8484
),
8585
},
8686
[]sql.Row{
87-
{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "HEAD", 0},
88-
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "HEAD", 1},
89-
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "HEAD", 2},
90-
{"1669dce138d9b841a518c64b10914d88f5e488ea", "HEAD", 3},
91-
{"35e85108805c84807bc66a02d91535e1e24b38b9", "HEAD", 4},
92-
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "HEAD", 5},
93-
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "HEAD", 4},
94-
{"b8e471f58bcbca63b07bda20e428190409c2db47", "HEAD", 5},
87+
{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "HEAD", int64(0)},
88+
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "HEAD", int64(1)},
89+
{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "HEAD", int64(2)},
90+
{"1669dce138d9b841a518c64b10914d88f5e488ea", "HEAD", int64(3)},
91+
{"35e85108805c84807bc66a02d91535e1e24b38b9", "HEAD", int64(4)},
92+
{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "HEAD", int64(5)},
93+
{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "HEAD", int64(4)},
94+
{"b8e471f58bcbca63b07bda20e428190409c2db47", "HEAD", int64(5)},
9595
},
9696
},
9797
{
@@ -103,10 +103,10 @@ func TestRefCommitsPushdown(t *testing.T) {
103103
),
104104
},
105105
[]sql.Row{
106-
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "HEAD", 1},
107-
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/heads/master", 1},
108-
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/remotes/origin/branch", 1},
109-
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/remotes/origin/master", 1},
106+
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "HEAD", int64(1)},
107+
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/heads/master", int64(1)},
108+
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/remotes/origin/branch", int64(1)},
109+
{"918c48b83bd081e863dbe1b80f8998f058cd8294", "refs/remotes/origin/master", int64(1)},
110110
},
111111
},
112112
}

0 commit comments

Comments
 (0)