Skip to content

Commit a146c98

Browse files
author
Devdutt Shenoi
authored
Merge branch 'main' into tracing
2 parents 10ff295 + dd2b8b2 commit a146c98

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/event/format/json.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ impl EventFormat for Event {
8787
infer_schema
8888
.fields
8989
.iter()
90+
.filter(|field| !field.data_type().is_null())
9091
.cloned()
9192
.sorted_by(|a, b| a.name().cmp(b.name()))
9293
.collect()

src/handlers/http/ingest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ mod tests {
384384
let (rb, _) = into_event_batch(req, json, HashMap::default(), None, None).unwrap();
385385

386386
assert_eq!(rb.num_rows(), 1);
387-
assert_eq!(rb.num_columns(), 6);
387+
assert_eq!(rb.num_columns(), 5);
388388
assert_eq!(
389389
rb.column_by_name("a").unwrap().as_int64_arr(),
390390
&Int64Array::from_iter([1])

0 commit comments

Comments
 (0)