Skip to content

Commit 4bf1c80

Browse files
erizocosmicoajnavarro
authored andcommitted
fix files table by removing git log usage
Signed-off-by: Miguel Molina <[email protected]>
1 parent bf8d336 commit 4bf1c80

5 files changed

+16
-23
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [0.23.1] - 2019-07-05
10+
11+
### Fixed
12+
13+
- Fix the results of files table by not using git log.
14+
915
## [0.23.0] - 2019-07-04
1016

1117
### Changed

commit_files_test.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/src-d/go-mysql-server/sql"
88
"github.com/src-d/go-mysql-server/sql/expression"
99
"github.com/stretchr/testify/require"
10-
git "gopkg.in/src-d/go-git.v4"
1110
"gopkg.in/src-d/go-git.v4/plumbing"
1211
)
1312

@@ -36,9 +35,7 @@ func TestCommitFilesTableRowIter(t *testing.T) {
3635

3736
require.NoError(err)
3837

39-
commits, err := repo.Log(&git.LogOptions{
40-
All: true,
41-
})
38+
commits, err := newCommitIter(repo, false)
4239
require.NoError(err)
4340

4441
for {

files.go

+3-8
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import (
44
"bytes"
55
"io"
66

7-
git "gopkg.in/src-d/go-git.v4"
7+
"github.com/src-d/go-mysql-server/sql"
88
"gopkg.in/src-d/go-git.v4/plumbing"
99
"gopkg.in/src-d/go-git.v4/plumbing/filemode"
1010
"gopkg.in/src-d/go-git.v4/plumbing/object"
11-
"github.com/src-d/go-mysql-server/sql"
1211
)
1312

1413
type filesTable struct {
@@ -199,9 +198,7 @@ type filesRowIter struct {
199198
func (i *filesRowIter) init() error {
200199
var err error
201200
i.seen = make(map[plumbing.Hash]struct{})
202-
i.commits, err = i.repo.Log(&git.LogOptions{
203-
All: true,
204-
})
201+
i.commits, err = newCommitIter(i.repo, i.skipGitErrors)
205202
return err
206203
}
207204

@@ -419,9 +416,7 @@ func newFilesKeyValueIter(pool *RepositoryPool, repo *Repository, columns []stri
419416
return nil, err
420417
}
421418

422-
commits, err := repo.Log(&git.LogOptions{
423-
All: true,
424-
})
419+
commits, err := newCommitIter(repo, false)
425420
if err != nil {
426421
return nil, err
427422
}

files_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func TestFilesTablePushdownFilters(t *testing.T) {
148148
rows[i] = row[1 : len(row)-2]
149149
}
150150

151-
require.Equal(tt.expected, rows)
151+
require.ElementsMatch(tt.expected, rows)
152152
})
153153
}
154154
}

repository_pool_test.go

+5-10
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
fixtures "github.com/src-d/go-git-fixtures"
1111
"github.com/stretchr/testify/require"
12-
git "gopkg.in/src-d/go-git.v4"
1312
"gopkg.in/src-d/go-git.v4/plumbing/cache"
1413
"gopkg.in/src-d/go-git.v4/plumbing/object"
1514
)
@@ -78,9 +77,7 @@ func TestRepositoryPoolGit(t *testing.T) {
7877
require.NotNil(repo)
7978
require.NoError(err)
8079

81-
iter, err := repo.Log(&git.LogOptions{
82-
All: true,
83-
})
80+
iter, err := newCommitIter(repo, false)
8481
require.NoError(err)
8582

8683
count := 0
@@ -165,9 +162,9 @@ func TestRepositoryPoolSiva(t *testing.T) {
165162
expectedRepos := 5
166163
expected := map[string]int{
167164
"015da2f4-6d89-7ec8-5ac9-a38329ea875b": 606,
168-
"015dcc49-9049-b00c-ba72-b6f5fa98cbe7": 68,
169-
"015dcc49-90e6-34f2-ac03-df879ee269f3": 21,
170-
"015dcc4d-0bdf-6aff-4aac-ffe68c752eb3": 380,
165+
"015dcc49-9049-b00c-ba72-b6f5fa98cbe7": 71,
166+
"015dcc49-90e6-34f2-ac03-df879ee269f3": 45,
167+
"015dcc4d-0bdf-6aff-4aac-ffe68c752eb3": 382,
171168
"015dcc4d-2622-bdac-12a5-ec441e3f3508": 72,
172169
}
173170
result := make(map[string]int)
@@ -183,9 +180,7 @@ func TestRepositoryPoolSiva(t *testing.T) {
183180
}
184181
require.NoError(err)
185182

186-
iter, err := repo.Log(&git.LogOptions{
187-
All: true,
188-
})
183+
iter, err := newCommitIter(repo, false)
189184
require.NoError(err)
190185

191186
id := repo.ID()

0 commit comments

Comments
 (0)