GODRIVER-3594: Add AsFloat64() and AsFloat64OK() conversion functions #2253
+311
−25
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -137,7 +137,6 @@ func (v Value) AsInt64() int64 { | |||||
| } | ||||||
| i64 = int64(f64) | ||||||
| case TypeInt32: | ||||||
| i32, _, ok := ReadInt32(v.Data) | ||||||
| if !ok { | ||||||
| panic(NewInsufficientBytesError(v.Data, v.Data)) | ||||||
|
|
@@ -170,7 +169,6 @@ func (v Value) AsInt64OK() (int64, bool) { | |||||
| } | ||||||
| i64 = int64(f64) | ||||||
| case TypeInt32: | ||||||
| i32, _, ok := ReadInt32(v.Data) | ||||||
| if !ok { | ||||||
| return 0, false | ||||||
|
|
@@ -190,15 +188,67 @@ func (v Value) AsInt64OK() (int64, bool) { | |||||
|
|
||||||
| // AsFloat64 returns a BSON number as an float64. If the BSON type is not a numeric one, this method | ||||||
| // will panic. | ||||||
| func (v Value) AsFloat64() float64 { | ||||||
| if !v.IsNumber() { | ||||||
| panic(ElementTypeError{"bsoncore.Value.AsFloat64", v.Type}) | ||||||
| } | ||||||
| var f64 float64 | ||||||
| switch v.Type { | ||||||
| case TypeDouble: | ||||||
| var ok bool | ||||||
| f64, _, ok = ReadDouble(v.Data) | ||||||
| if !ok { | ||||||
| panic(NewInsufficientBytesError(v.Data, v.Data)) | ||||||
| } | ||||||
| case TypeInt32: | ||||||
| i32, _, ok := ReadInt32(v.Data) | ||||||
| if !ok { | ||||||
| panic(NewInsufficientBytesError(v.Data, v.Data)) | ||||||
| } | ||||||
| f64 = float64(i32) | ||||||
| case TypeInt64: | ||||||
| i64, _, ok := ReadInt64(v.Data) | ||||||
| if !ok { | ||||||
| panic(NewInsufficientBytesError(v.Data, v.Data)) | ||||||
| } | ||||||
| f64 = float64(i64) | ||||||
| case TypeDecimal128: | ||||||
| panic(ElementTypeError{"bsoncore.Value.AsFloat64", v.Type}) | ||||||
| } | ||||||
| return f64 | ||||||
| } | ||||||
|
|
||||||
| // AsFloat64OK functions the same as AsFloat64 but returns a boolean instead of panicking. False | ||||||
| // indicates an error. | ||||||
| func (v Value) AsFloat64OK() (float64, bool) { | ||||||
| if !v.IsNumber() { | ||||||
| return 0, false | ||||||
| } | ||||||
| var f64 float64 | ||||||
| switch v.Type { | ||||||
| case TypeDouble: | ||||||
| var ok bool | ||||||
| f64, _, ok = ReadDouble(v.Data) | ||||||
| if !ok { | ||||||
| return 0, false | ||||||
| } | ||||||
| case TypeInt32: | ||||||
| i32, _, ok := ReadInt32(v.Data) | ||||||
| if !ok { | ||||||
| return 0, false | ||||||
| } | ||||||
| f64 = float64(i32) | ||||||
| case TypeInt64: | ||||||
| i64, _, ok := ReadInt64(v.Data) | ||||||
| if !ok { | ||||||
| return 0, false | ||||||
| } | ||||||
| f64 = float64(i64) | ||||||
| case TypeDecimal128: | ||||||
| return 0, false | ||||||
| } | ||||||
| return f64, true | ||||||
| } | ||||||
|
|
||||||
| // Equal compaes v to v2 and returns true if they are equal. | ||||||
|
||||||
| // Equal compaes v to v2 and returns true if they are equal. | |
| // Equal compares v to v2 and returns true if they are equal. |
Author
There was a problem hiding this comment.
unrelated to the changes but simple non controversial fix, afe7a03
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The newly added
AsFloat64()andAsFloat64OK()methods lack test coverage inbson/raw_value_test.go. Since other methods likeAsInt64()andAsInt64OK()are tested through the underlyingbsoncore.Valuetests, and this file has existing test coverage, consider adding tests to verify the wrapper methods work correctly.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@qingyang-hu I will defer to your review on this, it doesn't seem like most of the functions that handle wrapping RawValue conversions are tested and it just converts the raw value then uses the tested AsType functions so in my opinion unless we want to test the raw value conversion for each conversion type it is probably unneeded