summaryrefslogtreecommitdiffstats
path: root/modules/git/blob_test.go
diff options
context:
space:
mode:
authorFilip Navara <filip.navara@gmail.com>2019-04-19 14:17:27 +0200
committerLunny Xiao <xiaolunwen@gmail.com>2019-04-19 20:17:27 +0800
commit2af67f6044af1cad7136ce8c123e37ab090ca9bc (patch)
tree6eaa623db6a0665498d7f05c8bb1a4b4d7b141c7 /modules/git/blob_test.go
parent19ec2606e91610421a3e9cd87c94748ef07ca468 (diff)
downloadgitea-2af67f6044af1cad7136ce8c123e37ab090ca9bc.tar.gz
gitea-2af67f6044af1cad7136ce8c123e37ab090ca9bc.zip
Improve listing performance by using go-git (#6478)
* Use go-git for tree reading and commit info lookup. Signed-off-by: Filip Navara <navara@emclient.com> * Use TreeEntry.IsRegular() instead of ObjectType that was removed. Signed-off-by: Filip Navara <navara@emclient.com> * Use the treePath to optimize commit info search. Signed-off-by: Filip Navara <navara@emclient.com> * Extract the latest commit at treePath along with the other commits. Signed-off-by: Filip Navara <navara@emclient.com> * Fix listing commit info for a directory that was created in one commit and never modified after. Signed-off-by: Filip Navara <navara@emclient.com> * Avoid nearly all external 'git' invocations when doing directory listing (.editorconfig code path is still hit). Signed-off-by: Filip Navara <navara@emclient.com> * Use go-git for reading blobs. Signed-off-by: Filip Navara <navara@emclient.com> * Make SHA1 type alias for plumbing.Hash in go-git. Signed-off-by: Filip Navara <navara@emclient.com> * Make Signature type alias for object.Signature in go-git. Signed-off-by: Filip Navara <navara@emclient.com> * Fix GetCommitsInfo for repository with only one commit. Signed-off-by: Filip Navara <navara@emclient.com> * Fix PGP signature verification. Signed-off-by: Filip Navara <navara@emclient.com> * Fix issues with walking commit graph across merges. Signed-off-by: Filip Navara <navara@emclient.com> * Fix typo in condition. Signed-off-by: Filip Navara <navara@emclient.com> * Speed up loading branch list by keeping the repository reference (and thus all the loaded packfile indexes). Signed-off-by: Filip Navara <navara@emclient.com> * Fix lising submodules. Signed-off-by: Filip Navara <navara@emclient.com> * Fix build Signed-off-by: Filip Navara <navara@emclient.com> * Add back commit cache because of name-rev Signed-off-by: Filip Navara <navara@emclient.com> * Fix tests Signed-off-by: Filip Navara <navara@emclient.com> * Fix code style * Fix spelling * Address PR feedback Signed-off-by: Filip Navara <navara@emclient.com> * Update vendor module list Signed-off-by: Filip Navara <navara@emclient.com> * Fix getting trees by commit id Signed-off-by: Filip Navara <navara@emclient.com> * Fix remaining unit test failures * Fix GetTreeBySHA * Avoid running `git name-rev` if not necessary Signed-off-by: Filip Navara <navara@emclient.com> * Move Branch code to git module * Clean up GPG signature verification and fix it for tagged commits * Address PR feedback (import formatting, copyright headers) * Make blob lookup by SHA working * Update tests to use public API * Allow getting content from any type of object through the blob interface * Change test to actually expect the object content that is in the GIT repository * Change one more test to actually expect the object content that is in the GIT repository * Add comments
Diffstat (limited to 'modules/git/blob_test.go')
-rw-r--r--modules/git/blob_test.go45
1 files changed, 18 insertions, 27 deletions
diff --git a/modules/git/blob_test.go b/modules/git/blob_test.go
index 39516c422c..66c046ecc8 100644
--- a/modules/git/blob_test.go
+++ b/modules/git/blob_test.go
@@ -1,11 +1,11 @@
// Copyright 2015 The Gogs Authors. All rights reserved.
+// Copyright 2019 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package git
import (
- "bytes"
"io/ioutil"
"testing"
@@ -13,20 +13,6 @@ import (
"github.com/stretchr/testify/require"
)
-var repoSelf = &Repository{
- Path: "./",
-}
-
-var testBlob = &Blob{
- repo: repoSelf,
- TreeEntry: &TreeEntry{
- ID: MustIDFromString("a8d4b49dd073a4a38a7e58385eeff7cc52568697"),
- ptree: &Tree{
- repo: repoSelf,
- },
- },
-}
-
func TestBlob_Data(t *testing.T) {
output := `Copyright (c) 2016 The Gitea Authors
Copyright (c) 2015 The Gogs Authors
@@ -49,10 +35,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
`
+ repo, err := OpenRepository("../../.git")
+ assert.NoError(t, err)
+ testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
+ assert.NoError(t, err)
- r, err := testBlob.Data()
+ r, err := testBlob.DataAsync()
assert.NoError(t, err)
require.NotNil(t, r)
+ defer r.Close()
data, err := ioutil.ReadAll(r)
assert.NoError(t, err)
@@ -60,21 +51,21 @@ THE SOFTWARE.
}
func Benchmark_Blob_Data(b *testing.B) {
- for i := 0; i < b.N; i++ {
- r, err := testBlob.Data()
- if err != nil {
- b.Fatal(err)
- }
- ioutil.ReadAll(r)
+ repo, err := OpenRepository("../../.git")
+ if err != nil {
+ b.Fatal(err)
+ }
+ testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
+ if err != nil {
+ b.Fatal(err)
}
-}
-func Benchmark_Blob_DataPipeline(b *testing.B) {
- stdout := new(bytes.Buffer)
for i := 0; i < b.N; i++ {
- stdout.Reset()
- if err := testBlob.DataPipeline(stdout, nil); err != nil {
+ r, err := testBlob.DataAsync()
+ if err != nil {
b.Fatal(err)
}
+ defer r.Close()
+ ioutil.ReadAll(r)
}
}