From 6c4e9623cc789fcca66fcdd08404b64a1f6a4467 Mon Sep 17 00:00:00 2001
From: Jui-Nan Lin <jnlinn@gmail.com>
Date: Mon, 14 Sep 2020 18:40:07 +0800
Subject: [PATCH] fix: use Base36 for all code indexers (#12830)
---
modules/indexer/code/bleve.go | 5 -----
modules/indexer/code/indexer.go | 6 +++++-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/modules/indexer/code/bleve.go b/modules/indexer/code/bleve.go
index 81373bf3da..9caa6528f7 100644
--- a/modules/indexer/code/bleve.go
+++ b/modules/indexer/code/bleve.go
@@ -37,11 +37,6 @@ import (
const unicodeNormalizeName = "unicodeNormalize"
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
func numericEqualityQuery(value int64, field string) *query.NumericRangeQuery {
f := float64(value)
diff --git a/modules/indexer/code/indexer.go b/modules/indexer/code/indexer.go
index 5456373398..35c298a548 100644
--- a/modules/indexer/code/indexer.go
+++ b/modules/indexer/code/indexer.go
@@ -51,12 +51,16 @@ func filenameIndexerID(repoID int64, filename string) string {
return indexerID(repoID) + "_" + filename
}
+func indexerID(id int64) string {
+ return strconv.FormatInt(id, 36)
+}
+
func parseIndexerID(indexerID string) (int64, string) {
index := strings.IndexByte(indexerID, '_')
if index == -1 {
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:]
}