Merge pull request #275 from checkr/zz/fix-float-equal

Fix float comparison
openflagr · Jul 5, 2019 · 5b62880 · 5b62880
2 parents acf2fe2 + e01a5e0
commit 5b62880
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -71,7 +71,7 @@ require (
 	github.com/tinylib/msgp v1.1.0 // indirect
 	github.com/urfave/negroni v0.3.0
 	github.com/yadvendar/negroni-newrelic-go-agent v0.0.0-20160803090806-3dc58758cb67
-	github.com/zhouzhuojie/conditions v0.0.0-20190213052452-7de314ba1d59
+	github.com/zhouzhuojie/conditions v0.0.0-20190705160302-784df330cb87
 	github.com/zhouzhuojie/withtimeout v0.0.0-20190405051827-12b39eb2edd5
 	golang.org/x/net v0.0.0-20190313220215-9f648a60d977
 	golang.org/x/sys v0.0.0-20190312061237-fead79001313 // indirect

diff --git a/go.sum b/go.sum
@@ -215,8 +215,8 @@ github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
 github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/urfave/negroni v0.3.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/yadvendar/negroni-newrelic-go-agent v0.0.0-20160803090806-3dc58758cb67/go.mod h1:eRmB4tpcIoEUfMNyiXTbnZtzfODhBhZB3BIWGDD+vLs=
-github.com/zhouzhuojie/conditions v0.0.0-20190213052452-7de314ba1d59 h1:T+NwShgssYUhadQdSZrmDBhpl462zdAq1Na6/jJ/OI8=
-github.com/zhouzhuojie/conditions v0.0.0-20190213052452-7de314ba1d59/go.mod h1:Izhy98HD3MkfwGPz+p9ZV2JuqrpbHjaQbUq9iZHh+ZY=
+github.com/zhouzhuojie/conditions v0.0.0-20190705160302-784df330cb87 h1:5pQTfWe/n9OvmwOamjhkePoT3dtJv0If1CXl3zkhSZg=
+github.com/zhouzhuojie/conditions v0.0.0-20190705160302-784df330cb87/go.mod h1:Izhy98HD3MkfwGPz+p9ZV2JuqrpbHjaQbUq9iZHh+ZY=
 github.com/zhouzhuojie/withtimeout v0.0.0-20190405051827-12b39eb2edd5 h1:YuR5otuPvpk6EPrKy9rVXiQKTqgY6OEqSlzko9kcfCI=
 github.com/zhouzhuojie/withtimeout v0.0.0-20190405051827-12b39eb2edd5/go.mod h1:nhm/3zpPm56iKoXLEeeevuI5V9qEtNhuhLbPZwcrgcs=
 go.opencensus.io v0.20.1 h1:pMEjRZ1M4ebWGikflH7nQpV6+Zr88KBMA2XJD3sbijw=

diff --git a/pkg/handler/eval_test.go b/pkg/handler/eval_test.go
@@ -85,6 +85,60 @@ func TestEvalSegment(t *testing.T) {
 		assert.NotEmpty(t, log)
 		assert.True(t, evalNextSegment)
 	})
+
+	t.Run("test float comparison - 9990403>=9990404 evals to be false", func(t *testing.T) {
+		s := entity.GenFixtureSegment()
+		s.RolloutPercent = uint(100)
+		s.Constraints = []entity.Constraint{
+			{
+				Model:     gorm.Model{ID: 500},
+				SegmentID: 200,
+				Property:  "foo",
+				Operator:  models.ConstraintOperatorGTE,
+				Value:     `9990404`,
+			},
+		}
+		s.PrepareEvaluation()
+
+		vID, log, evalNextSegment := evalSegment(100, models.EvalContext{
+			EnableDebug:   true,
+			EntityContext: map[string]interface{}{"foo": float64(9990403)},
+			EntityID:      "entityID1",
+			EntityType:    "entityType1",
+			FlagID:        int64(100),
+		}, s)
+
+		assert.Nil(t, vID)
+		assert.NotZero(t, log)
+		assert.True(t, evalNextSegment)
+	})
+
+	t.Run("test float comparison - 9990404>=9990403 evals to be true", func(t *testing.T) {
+		s := entity.GenFixtureSegment()
+		s.RolloutPercent = uint(100)
+		s.Constraints = []entity.Constraint{
+			{
+				Model:     gorm.Model{ID: 500},
+				SegmentID: 200,
+				Property:  "foo",
+				Operator:  models.ConstraintOperatorGTE,
+				Value:     `9990403`,
+			},
+		}
+		s.PrepareEvaluation()
+
+		vID, log, evalNextSegment := evalSegment(100, models.EvalContext{
+			EnableDebug:   true,
+			EntityContext: map[string]interface{}{"foo": float64(9990404)},
+			EntityID:      "entityID1",
+			EntityType:    "entityType1",
+			FlagID:        int64(100),
+		}, s)
+
+		assert.NotZero(t, vID)
+		assert.NotZero(t, log)
+		assert.False(t, evalNextSegment)
+	})
 }
 
 func TestEvalFlag(t *testing.T) {

diff --git a/vendor/github.com/zhouzhuojie/conditions/Gopkg.lock b/vendor/github.com/zhouzhuojie/conditions/Gopkg.lock
diff --git a/vendor/github.com/zhouzhuojie/conditions/evaluator.go b/vendor/github.com/zhouzhuojie/conditions/evaluator.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -224,7 +224,7 @@ github.com/tinylib/msgp/msgp
 github.com/urfave/negroni
 # github.com/yadvendar/negroni-newrelic-go-agent v0.0.0-20160803090806-3dc58758cb67
 github.com/yadvendar/negroni-newrelic-go-agent
-# github.com/zhouzhuojie/conditions v0.0.0-20190213052452-7de314ba1d59
+# github.com/zhouzhuojie/conditions v0.0.0-20190705160302-784df330cb87
 github.com/zhouzhuojie/conditions
 # github.com/zhouzhuojie/withtimeout v0.0.0-20190405051827-12b39eb2edd5
 github.com/zhouzhuojie/withtimeout