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

Remove JsonEqual #2317

Merged
merged 4 commits into from Aug 5, 2022
Merged

Remove JsonEqual #2317

merged 4 commits into from Aug 5, 2022

Conversation

viirya
Copy link
Member

@viirya viirya commented Aug 4, 2022

Which issue does this PR close?

Closes #2296.

Rationale for this change

What changes are included in this PR?

Are there any user-facing changes?

@github-actions github-actions bot added arrow Changes to the arrow crate parquet Changes to the parquet crate labels Aug 4, 2022
Copy link
Contributor

@tustvold tustvold left a comment

Choose a reason for hiding this comment

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

What a fast turn around, love it 👍

Edit: there appear to be some test failures

}

/// Construct an Arrow array from a partially typed JSON column
fn array_from_json(
Copy link
Contributor

Choose a reason for hiding this comment

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

This appears to have just been moved

@@ -127,7 +127,7 @@ pub fn timestamp_ns_to_datetime(v: i64) -> NaiveDateTime {
// extract seconds from nanoseconds
v / NANOSECONDS,
// discard extracted seconds
(v % NANOSECONDS) as u32,
if v > 0 { (v % NANOSECONDS) as u32 } else { 0 },
Copy link
Member Author

@viirya viirya Aug 4, 2022

Choose a reason for hiding this comment

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

When v is negative, this parameter causes invalid or out-of-range datetime error. Just temporarily avoid the failure here. Other function like timestamp_us_to_datetime might have same issue.

Copy link
Member Author

Choose a reason for hiding this comment

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

@@ -945,22 +1258,25 @@ mod tests {
.len(3)
.add_buffer(value_offsets)
.add_child_data(value_data.into_data())
.null_bit_buffer(Some(Buffer::from([0b00000011])))
Copy link
Member Author

@viirya viirya Aug 4, 2022

Choose a reason for hiding this comment

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

This appears to be a bug in previous code. The integration.json specifies validity like the update, but it doesn't reflect that before.

.len(3)
.add_child_data(structs_int32s.data().clone())
.add_child_data(structs_utf8s.data().clone())
.null_bit_buffer(Some(Buffer::from([0b00000011])))
Copy link
Member Author

Choose a reason for hiding this comment

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

same as to reflect the validity data in integration.json.

@tustvold tustvold merged commit 2683b06 into apache:master Aug 5, 2022
@ursabot
Copy link

ursabot commented Aug 5, 2022

Benchmark runs are scheduled for baseline = 5166a08 and contender = 2683b06. 2683b06 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

@alamb
Copy link
Contributor

alamb commented Aug 5, 2022

This is a nice change -- thank you @viirya and @tustvold

@viirya
Copy link
Member Author

viirya commented Aug 5, 2022

Thanks @tustvold @alamb

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 parquet Changes to the parquet crate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove JsonEqual trait
4 participants