refactor: rename variable to reflect reality

This commit renames varibles and method names to better reflect reality.
nlnwa · May 15, 2024 · 8977142 · 8977142
1 parent be20430
commit 8977142
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/internal/badgeridx/api.go b/internal/badgeridx/api.go
@@ -146,7 +146,7 @@ func (db *DB) closest(ctx context.Context, request index.Request, results chan<-
 	closest := ts.Unix()
 	isClosest := timestamp.CompareClosest(closest)
 	matchType := request.MatchType()
-	_, schemeAndUserInfo, _ := keyvalue.SplitSSURT(request.Ssurt())
+	_, portSchemeUserInfo, _ := keyvalue.SplitSSURT(request.Ssurt())
 
 	go func() {
 		defer close(results)
@@ -196,7 +196,7 @@ func (db *DB) closest(ctx context.Context, request index.Request, results chan<-
 				}
 				key := keyvalue.CdxKey(iter.Item().Key())
 				if matchType == index.MatchTypeVerbatim {
-					if key.SchemeAndUserInfo() != schemeAndUserInfo {
+					if key.PortSchemeUserInfo() != portSchemeUserInfo {
 						iter.Next()
 						continue
 					}
@@ -242,7 +242,7 @@ func (db *DB) Search(ctx context.Context, search index.Request, results chan<- i
 
 // search the index database.
 func (db *DB) search(ctx context.Context, req index.Request, results chan<- index.CdxResponse) error {
-	_, schemeAndUserInfo, _ := keyvalue.SplitSSURT(req.Ssurt())
+	_, portSchemeUserInfo, _ := keyvalue.SplitSSURT(req.Ssurt())
 	reverse := req.Sort() == index.SortDesc
 	prefix := keyvalue.SearchKey(req)
 
@@ -274,7 +274,7 @@ func (db *DB) search(ctx context.Context, req index.Request, results chan<- inde
 						return nil
 					}
 					if matchType == index.MatchTypeVerbatim {
-						if key.SchemeAndUserInfo() != schemeAndUserInfo {
+						if key.PortSchemeUserInfo() != portSchemeUserInfo {
 							return nil
 						}
 					}

diff --git a/internal/keyvalue/db.go b/internal/keyvalue/db.go
@@ -124,7 +124,7 @@ func (ck CdxKey) Unix() int64 {
 	return ck.Time().Unix()
 }
 
-func (ck CdxKey) SchemeAndUserInfo() string {
+func (ck CdxKey) PortSchemeUserInfo() string {
 	parts := bytes.Split(ck, spaceCharacter)
 	if len(parts) < 3 {
 		return ""

diff --git a/internal/keyvalue/ssurt.go b/internal/keyvalue/ssurt.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 )
 
-func SplitSSURT(ssurt string) (surtHost string, schemeAndUserinfo string, path string) {
+func SplitSSURT(ssurt string) (surtHost string, portSchemeUserInfo string, path string) {
 	i := strings.Index(ssurt, "//")
 	if i == -1 {
 		return ssurt, "", ""
@@ -38,7 +38,7 @@ func SplitSSURT(ssurt string) (surtHost string, schemeAndUserinfo string, path s
 	if j == -1 {
 		return surtHost, ssurt[i+2:], ""
 	}
-	schemeAndUserinfo = ssurt[i+2 : i+2+j]
+	portSchemeUserInfo = ssurt[i+2 : i+2+j]
 
 	path = ssurt[i+2+j:]
 

diff --git a/internal/tikvidx/api.go b/internal/tikvidx/api.go
@@ -122,7 +122,7 @@ func (db *DB) Search(ctx context.Context, req index.Request, res chan<- index.Cd
 		return nil
 	}
 	matchType := req.MatchType()
-	_, schemeAndUserInfo, _ := keyvalue.SplitSSURT(req.Ssurt())
+	_, portSchemeUserInfo, _ := keyvalue.SplitSSURT(req.Ssurt())
 
 	go func() {
 		defer close(res)
@@ -137,7 +137,7 @@ func (db *DB) Search(ctx context.Context, req index.Request, res chan<- index.Cd
 					return nil
 				}
 				if matchType == index.MatchTypeVerbatim {
-					if cdxKey.SchemeAndUserInfo() != schemeAndUserInfo {
+					if cdxKey.PortSchemeUserInfo() != portSchemeUserInfo {
 						return nil
 					}
 				}