From 23358bc55de67be132e3858a5d40f25dbdd0a769 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 20 Jun 2021 23:00:46 +0100 Subject: Use git log name-status in get last commit (#16059) * Improve get last commit using git log --name-status git log --name-status -c provides information about the diff between a commit and its parents. Using this and adjusting the algorithm to use the first change to a path allows for a much faster generation of commit info. There is a subtle change in the results generated but this will cause the results to more closely match those from elsewhere. Signed-off-by: Andrew Thornton Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: techknowlogick Co-authored-by: Lauris BH --- modules/indexer/code/bleve.go | 3 +++ modules/indexer/code/elastic_search.go | 3 +++ 2 files changed, 6 insertions(+) (limited to 'modules/indexer/code') diff --git a/modules/indexer/code/bleve.go b/modules/indexer/code/bleve.go index 17128052f4..600789a284 100644 --- a/modules/indexer/code/bleve.go +++ b/modules/indexer/code/bleve.go @@ -216,6 +216,9 @@ func (b *BleveIndexer) addUpdate(batchWriter git.WriteCloserError, batchReader * return nil } + if _, err = batchReader.Discard(1); err != nil { + return err + } id := filenameIndexerID(repo.ID, update.Filename) return batch.Index(id, &RepoIndexerData{ RepoID: repo.ID, diff --git a/modules/indexer/code/elastic_search.go b/modules/indexer/code/elastic_search.go index 16d4a1821a..38a97ad888 100644 --- a/modules/indexer/code/elastic_search.go +++ b/modules/indexer/code/elastic_search.go @@ -215,6 +215,9 @@ func (b *ElasticSearchIndexer) addUpdate(batchWriter git.WriteCloserError, batch return nil, nil } + if _, err = batchReader.Discard(1); err != nil { + return nil, err + } id := filenameIndexerID(repo.ID, update.Filename) return []elastic.BulkableRequest{ -- cgit v1.2.3