diff --git a/cli/outputflags/flags.go b/cli/outputflags/flags.go index f3421c599a..62c83af6e6 100644 --- a/cli/outputflags/flags.go +++ b/cli/outputflags/flags.go @@ -48,7 +48,7 @@ func (f *Flags) setFlags(fs *flag.FlagSet) { fs.BoolVar(&f.color, "color", true, "enable/disable color formatting for -S and db text output") fs.StringVar(&f.supPersist, "persist", "", "regular expression to persist type definitions across the stream") - fs.IntVar(&f.pretty, "pretty", 4, + fs.IntVar(&f.pretty, "pretty", 2, "tab size to pretty print JSON and Super JSON output (0 for newline-delimited output") fs.StringVar(&f.outputFile, "o", "", "write data to output file") fs.StringVar(&f.split, "split", "", diff --git a/cmd/super/db/manage/ztests/config.yaml b/cmd/super/db/manage/ztests/config.yaml index 819eabe220..1ea20c7663 100644 --- a/cmd/super/db/manage/ztests/config.yaml +++ b/cmd/super/db/manage/ztests/config.yaml @@ -21,12 +21,12 @@ outputs: - name: inherit.sup data: | { - name: "test1", - branch: "main" + name: "test1", + branch: "main" } { - name: "test2", - branch: "live" + name: "test2", + branch: "live" } - name: stderr data: "" diff --git a/compiler/semantic/ztests/imdb.yaml b/compiler/semantic/ztests/imdb.yaml index ac5e7db65d..345eb77038 100644 --- a/compiler/semantic/ztests/imdb.yaml +++ b/compiler/semantic/ztests/imdb.yaml @@ -76,66 +76,66 @@ outputs: - name: stdout data: | { - title: "Baby Driver", - director: [ - "Edgar Wright" - ], - writer: [ - "Edgar Wright" - ], - genres: [ - "Action", - "Crime", - "Drama" - ], - actors: [ - { - name: "Ansel Elgort", - characters: [ - "Baby" - ] - }, - { - name: "Jon Bernthal", - characters: [ - "Griff" - ] - }, - { - name: "Jon Hamm", - characters: [ - "Buddy" - ] - }, - { - name: "Micah Howard", - characters: [ - "Barista" - ] - }, - { - name: "Morgan Brown", - characters: [ - "Street Preacher" - ] - }, - { - name: "Kevin Spacey", - characters: [ - "Doc" - ] - }, - { - name: "Morse Diggs", - characters: [ - "Morse Diggs" - ] - }, - { - name: "CJ Jones", - characters: [ - "Joseph" - ] - } - ] + title: "Baby Driver", + director: [ + "Edgar Wright" + ], + writer: [ + "Edgar Wright" + ], + genres: [ + "Action", + "Crime", + "Drama" + ], + actors: [ + { + name: "Ansel Elgort", + characters: [ + "Baby" + ] + }, + { + name: "Jon Bernthal", + characters: [ + "Griff" + ] + }, + { + name: "Jon Hamm", + characters: [ + "Buddy" + ] + }, + { + name: "Micah Howard", + characters: [ + "Barista" + ] + }, + { + name: "Morgan Brown", + characters: [ + "Street Preacher" + ] + }, + { + name: "Kevin Spacey", + characters: [ + "Doc" + ] + }, + { + name: "Morse Diggs", + characters: [ + "Morse Diggs" + ] + }, + { + name: "CJ Jones", + characters: [ + "Joseph" + ] + } + ] } diff --git a/db/ztests/ls.yaml b/db/ztests/ls.yaml index e64c2b3b82..cbf2373066 100644 --- a/db/ztests/ls.yaml +++ b/db/ztests/ls.yaml @@ -18,22 +18,22 @@ outputs: - name: stdout data: | { - name: "logs", - layout: { - order: "desc"::=order.Which, - keys: [ - [ - "ts" - ]::=field.Path - ]::=field.List - }::=order.SortKey, - seek_stride: 65536, - threshold: 524288000 + name: "logs", + layout: { + order: "desc"::=order.Which, + keys: [ + [ + "ts" + ]::=field.Path + ]::=field.List + }::=order.SortKey, + seek_stride: 65536, + threshold: 524288000 } === { - min: 2020-04-21T22:40:30.06852324Z, - max: 2020-04-22T01:23:40.0622373Z, - count: 1000::uint64, - size: 33493 + min: 2020-04-21T22:40:30.06852324Z, + max: 2020-04-22T01:23:40.0622373Z, + count: 1000::uint64, + size: 33493 } diff --git a/db/ztests/meta.yaml b/db/ztests/meta.yaml index 6aaa404bfb..924f7716a3 100644 --- a/db/ztests/meta.yaml +++ b/db/ztests/meta.yaml @@ -25,42 +25,42 @@ outputs: - name: stdout data: | { - name: "poolA", - layout: { - order: "asc"::=order.Which, - keys: [ - [ - "a" - ]::=field.Path - ]::=field.List - }::=order.SortKey, - seek_stride: 65536, - threshold: 524288000 + name: "poolA", + layout: { + order: "asc"::=order.Which, + keys: [ + [ + "a" + ]::=field.Path + ]::=field.List + }::=order.SortKey, + seek_stride: 65536, + threshold: 524288000 } { - name: "poolB", - layout: { - order: "desc"::=order.Which, - keys: [ - [ - "b" - ]::=field.Path - ]::=field.List - }::=order.SortKey, - seek_stride: 65536, - threshold: 524288000 + name: "poolB", + layout: { + order: "desc"::=order.Which, + keys: [ + [ + "b" + ]::=field.Path + ]::=field.List + }::=order.SortKey, + seek_stride: 65536, + threshold: 524288000 } === { - nameof: "data.Object", - min: 1, - max: 2, - count: 2::uint64, - size: 18 + nameof: "data.Object", + min: 1, + max: 2, + count: 2::uint64, + size: 18 } { - nameof: "db.BranchTip" + nameof: "db.BranchTip" } { - nameof: "Commit" + nameof: "Commit" } diff --git a/db/ztests/overlap.yaml b/db/ztests/overlap.yaml index ec363a2f9e..70554ca4f0 100644 --- a/db/ztests/overlap.yaml +++ b/db/ztests/overlap.yaml @@ -18,14 +18,14 @@ outputs: - name: stdout data: | { - min: 2020-04-21T22:40:30.06852324Z, - max: 2020-04-22T01:23:40.0622373Z, - count: 500::uint64, - size: 17073 + min: 2020-04-21T22:40:30.06852324Z, + max: 2020-04-22T01:23:40.0622373Z, + count: 500::uint64, + size: 17073 } { - min: 2020-04-21T22:40:49.0635839Z, - max: 2020-04-22T01:23:21.06632034Z, - count: 500::uint64, - size: 17039 + min: 2020-04-21T22:40:49.0635839Z, + max: 2020-04-22T01:23:21.06632034Z, + count: 500::uint64, + size: 17039 } diff --git a/db/ztests/s3/stat.yaml b/db/ztests/s3/stat.yaml index ebb360b641..dc0a2fe0ed 100644 --- a/db/ztests/s3/stat.yaml +++ b/db/ztests/s3/stat.yaml @@ -16,8 +16,8 @@ outputs: - name: stdout data: | { - min: 2020-04-21T22:40:30.06852324Z, - max: 2020-04-22T01:23:40.0622373Z, - count: 1000::uint64, - size: 33493 + min: 2020-04-21T22:40:30.06852324Z, + max: 2020-04-22T01:23:40.0622373Z, + count: 1000::uint64, + size: 33493 } diff --git a/db/ztests/vector.yaml b/db/ztests/vector.yaml index bef84e065b..8d7a2dbddd 100644 --- a/db/ztests/vector.yaml +++ b/db/ztests/vector.yaml @@ -24,10 +24,10 @@ outputs: - name: stdout data: | { - min: null, - max: null, - count: 5::uint64, - size: 72 + min: null, + max: null, + count: 5::uint64, + size: 72 } === === diff --git a/runtime/sam/op/meta/ztests/partitions.yaml b/runtime/sam/op/meta/ztests/partitions.yaml index 854f05da09..3946dd65e3 100644 --- a/runtime/sam/op/meta/ztests/partitions.yaml +++ b/runtime/sam/op/meta/ztests/partitions.yaml @@ -35,38 +35,38 @@ outputs: {k:13} === [ - { - min: 1, - max: 1 - } + { + min: 1, + max: 1 + } ] [ - { - min: 2, - max: 3 - } + { + min: 2, + max: 3 + } ] [ - { - min: 4, - max: 5 - } + { + min: 4, + max: 5 + } ] [ - { - min: 6, - max: 8 - }, - { - min: 7, - max: 12 - }, - { - min: 9, - max: 11 - }, - { - min: 10, - max: 13 - } + { + min: 6, + max: 8 + }, + { + min: 7, + max: 12 + }, + { + min: 9, + max: 11 + }, + { + min: 10, + max: 13 + } ] diff --git a/service/ztests/curl-create.yaml b/service/ztests/curl-create.yaml index 73b8824060..e02602453c 100644 --- a/service/ztests/curl-create.yaml +++ b/service/ztests/curl-create.yaml @@ -13,24 +13,24 @@ outputs: - name: stdout data: | { - pool: { - ts: 0, - name: "test", - id: 0, - layout: { - order: "desc", - keys: [ - [ - "ts" - ] - ] - }, - seek_stride: 65536, - threshold: 524288000 + pool: { + ts: 0, + name: "test", + id: 0, + layout: { + order: "desc", + keys: [ + [ + "ts" + ] + ] }, - branch: { - ts: 0, - name: "main", - commit: "0x0000000000000000000000000000000000000000" - } + seek_stride: 65536, + threshold: 524288000 + }, + branch: { + ts: 0, + name: "main", + commit: "0x0000000000000000000000000000000000000000" + } } diff --git a/service/ztests/curl-pool-rename.yaml b/service/ztests/curl-pool-rename.yaml index ce76ae2634..1166494c3c 100644 --- a/service/ztests/curl-pool-rename.yaml +++ b/service/ztests/curl-pool-rename.yaml @@ -20,17 +20,17 @@ outputs: - name: stdout data: | { - ts: 0, - name: "new_test", - id: 0, - layout: { - order: "desc", - keys: [ - [ - "ts" - ] - ] - }, - seek_stride: 65536, - threshold: 524288000 + ts: 0, + name: "new_test", + id: 0, + layout: { + order: "desc", + keys: [ + [ + "ts" + ] + ] + }, + seek_stride: 65536, + threshold: 524288000 } diff --git a/service/ztests/ls-pools.yaml b/service/ztests/ls-pools.yaml index 2dda5f7f10..edf16740c6 100644 --- a/service/ztests/ls-pools.yaml +++ b/service/ztests/ls-pools.yaml @@ -28,10 +28,10 @@ outputs: p2 \w{27} key ts order desc === { - name: "p1" + name: "p1" } { - name: "p2" + name: "p2" } === name diff --git a/service/ztests/query-describe.yaml b/service/ztests/query-describe.yaml index 41867fe391..1d5871a3c4 100644 --- a/service/ztests/query-describe.yaml +++ b/service/ztests/query-describe.yaml @@ -48,183 +48,183 @@ outputs: data: | // === multifrom.spq === { - "sources": [ - { - "kind": "Pool", - "name": "test1", - "id": "XXX" - }, - { - "kind": "Pool", - "name": "test2", - "id": "XXX" - } - ], - "channels": [ - { - "name": "main", - "aggregation_keys": null, - "sort": [ - { - "order": "desc", - "key": [ - "ts" - ] - } - ] + "sources": [ + { + "kind": "Pool", + "name": "test1", + "id": "XXX" + }, + { + "kind": "Pool", + "name": "test2", + "id": "XXX" + } + ], + "channels": [ + { + "name": "main", + "aggregation_keys": null, + "sort": [ + { + "order": "desc", + "key": [ + "ts" + ] } - ] + ] + } + ] } // === agg.spq === { - "sources": [ - { - "kind": "Pool", - "name": "test1", - "id": "XXX" - } - ], - "channels": [ - { - "name": "main", - "aggregation_keys": [ - [ - "key1" - ], - [ - "key2" - ] - ], - "sort": null - } - ] + "sources": [ + { + "kind": "Pool", + "name": "test1", + "id": "XXX" + } + ], + "channels": [ + { + "name": "main", + "aggregation_keys": [ + [ + "key1" + ], + [ + "key2" + ] + ], + "sort": null + } + ] } // === agg-no-keys.spq === { - "sources": [ - { - "kind": "Pool", - "name": "test1", - "id": "XXX" - } - ], - "channels": [ - { - "name": "main", - "aggregation_keys": [], - "sort": null - } - ] + "sources": [ + { + "kind": "Pool", + "name": "test1", + "id": "XXX" + } + ], + "channels": [ + { + "name": "main", + "aggregation_keys": [], + "sort": null + } + ] } // === two-channels.spq === { - "sources": [ - { - "kind": "Pool", - "name": "test1", - "id": "XXX" - }, - { - "kind": "Pool", - "name": "test2", - "id": "XXX" + "sources": [ + { + "kind": "Pool", + "name": "test1", + "id": "XXX" + }, + { + "kind": "Pool", + "name": "test2", + "id": "XXX" + } + ], + "channels": [ + { + "name": "main", + "aggregation_keys": [ + [ + "key1" + ] + ], + "sort": null + }, + { + "name": "secondary", + "aggregation_keys": null, + "sort": [ + { + "order": "desc", + "key": [ + "ts" + ] } - ], - "channels": [ - { - "name": "main", - "aggregation_keys": [ - [ - "key1" - ] - ], - "sort": null - }, - { - "name": "secondary", - "aggregation_keys": null, - "sort": [ - { - "order": "desc", - "key": [ - "ts" - ] - } - ] - } - ] + ] + } + ] } // === agg-sort.spq === { - "sources": [ - { - "kind": "Pool", - "name": "test1", - "id": "XXX" + "sources": [ + { + "kind": "Pool", + "name": "test1", + "id": "XXX" + } + ], + "channels": [ + { + "name": "main", + "aggregation_keys": [ + [ + "foo" + ] + ], + "sort": [ + { + "order": "asc", + "key": [ + "x" + ] } - ], - "channels": [ - { - "name": "main", - "aggregation_keys": [ - [ - "foo" - ] - ], - "sort": [ - { - "order": "asc", - "key": [ - "x" - ] - } - ] - } - ] + ] + } + ] } // === scope.spq === { - "sources": [ - { - "kind": "Pool", - "name": "test1", - "id": "XXX" + "sources": [ + { + "kind": "Pool", + "name": "test1", + "id": "XXX" + } + ], + "channels": [ + { + "name": "main", + "aggregation_keys": null, + "sort": [ + { + "order": "desc", + "key": [ + "ts" + ] } - ], - "channels": [ - { - "name": "main", - "aggregation_keys": null, - "sort": [ - { - "order": "desc", - "key": [ - "ts" - ] - } - ] - }, - { - "name": "secondary", - "aggregation_keys": null, - "sort": null - } - ] + ] + }, + { + "name": "secondary", + "aggregation_keys": null, + "sort": null + } + ] } // === auto-combined-channels.spq === { - "sources": [ - { - "kind": "Pool", - "name": "test1", - "id": "XXX" - } - ], - "channels": [ - { - "name": "main", - "aggregation_keys": null, - "sort": null - } - ] + "sources": [ + { + "kind": "Pool", + "name": "test1", + "id": "XXX" + } + ], + "channels": [ + { + "name": "main", + "aggregation_keys": null, + "sort": null + } + ] } diff --git a/service/ztests/query-runtime-error-log.yaml b/service/ztests/query-runtime-error-log.yaml index fde4a5c39c..62b99b8c50 100644 --- a/service/ztests/query-runtime-error-log.yaml +++ b/service/ztests/query-runtime-error-log.yaml @@ -13,7 +13,7 @@ outputs: - name: stdout data: | { - level: "warn", - msg: "Error writing batch", - error: "parquetio: unsupported type: empty record" + level: "warn", + msg: "Error writing batch", + error: "parquetio: unsupported type: empty record" } diff --git a/service/ztests/vector.yaml b/service/ztests/vector.yaml index bd70a3920c..ee93c3cfde 100644 --- a/service/ztests/vector.yaml +++ b/service/ztests/vector.yaml @@ -24,10 +24,10 @@ outputs: - name: stdout data: | { - min: null, - max: null, - count: 5::uint64, - size: 72 + min: null, + max: null, + count: 5::uint64, + size: 72 } === === diff --git a/sio/arrowio/ztests/roundtrip.yaml b/sio/arrowio/ztests/roundtrip.yaml index cb215dbd72..7038f859f1 100644 --- a/sio/arrowio/ztests/roundtrip.yaml +++ b/sio/arrowio/ztests/roundtrip.yaml @@ -5,75 +5,75 @@ inputs: - name: stdin data: &stdin | { - null: null, - bool: true, - uint8: 8::uint8, - int8: -8::int8, - uint16: 16::uint16, - int16: -16::int16, - uint32: 32::uint32, - int32: -32::int32, - uint64: 64::uint64, - int64: -64, - float16: 16.::float16, - float32: 32.::float32, - float64: 64., - string: "", - binary: 0x00, - fixed_size_binary: 0x0102::=arrow_fixed_size_binary_2, - date32: 2022-12-04T00:00:00Z::=arrow_date32, - date64: 2022-12-04T00:00:00Z::=arrow_date64, - timestamp_s: 2022-12-04T19:43:48Z::=arrow_timestamp_s, - timestamp_ms: 2022-12-04T19:43:48.123Z::=arrow_timestamp_ms, - timestamp_us: 2022-12-04T19:43:48.123456Z::=arrow_timestamp_us, - timestamp_ns: 2022-12-04T19:43:48.123456789Z, - time32_s: 1970-01-01T19:43:48Z::=arrow_time32_s, - time32_ms: 1970-01-01T19:43:48.123Z::=arrow_time32_ms, - time64_us: 1970-01-01T19:43:48.123456Z::=arrow_time64_us, - time64_ns: 1970-01-01T19:43:48.123456789Z::=arrow_time64_ns, - month_interval: -12::(arrow_month_interval=int32), - day_time_interval: { - days: 1::int32, - milliseconds: 2::uint32 - }::=arrow_day_time_interval, - decimal128: { - high: 1, - low: 2::uint64 - }::=arrow_decimal128, - decimal256: [ - 1::uint64, - 2::uint64, - 3::uint64, - 4::uint64 - ]::=arrow_decimal256, - list: [ - 1 - ], - struct: { - a: 0 - }, - union: 1::(int64|string), - map: |{ - 1: "one" - }|, - fixed_size_list: [ - 1 - ]::=arrow_fixed_size_list_1, - duration_s: 1s::=arrow_duration_s, - duration_ms: 1ms::=arrow_duration_ms, - duration_us: 1us::=arrow_duration_us, - duration_ns: 1ns, - large_string: ""::=arrow_large_string, - large_binary: 0x00::=arrow_large_binary, - large_list: [ - 1, - 2 - ]::=arrow_large_list, - month_day_nano_interval: { - month: 1::int32, - day: 2::int32, - nanoseconds: 3 - }::=arrow_month_day_nano_interval + null: null, + bool: true, + uint8: 8::uint8, + int8: -8::int8, + uint16: 16::uint16, + int16: -16::int16, + uint32: 32::uint32, + int32: -32::int32, + uint64: 64::uint64, + int64: -64, + float16: 16.::float16, + float32: 32.::float32, + float64: 64., + string: "", + binary: 0x00, + fixed_size_binary: 0x0102::=arrow_fixed_size_binary_2, + date32: 2022-12-04T00:00:00Z::=arrow_date32, + date64: 2022-12-04T00:00:00Z::=arrow_date64, + timestamp_s: 2022-12-04T19:43:48Z::=arrow_timestamp_s, + timestamp_ms: 2022-12-04T19:43:48.123Z::=arrow_timestamp_ms, + timestamp_us: 2022-12-04T19:43:48.123456Z::=arrow_timestamp_us, + timestamp_ns: 2022-12-04T19:43:48.123456789Z, + time32_s: 1970-01-01T19:43:48Z::=arrow_time32_s, + time32_ms: 1970-01-01T19:43:48.123Z::=arrow_time32_ms, + time64_us: 1970-01-01T19:43:48.123456Z::=arrow_time64_us, + time64_ns: 1970-01-01T19:43:48.123456789Z::=arrow_time64_ns, + month_interval: -12::(arrow_month_interval=int32), + day_time_interval: { + days: 1::int32, + milliseconds: 2::uint32 + }::=arrow_day_time_interval, + decimal128: { + high: 1, + low: 2::uint64 + }::=arrow_decimal128, + decimal256: [ + 1::uint64, + 2::uint64, + 3::uint64, + 4::uint64 + ]::=arrow_decimal256, + list: [ + 1 + ], + struct: { + a: 0 + }, + union: 1::(int64|string), + map: |{ + 1: "one" + }|, + fixed_size_list: [ + 1 + ]::=arrow_fixed_size_list_1, + duration_s: 1s::=arrow_duration_s, + duration_ms: 1ms::=arrow_duration_ms, + duration_us: 1us::=arrow_duration_us, + duration_ns: 1ns, + large_string: ""::=arrow_large_string, + large_binary: 0x00::=arrow_large_binary, + large_list: [ + 1, + 2 + ]::=arrow_large_list, + month_day_nano_interval: { + month: 1::int32, + day: 2::int32, + nanoseconds: 3 + }::=arrow_month_day_nano_interval } outputs: diff --git a/sio/csvio/ztests/embedded-quotes.yaml b/sio/csvio/ztests/embedded-quotes.yaml index e7bcb4739b..91a6a3a3c3 100644 --- a/sio/csvio/ztests/embedded-quotes.yaml +++ b/sio/csvio/ztests/embedded-quotes.yaml @@ -10,7 +10,7 @@ outputs: - name: stdout data: | { - field1: "\",\"", - field2: "\" has a couple \" embedded quotes and a , comma", - field3: "\" \"" + field1: "\",\"", + field2: "\" has a couple \" embedded quotes and a , comma", + field3: "\" \"" } diff --git a/sio/jsonio/ztests/test.yaml b/sio/jsonio/ztests/test.yaml index 74f65ed7d5..d615703cb6 100644 --- a/sio/jsonio/ztests/test.yaml +++ b/sio/jsonio/ztests/test.yaml @@ -9,7 +9,7 @@ outputs: - name: stdout data: | { - "a": { - "b": "1" - } + "a": { + "b": "1" + } } diff --git a/sio/parquetio/ztests/types.yaml b/sio/parquetio/ztests/types.yaml index 9f479ded78..b7f04cd3f7 100644 --- a/sio/parquetio/ztests/types.yaml +++ b/sio/parquetio/ztests/types.yaml @@ -6,49 +6,49 @@ inputs: - name: stdin data: | { - u8: 8::uint8, - u16: 16::uint16, - u32: 32::uint32, - u64: 64, - i8: -8::int8, - i16: -16::int16, - i32: -32::int32, - i64: -64, - // duration is not supported by pqarrow. - tim: 1970-01-01T00:00:00Z, - f16: 16.::float16, - f32: 32.::float32, - f64: 64., - boo: false, - byt: 0x01020304, - str: "1234", - ip: 1.2.3.4, - net: 5.6.7.0/24, - typ: , - err: error("err"), - rec: {a:1}, + u8: 8::uint8, + u16: 16::uint16, + u32: 32::uint32, + u64: 64, + i8: -8::int8, + i16: -16::int16, + i32: -32::int32, + i64: -64, + // duration is not supported by pqarrow. + tim: 1970-01-01T00:00:00Z, + f16: 16.::float16, + f32: 32.::float32, + f64: 64., + boo: false, + byt: 0x01020304, + str: "1234", + ip: 1.2.3.4, + net: 5.6.7.0/24, + typ: , + err: error("err"), + rec: {a:1}, }::=0 { - u8: null, - u16: null, - u32: null, - u64: null, - i8: null, - i16: null, - i32: null, - i64: null, - tim: null, - f16: null, - f32: null, - f64: null, - boo: null, - byt: null, - str: null, - ip: null, - net: null, - typ: null, - err: null, - rec: null, + u8: null, + u16: null, + u32: null, + u64: null, + i8: null, + i16: null, + i32: null, + i64: null, + tim: null, + f16: null, + f32: null, + f64: null, + boo: null, + byt: null, + str: null, + ip: null, + net: null, + typ: null, + err: null, + rec: null, }::0 @@ -56,48 +56,48 @@ outputs: - name: stdout data: | { - u8: 8::uint8, - u16: 16::uint16, - u32: 32::uint32, - u64: 64, - i8: -8::int8, - i16: -16::int16, - i32: -32::int32, - i64: -64, - tim: 1970-01-01T00:00:00Z, - f16: 16.::float16, - f32: 32.::float32, - f64: 64., - boo: false, - byt: 0x01020304, - str: "1234", - ip: "1.2.3.4", - net: "5.6.7.0/24", - typ: "int8", - err: "error(\"err\")", - rec: { - a: 1 - } + u8: 8::uint8, + u16: 16::uint16, + u32: 32::uint32, + u64: 64, + i8: -8::int8, + i16: -16::int16, + i32: -32::int32, + i64: -64, + tim: 1970-01-01T00:00:00Z, + f16: 16.::float16, + f32: 32.::float32, + f64: 64., + boo: false, + byt: 0x01020304, + str: "1234", + ip: "1.2.3.4", + net: "5.6.7.0/24", + typ: "int8", + err: "error(\"err\")", + rec: { + a: 1 + } } { - u8: null::uint8, - u16: null::uint16, - u32: null::uint32, - u64: null::int64, - i8: null::int8, - i16: null::int16, - i32: null::int32, - i64: null::int64, - tim: null::time, - f16: null::float16, - f32: null::float32, - f64: null::float64, - boo: null::bool, - byt: null::bytes, - str: null::string, - ip: null::string, - net: null::string, - typ: null::string, - err: null::string, - rec: null::{a:int64} + u8: null::uint8, + u16: null::uint16, + u32: null::uint32, + u64: null::int64, + i8: null::int8, + i16: null::int16, + i32: null::int32, + i64: null::int64, + tim: null::time, + f16: null::float16, + f32: null::float32, + f64: null::float64, + boo: null::bool, + byt: null::bytes, + str: null::string, + ip: null::string, + net: null::string, + typ: null::string, + err: null::string, + rec: null::{a:int64} } diff --git a/sio/supio/ztests/sup-bsup.yaml b/sio/supio/ztests/sup-bsup.yaml index 0c021ac780..8ce52614df 100644 --- a/sio/supio/ztests/sup-bsup.yaml +++ b/sio/supio/ztests/sup-bsup.yaml @@ -13,38 +13,38 @@ outputs: - name: stdout data: | { - a: "hello", - b: "world", - n: 123::int32, + a: "hello", + b: "world", + n: 123::int32, + f: [ + 1::(foo=uint8), + 2::foo, + 3::foo + ], + t: <{ + a: string, + b: string, + n: int32, f: [ - 1::(foo=uint8), - 2::foo, - 3::foo - ], - t: <{ - a: string, - b: string, - n: int32, - f: [ - foo=uint8 - ] - }> + foo=uint8 + ] + }> } { - a: "goodbye", - b: "world", - n: 456::int32, + a: "goodbye", + b: "world", + n: 456::int32, + f: [ + 4::(foo=uint8), + 5::foo, + 6::foo + ], + t: <{ + a: string, + b: string, + n: int32, f: [ - 4::(foo=uint8), - 5::foo, - 6::foo - ], - t: <{ - a: string, - b: string, - n: int32, - f: [ - foo=uint8 - ] - }> + foo=uint8 + ] + }> } diff --git a/sup/ztests/zeek-to-sup.yaml b/sup/ztests/zeek-to-sup.yaml index 9fc20d42e7..9b8f6295e4 100644 --- a/sup/ztests/zeek-to-sup.yaml +++ b/sup/ztests/zeek-to-sup.yaml @@ -18,31 +18,31 @@ outputs: - name: stdout data: | { - my_bool: true, - my_count: 123::uint64, - my_int: 456, - my_double: 123.456, - my_time: 2020-06-18T17:42:31.123456Z, - my_interval: 2m3.456s, - my_printable_string: "smilešŸ˜smile", - my_bytes_string: "\t\u0007\u0004", - my_port: 80::(port=uint16), - my_addr: 127.0.0.1, - my_subnet: 10.0.0.0/8, - my_enum: "tcp"::=zenum, - my_set: |[ - "a", - "in", - "set", - "things" - ]|, - my_vector: [ - "order", - "is", - "important" - ], - my_record: { - name: "Jeanne", - age: 122::uint64 - } + my_bool: true, + my_count: 123::uint64, + my_int: 456, + my_double: 123.456, + my_time: 2020-06-18T17:42:31.123456Z, + my_interval: 2m3.456s, + my_printable_string: "smilešŸ˜smile", + my_bytes_string: "\t\u0007\u0004", + my_port: 80::(port=uint16), + my_addr: 127.0.0.1, + my_subnet: 10.0.0.0/8, + my_enum: "tcp"::=zenum, + my_set: |[ + "a", + "in", + "set", + "things" + ]|, + my_vector: [ + "order", + "is", + "important" + ], + my_record: { + name: "Jeanne", + age: 122::uint64 + } }