MB-36088 - implement NaN float comparisons

Author: nelio2k

fastval.go

@@ -349,6 +349,20 @@ func (val FastVal) compareFloat(other FastVal) int {
 	floatVal := val.AsFloat()
 	floatOval := other.AsFloat()
 
+	if math.IsNaN(floatVal) || math.IsNaN(floatOval) {
+		// Comparing Not-A-Number
+		// Documentation wise - they should be aware that NaN ops are undefined
+		// In the meantime - because we have to return something, just let imaginary numbers be < real numbers
+		if math.IsNaN(floatVal) && math.IsNaN(floatOval) {
+			// In go, two NaN's are not the same - thus this should never return 0, so return -1 by default
+			return -1
+		} else if math.IsNaN(floatVal) && !math.IsNaN(floatOval) {
+			return -1
+		} else if !math.IsNaN(floatVal) && math.IsNaN(floatOval) {
+			return 1
+		}
+	}
+
 	// Perform epsilon comparison first
 	if math.Abs(floatVal-floatOval) < EPSILON {
 		return 0

filterExprParser_test.go

@@ -841,6 +841,8 @@ OR
 	userData = map[string]interface{}{
 		"achievements":  4,
 		"achievements2": 2,
+		"int":           93,
+		"int2":          0,
 	}
 	udMarsh, _ = json.Marshal(userData)
 	match, err = m.Match(udMarsh)
@@ -853,6 +855,7 @@ OR
 	assert.Nil(err)
 	matchDef = trans.Transform([]Expression{expr})
 	assert.NotNil(matchDef)
+	m = NewFastMatcher(matchDef)
 	match, err = m.Match(udMarsh)
 	assert.True(match)
 
@@ -863,6 +866,7 @@ OR
 	assert.Nil(err)
 	matchDef = trans.Transform([]Expression{expr})
 	assert.NotNil(matchDef)
+	m = NewFastMatcher(matchDef)
 	match, err = m.Match(udMarsh)
 	assert.True(match)
 
@@ -873,6 +877,7 @@ OR
 	assert.Nil(err)
 	matchDef = trans.Transform([]Expression{expr})
 	assert.NotNil(matchDef)
+	m = NewFastMatcher(matchDef)
 	match, err = m.Match(udMarsh)
 	assert.True(match)
 
@@ -883,6 +888,51 @@ OR
 	assert.Nil(err)
 	matchDef = trans.Transform([]Expression{expr})
 	assert.NotNil(matchDef)
+	m = NewFastMatcher(matchDef)
+	match, err = m.Match(udMarsh)
+	assert.True(match)
+
+	fe = &FilterExpression{}
+	err = parser.ParseString("ASIN(int)<>3.05682983181e+307 AND ASIN(int) != ASIN(int) AND NOT ASIN(int) > ASIN(int) AND NOT ASIN(int) <= ASIN(int)", fe)
+	assert.Nil(err)
+	expr, err = fe.OutputExpression()
+	assert.Nil(err)
+	matchDef = trans.Transform([]Expression{expr})
+	m = NewFastMatcher(matchDef)
+	assert.NotNil(matchDef)
+	match, err = m.Match(udMarsh)
+	assert.True(match)
+
+	fe = &FilterExpression{}
+	err = parser.ParseString("ATAN(int)<>3.05682983181e+307", fe)
+	assert.Nil(err)
+	expr, err = fe.OutputExpression()
+	assert.Nil(err)
+	matchDef = trans.Transform([]Expression{expr})
+	m = NewFastMatcher(matchDef)
+	assert.NotNil(matchDef)
+	match, err = m.Match(udMarsh)
+	assert.True(match)
+
+	fe = &FilterExpression{}
+	err = parser.ParseString("ASIN(int2)<>3.05682983181e+307", fe)
+	assert.Nil(err)
+	expr, err = fe.OutputExpression()
+	assert.Nil(err)
+	matchDef = trans.Transform([]Expression{expr})
+	m = NewFastMatcher(matchDef)
+	assert.NotNil(matchDef)
+	match, err = m.Match(udMarsh)
+	assert.True(match)
+
+	fe = &FilterExpression{}
+	err = parser.ParseString("ATAN(int2)<>3.05682983181e+307", fe)
+	assert.Nil(err)
+	expr, err = fe.OutputExpression()
+	assert.Nil(err)
+	matchDef = trans.Transform([]Expression{expr})
+	m = NewFastMatcher(matchDef)
+	assert.NotNil(matchDef)
 	match, err = m.Match(udMarsh)
 	assert.True(match)
 
@@ -902,6 +952,7 @@ OR
 		"achievements": [6]int{49, 58, 108, 141, 177, 229},
 	}
 	udMarsh, _ = json.Marshal(userData)
+	m = NewFastMatcher(matchDef)
 	match, err = m.Match(udMarsh)
 	assert.True(match)
 
@@ -929,6 +980,7 @@ OR
 	assert.NotNil(matchDef)
 	udMarsh, _ = json.Marshal(beer)
 	match, err = m.Match(udMarsh)
+	m = NewFastMatcher(matchDef)
 	assert.True(match)
 
 	fe = &FilterExpression{}
@@ -944,6 +996,7 @@ OR
 	assert.Nil(err)
 	matchDef = trans.Transform([]Expression{expr})
 	assert.NotNil(matchDef)
+	m = NewFastMatcher(matchDef)
 	match, err = m.Match(marshalledData)
 	assert.True(match)