Skip to content
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.

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

Support SQL-compliant NaN ordering for DictionaryArray and non-DictionaryArray #2600

Merged
merged 1 commit into from Aug 29, 2022

Conversation

viirya
Copy link
Member

@viirya viirya commented Aug 28, 2022

Which issue does this PR close?

Closes #2599.

Rationale for this change

What changes are included in this PR?

Are there any user-facing changes?

@viirya
Copy link
Member Author

viirya commented Aug 28, 2022

cc @sunchao

@github-actions github-actions bot added the arrow Changes to the arrow crate label Aug 28, 2022
Comment on lines +2689 to +2693
if is_nan(a) && is_nan(b) {
true
} else {
a == b
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor:

Suggested change
if is_nan(a) && is_nan(b) {
true
} else {
a == b
}
(is_nan(a) && is_nan(b)) || (a == b)

Comment on lines +3356 to +3360
if is_nan(b) {
true
} else {
a <= b
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor:

Suggested change
if is_nan(b) {
true
} else {
a <= b
}
is_nan(b) || (a <= b)

Comment on lines +3331 to +3335
if is_nan(a) {
true
} else {
a >= b
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor:

Suggested change
if is_nan(a) {
true
} else {
a >= b
}
is_nan(a) || (a >= b)

Comment on lines +2714 to +2718
if is_nan(a) && is_nan(b) {
true
} else {
a == b
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor

Suggested change
if is_nan(a) && is_nan(b) {
true
} else {
a == b
}
(is_nan(a) && is_nan(b)) || a == b)

Comment on lines +2840 to +2844
if is_nan(a) && is_nan(b) {
false
} else {
a != b
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor

Suggested change
if is_nan(a) && is_nan(b) {
false
} else {
a != b
}
!(is_nan(a) && is_nan(b)) && (a != b)

Comment on lines +2815 to +2819
if is_nan(a) && is_nan(b) {
false
} else {
a != b
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor

Suggested change
if is_nan(a) && is_nan(b) {
false
} else {
a != b
}
!(is_nan(a) && is_nan(b)) && (a != b)

Comment on lines +2943 to +2949
if is_nan(a) {
false
} else if is_nan(b) {
true
} else {
a < b
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor

Suggested change
if is_nan(a) {
false
} else if is_nan(b) {
true
} else {
a < b
}
!is_nan(a) && (is_nan(b) || (a < b))

Comment on lines +3099 to +3103
if is_nan(b) {
is_nan(a)
} else {
a >= b
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor

Suggested change
if is_nan(b) {
is_nan(a)
} else {
a >= b
}
(is_nan(b) && is_nan(a)) || (!is_nan(b) && (a >= b))

Comment on lines +3228 to +3234
if is_nan(b) {
!is_nan(a)
} else if is_nan(a) {
false
} else {
a < b
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor

Suggested change
if is_nan(b) {
!is_nan(a)
} else if is_nan(a) {
false
} else {
a < b
}
(is_nan(b) && !is_nan(a) ) ||
(!is_nan(b) && !is_nan(a) && (a < b))

Copy link
Member Author

@viirya viirya Aug 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I'm not a fan of these shorten expressions. It is more hard to read and easier to mistake.

Note: I just checked compiled code. It appears to be the same.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree. It's more readable this way.

@viirya
Copy link
Member Author

viirya commented Aug 29, 2022

@tustvold As I'm going to use total_cmp, how about we merge this first in, and then I propose a PR to change to total_cmp and clean up the feature flag?

Copy link
Member

@sunchao sunchao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment on lines +3228 to +3234
if is_nan(b) {
!is_nan(a)
} else if is_nan(a) {
false
} else {
a < b
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree. It's more readable this way.

@viirya
Copy link
Member Author

viirya commented Aug 29, 2022

I'm going to merge this in and make a PR to use total_cmp and remove the flag.

@viirya viirya merged commit 24036e9 into apache:master Aug 29, 2022
@ursabot
Copy link

ursabot commented Aug 29, 2022

Benchmark runs are scheduled for baseline = 248fa30 and contender = 24036e9. 24036e9 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-thinkcentre-m75q] ursa-thinkcentre-m75q
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
arrow Changes to the arrow crate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support SQL-compliant NaN ordering between for DictionaryArray and non-DictionaryArray
4 participants