Skip to content

search: fix inverted error check in facet range decoding #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Usamak06 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

search: fix inverted error check in facet range decoding #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions search/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,10 +768,10 @@ func rangeToProto(r Range) (*pb.FacetRange, error) {

func protoToRange(rng *pb.FacetRefinement_Range) Range {
r := Range{Start: negInf, End: posInf}
if x, err := strconv.ParseFloat(rng.GetStart(), 64); err != nil {
if x, err := strconv.ParseFloat(rng.GetStart(), 64); err == nil {
r.Start = x
}
if x, err := strconv.ParseFloat(rng.GetEnd(), 64); err != nil {
if x, err := strconv.ParseFloat(rng.GetEnd(), 64); err == nil {
r.End = x
}
return r
Expand Down
31 changes: 31 additions & 0 deletions search/search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package search
import (
"errors"
"fmt"
"math"
"reflect"
"strings"
"testing"
Expand Down Expand Up @@ -1268,3 +1269,33 @@ func TestDeleteMultiError(t *testing.T) {
t.Fatalf("got nil, want not-nill MultiError[1]")
}
}

func TestProtoToRange(t *testing.T) {
testCases := []struct {
desc string
rng *pb.FacetRefinement_Range
want Range
}{
{
desc: "both bounds finite",
rng: &pb.FacetRefinement_Range{Start: proto.String("1.5e+00"), End: proto.String("3e+00")},
want: Range{Start: 1.5, End: 3},
},
{
desc: "no lower bound",
rng: &pb.FacetRefinement_Range{End: proto.String("3e+00")},
want: Range{Start: math.Inf(-1), End: 3},
},
{
desc: "no upper bound",
rng: &pb.FacetRefinement_Range{Start: proto.String("1.5e+00")},
want: Range{Start: 1.5, End: math.Inf(1)},
},
}
for _, tc := range testCases {
got := protoToRange(tc.rng)
if got != tc.want {
t.Errorf("%s: protoToRange(%v) = %v, want %v", tc.desc, tc.rng, got, tc.want)
}
}
}
4 changes: 2 additions & 2 deletions v2/search/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,10 +768,10 @@ func rangeToProto(r Range) (*pb.FacetRange, error) {

func protoToRange(rng *pb.FacetRefinement_Range) Range {
r := Range{Start: negInf, End: posInf}
if x, err := strconv.ParseFloat(rng.GetStart(), 64); err != nil {
if x, err := strconv.ParseFloat(rng.GetStart(), 64); err == nil {
r.Start = x
}
if x, err := strconv.ParseFloat(rng.GetEnd(), 64); err != nil {
if x, err := strconv.ParseFloat(rng.GetEnd(), 64); err == nil {
r.End = x
}
return r
Expand Down
31 changes: 31 additions & 0 deletions v2/search/search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package search
import (
"errors"
"fmt"
"math"
"reflect"
"strings"
"testing"
Expand Down Expand Up @@ -1268,3 +1269,33 @@ func TestDeleteMultiError(t *testing.T) {
t.Fatalf("got nil, want not-nill MultiError[1]")
}
}

func TestProtoToRange(t *testing.T) {
testCases := []struct {
desc string
rng *pb.FacetRefinement_Range
want Range
}{
{
desc: "both bounds finite",
rng: &pb.FacetRefinement_Range{Start: proto.String("1.5e+00"), End: proto.String("3e+00")},
want: Range{Start: 1.5, End: 3},
},
{
desc: "no lower bound",
rng: &pb.FacetRefinement_Range{End: proto.String("3e+00")},
want: Range{Start: math.Inf(-1), End: 3},
},
{
desc: "no upper bound",
rng: &pb.FacetRefinement_Range{Start: proto.String("1.5e+00")},
want: Range{Start: 1.5, End: math.Inf(1)},
},
}
for _, tc := range testCases {
got := protoToRange(tc.rng)
if got != tc.want {
t.Errorf("%s: protoToRange(%v) = %v, want %v", tc.desc, tc.rng, got, tc.want)
}
}
}
Loading