Fix conversion of intervals through JSON #4056
Conversation
timwoj
force-pushed
the
topic/timw/json-interval-conversion
branch
from
89ceaf5
to
de35626
Compare
timwoj
force-pushed
the
topic/timw/json-interval-conversion
branch
from
de35626
to
d81090c
Compare
Ah, that's a good point. I see you did anyway - to some degree I didn't realize the entry is
I was thinking converting the options RecordVal to a plain struct that's then passed down. Though that one extra parameter for now seems fine. |
| T | ||
| T | ||
| T | ||
| F |
There was a problem hiding this comment.
This one looks a bit off, is it print f$n == f2_v$n; ?
| @@ -0,0 +1,102 @@ | |||
| # @TEST-DOCS: Test round-trip JSON encoding and decoding using the Zeek methods | |||
There was a problem hiding this comment.
Thanks for adding this! Could also see this one in bifs/, next to the existing from_json.zeek test. I thought base/utils is used for what's actually located in base/utils.
| @@ -5103,14 +5103,18 @@ function anonymize_addr%(a: addr, cl: IPAddrAnonymizationClass%): addr | |||
| ## rendered name. The default pattern strips a leading | |||
| ## underscore. | |||
| ## | |||
| ## interval_as_double: If true, interval values will be logged as doubles | |||
There was a problem hiding this comment.
| ## interval_as_double: If true, interval values will be logged as doubles | |
| ## interval_as_double: If T, interval values will be logged as doubles |
| @@ -5103,14 +5103,18 @@ function anonymize_addr%(a: addr, cl: IPAddrAnonymizationClass%): addr | |||
| ## rendered name. The default pattern strips a leading | |||
| ## underscore. | |||
| ## | |||
| ## interval_as_double: If true, interval values will be logged as doubles | |||
| ## instead of the broken-out version with units. | |||
There was a problem hiding this comment.
Would be good to mention type string. Maybe this?
| ## instead of the broken-out version with units. | |
| ## instead of the broken-out version with units as strings. |
| return make_intrusive<IntervalVal>(j.GetDouble()); | ||
|
|
||
| if ( j.IsString() ) { | ||
| auto parts = util::split(j.GetString(), " "); |
There was a problem hiding this comment.
I'm not sure we care all that much, but IIRC superfluous spaces would yield empty parts. Could filter out empty parts to support more than one spaces as separators. Mostly relevant if someone crafts input by hand.
I'm lifting this out of the storage framework work since it doesn't need to be in there exclusively. This fixes the conversion of
intervalvalues from JSON toIntervalValobjects. It also adds a simple btest to test round-trip conversion of Vals through JSON.