Skip to content

feat: Don't display nulls as 0 in diff #5163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marwes merged 3 commits into from
Sep 7, 2022
Merged

feat: Don't display nulls as 0 in diff #5163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1ab503
feat: Don't display nulls as 0 in diff
Sep 2, 2022
987a6fd
test: Check that diff handles nulls
Sep 5, 2022
0f15b8b
chore: make generate
Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libflux/go/libflux/buildinfo.gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ var sourceHashes = map[string]string{
"stdlib/experimental/csv/csv.flux": "7f033d93ed2e456d7ee181f0afa88f8c4c81f3b1a0984e56d53d3e146db48d20",
"stdlib/experimental/date/boundaries/boundaries.flux": "d89786ac0607574da4cd130800670907e404f9dbfea0e74dd7b2c887707feaae",
"stdlib/experimental/date/boundaries/boundaries_test.flux": "35f4198aae27017b38227a20d16ecf5c6ec81382643a36aafadda844b8d36e2b",
"stdlib/experimental/diff_test.flux": "9e008f0ce38d69faa2a4ab48ffcae8090262809e24ac80625bae558b68b6554c",
"stdlib/experimental/diff_test.flux": "b75aa4095b24d67f027b24b0c08e926824a6f68ea292821c025bcb8ac76c0339",
"stdlib/experimental/distinct_test.flux": "c7358d31972d0931aef6735ea94d901827c13fbaaeb9b02ff255391b5f95ea30",
"stdlib/experimental/experimental.flux": "24cf87d3a5ce2f7cb6534856c1cee16047721f313eaa6e981c826caa611fd2a0",
"stdlib/experimental/experimental_test.flux": "b417f361be23e610b6caffa266c40c421b19dedc3289ce064bb065cb0bcd825c",
Expand Down
10 changes: 8 additions & 2 deletions stdlib/experimental/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,19 @@ func (d *diffSchema) appendRow(builders []array.Builder, which, i int) {
}

for j, idx := range idxs {
builder := builders[j]
if idx < 0 {
builders[j].AppendNull()
builder.AppendNull()
continue
}

arr := chunk.Values(idx)
switch b := builders[j].(type) {
if arr.IsNull(i) {
builder.AppendNull()
continue
}

switch b := builder.(type) {
case *array.FloatBuilder:
b.Append(arr.(*array.Float).Value(i))
case *array.IntBuilder:
Expand Down
47 changes: 47 additions & 0 deletions stdlib/experimental/diff_test.flux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package experimental_test
import "testing"
import "array"
import "experimental"
import "internal/debug"

testcase match {
rows = [{_measurement: "m0", _field: "f0", _time: 2022-07-12T00:00:00Z, _value: 2.0}]
Expand Down Expand Up @@ -287,3 +288,49 @@ testcase mismatch_non_string_group_key {
|> rename(columns: {_diff: "diff"})
|> testing.diff(want: exp)
}

testcase mismatch_null {
want =
array.from(
rows: [{_measurement: "m0", _field: "f0", _time: 2022-07-12T00:00:00Z, _value: 2.0}],
)
|> group(columns: ["_measurement", "_field"])

got =
array.from(
rows: [
{
_measurement: "m0",
_field: "f0",
_time: 2022-07-12T00:00:00Z,
_value: debug.null(type: "float"),
},
],
)
|> group(columns: ["_measurement", "_field"])

exp =
array.from(
rows: [
{
diff: "-",
_measurement: "m0",
_field: "f0",
_time: 2022-07-12T00:00:00Z,
_value: 2.0,
},
{
diff: "+",
_measurement: "m0",
_field: "f0",
_time: 2022-07-12T00:00:00Z,
_value: debug.null(type: "float"),
},
],
)
|> group(columns: ["_measurement", "_field"])

experimental.diff(want, got)
|> rename(columns: {_diff: "diff"})
|> testing.diff(want: exp)
}