dstepanov-yadro/frostfs-api-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-api-go
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#148] sdk/object: Change search filters v2 converter return type

Browse source 
Unified structures from v2 package work with the slice of pointers.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-09-17 13:00:27 +03:00 committed by Stanislav Bogatyrev
parent 353448c0c3
commit 549fcad76e
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/object/search.go
View file

@ -56,9 +56,13 @@ func NewSearchFilters() SearchFilters {
return SearchFilters{} return SearchFilters{}
} }
func NewSearchFiltersFromV2(v2 []v2object.SearchFilter) SearchFilters { func NewSearchFiltersFromV2(v2 []*v2object.SearchFilter) SearchFilters {
filters := make(SearchFilters, 0, len(v2)) filters := make(SearchFilters, 0, len(v2))
for i := range v2 { for i := range v2 {
if v2[i] == nil {
continue
}
filters = append(filters, SearchFilter{ filters = append(filters, SearchFilter{
header: v2[i].GetName(), header: v2[i].GetName(),
value: v2[i].GetValue(), value: v2[i].GetValue(),
@ -81,10 +85,10 @@ func (f *SearchFilters) AddFilter(header, value string, op SearchMatchType) {
}) })
} }
func (f SearchFilters) ToV2() []v2object.SearchFilter { func (f SearchFilters) ToV2() []*v2object.SearchFilter {
result := make([]v2object.SearchFilter, 0, len(f)) result := make([]*v2object.SearchFilter, 0, len(f))
for i := range f { for i := range f {
v2 := v2object.SearchFilter{} v2 := new(v2object.SearchFilter)
v2.SetName(f[i].header) v2.SetName(f[i].header)
v2.SetValue(f[i].value) v2.SetValue(f[i].value)
v2.SetMatchType(f[i].op.ToV2()) v2.SetMatchType(f[i].op.ToV2())