fix: use Base36 for all code indexers (#12830)

tokarchuk/v1.17
Jui-Nan Lin 4 years ago committed by GitHub
parent 53b656582e
commit 6c4e9623cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      modules/indexer/code/bleve.go
  2. 6
      modules/indexer/code/indexer.go

@ -37,11 +37,6 @@ import (
const unicodeNormalizeName = "unicodeNormalize" const unicodeNormalizeName = "unicodeNormalize"
const maxBatchSize = 16 const maxBatchSize = 16
// indexerID a bleve-compatible unique identifier for an integer id
func indexerID(id int64) string {
return strconv.FormatInt(id, 36)
}
// numericEqualityQuery a numeric equality query for the given value and field // numericEqualityQuery a numeric equality query for the given value and field
func numericEqualityQuery(value int64, field string) *query.NumericRangeQuery { func numericEqualityQuery(value int64, field string) *query.NumericRangeQuery {
f := float64(value) f := float64(value)

@ -51,12 +51,16 @@ func filenameIndexerID(repoID int64, filename string) string {
return indexerID(repoID) + "_" + filename return indexerID(repoID) + "_" + filename
} }
func indexerID(id int64) string {
return strconv.FormatInt(id, 36)
}
func parseIndexerID(indexerID string) (int64, string) { func parseIndexerID(indexerID string) (int64, string) {
index := strings.IndexByte(indexerID, '_') index := strings.IndexByte(indexerID, '_')
if index == -1 { if index == -1 {
log.Error("Unexpected ID in repo indexer: %s", indexerID) log.Error("Unexpected ID in repo indexer: %s", indexerID)
} }
repoID, _ := strconv.ParseInt(indexerID[:index], 10, 64) repoID, _ := strconv.ParseInt(indexerID[:index], 36, 64)
return repoID, indexerID[index+1:] return repoID, indexerID[index+1:]
} }

Loading…
Cancel
Save