mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-07-13 00:52:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(search): potential nil slice entries

Browse Source
This commit is contained in:
fschade
2025-08-08 08:37:49 +02:00
parent f3750f32c9
commit 8795284a76
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/search/pkg/opensearch/engine.go
View File

@@ -120,12 +120,12 @@ func (e *Engine) Search(ctx context.Context, sir *searchService.SearchIndexReque
return nil, fmt.Errorf("failed to search: %w", err)
}
matches := make([]*searchMessage.Match, len(resp.Hits.Hits))
matches := make([]*searchMessage.Match, 0, len(resp.Hits.Hits))
totalMatches := resp.Hits.Total.Value
for i, hit := range resp.Hits.Hits {
for _, hit := range resp.Hits.Hits {
match, err := searchHitToSearchMessageMatch(hit)
if err != nil {
return nil, fmt.Errorf("failed to convert hit %d: %w", i, err)
return nil, fmt.Errorf("failed to convert hit to match: %w", err)
}
if sir.Ref != nil {
@@ -139,7 +139,7 @@ func (e *Engine) Search(ctx context.Context, sir *searchService.SearchIndexReque
}
}
matches[i] = match
matches = append(matches, match)
}
return &searchService.SearchIndexResponse{
@@ -218,6 +218,9 @@ func (e *Engine) Purge(id string) error {
req, err := BuildDocumentDeleteByQueryReq(
opensearchgoAPI.DocumentDeleteByQueryReq{
Indices: []string{e.index},
Params: opensearchgoAPI.DocumentDeleteByQueryParams{
WaitForCompletion: conversions.ToPointer(true),
},
},
NewTermQuery[string]("Path").Value(resource.Path),
)
@@ -268,6 +271,9 @@ func (e *Engine) updateSelfAndDescendants(id string, scriptProvider func(engine.
req, err := BuildUpdateByQueryReq(
opensearchgoAPI.UpdateByQueryReq{
Indices: []string{e.index},
Params: opensearchgoAPI.UpdateByQueryParams{
WaitForCompletion: conversions.ToPointer(true),
},
},
NewTermQuery[string]("Path").Value(resource.Path),
UpdateByQueryReqOptions{

6
services/search/pkg/opensearch/os_dsl.go
View File

@@ -84,8 +84,8 @@ func applyBuilders(target map[string]any, key string, bs ...Builder) error {
return nil
}
builders := make([]map[string]any, len(bs))
for i, builder := range bs {
builders := make([]map[string]any, 0, len(bs))
for _, builder := range bs {
data, err := builder.Map()
switch {
case err != nil:
@@ -93,7 +93,7 @@ func applyBuilders(target map[string]any, key string, bs ...Builder) error {
case isEmpty(data):
continue
default:
builders[i] = data
builders = append(builders, data)
}
}