Skip to content

Commit a4cbe82

Browse files
CascadingRadiumabhinavdangetiCopilot
authored
MB-27666, MB-69881: Backport necessary commits into morpheus (#2273)
- Backport the following commits into `v8.0.x-couchbase` via cherry-pick - #2270 - #2224 - #2272 --------- Co-authored-by: Abhinav Dangeti <abhinav@couchbase.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 11c2008 commit a4cbe82

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3630
-280
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ A modern indexing + search library in GO
2525
* [geo spatial search](https://github.com/blevesearch/bleve/blob/master/geo/README.md)
2626
* approximate k-nearest neighbors via [vector search](https://github.com/blevesearch/bleve/blob/master/docs/vectors.md)
2727
* [synonym search](https://github.com/blevesearch/bleve/blob/master/docs/synonyms.md)
28+
* [hierarchical nested search](https://github.com/blevesearch/bleve/blob/master/docs/hierarchy.md)
2829
* [tf-idf](https://github.com/blevesearch/bleve/blob/master/docs/scoring.md#tf-idf) / [bm25](https://github.com/blevesearch/bleve/blob/master/docs/scoring.md#bm25) scoring models
2930
* Hybrid search: exact + semantic
3031
* Query time boosting

analysis/analyzer/custom/custom.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func convertInterfaceSliceToStringSlice(interfaceSlice []interface{}, objType st
140140
if ok {
141141
stringSlice[i] = stringObj
142142
} else {
143-
return nil, fmt.Errorf(objType + " name must be a string")
143+
return nil, fmt.Errorf("%s name must be a string", objType)
144144
}
145145
}
146146

analysis/datetime/iso/iso.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func letterCounter(layout string, idx int) int {
118118
}
119119

120120
func invalidFormatError(character byte, count int) error {
121-
return fmt.Errorf("invalid format string, unknown format specifier: " + strings.Repeat(string(character), count))
121+
return fmt.Errorf("invalid format string, unknown format specifier: %s", strings.Repeat(string(character), count))
122122
}
123123

124124
func parseISOString(layout string) (string, error) {
@@ -146,7 +146,7 @@ func parseISOString(layout string) (string, error) {
146146
// second text literal delimiter
147147
if idx == len(layout) {
148148
// text literal delimiter not found error
149-
return "", fmt.Errorf("invalid format string, expected text literal delimiter: " + string(textLiteralDelimiter))
149+
return "", fmt.Errorf("invalid format string, expected text literal delimiter: %s", string(textLiteralDelimiter))
150150
}
151151
// increment idx to skip the second text literal delimiter
152152
idx++

cmd/bleve/cmd/registry.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ var registryCmd = &cobra.Command{
7171
func printType(label string, types, instances []string) {
7272
sort.Strings(types)
7373
sort.Strings(instances)
74-
fmt.Printf(label + " Types:\n")
74+
fmt.Printf("%s Types:\n", label)
7575
for _, name := range types {
7676
fmt.Printf("\t%s\n", name)
7777
}
7878
fmt.Println()
79-
fmt.Printf(label + " Instances:\n")
79+
fmt.Printf("%s Instances:\n", label)
8080
for _, name := range instances {
8181
fmt.Printf("\t%s\n", name)
8282
}

0 commit comments

Comments
 (0)