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.

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

Fix to_timestamps truncated subsecond calculation #11367

Merged
merged 3 commits into from
Jul 29, 2022
Merged

Fix to_timestamps truncated subsecond calculation #11367

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
4d23cc0
Fix to_timestamps truncated subsecond calculation
davidwendt Jul 27, 2022
754ab41
Merge branch 'branch-22.10' into bug-to-tstamp-trunc-subsec
davidwendt Jul 27, 2022
ac6edb6
Merge branch 'branch-22.10' into bug-to-tstamp-trunc-subsec
davidwendt Jul 27, 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 cpp/src/strings/convert/convert_datetime.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ struct parse_datetime {
std::min(static_cast<int32_t>(item.length), static_cast<int32_t>(length));
auto const [fraction, left] = parse_int(ptr, read_size);
timeparts.subsecond =
static_cast<int32_t>(fraction * power_of_ten(item.length - read_size - left));
static_cast<int32_t>(fraction * power_of_ten(item.length - read_size + left));
bytes_read = read_size - left;
break;
}
Expand Down
38 changes: 29 additions & 9 deletions cpp/tests/strings/datetime_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,30 +181,50 @@ TEST_F(StringsDatetimeTest, ToTimestampSingleSpecifier)

TEST_F(StringsDatetimeTest, ToTimestampVariableFractions)
{
cudf::test::strings_column_wrapper strings{"01:02:03.000001000",
"01:02:03.000001",
"01:02:03.1",
"01:02:03.01",
"01:02:03.0098700",
"01:02:03.0023456"};
auto strings_view = cudf::strings_column_view(strings);
cudf::test::strings_column_wrapper test1{"01:02:03.000001000",
"01:02:03.000001",
"01:02:03.1",
"01:02:03.01",
"01:02:03.0098700",
"01:02:03.0023456"};
auto strings_view = cudf::strings_column_view(test1);
auto results = cudf::strings::to_timestamps(
strings_view, cudf::data_type{cudf::type_id::TIMESTAMP_NANOSECONDS}, "%H:%M:%S.%9f");
auto durations =
cudf::cast(results->view(), cudf::data_type{cudf::type_id::DURATION_NANOSECONDS});

cudf::test::fixed_width_column_wrapper<cudf::duration_ns> expected{
cudf::test::fixed_width_column_wrapper<cudf::duration_ns> expected1{
cudf::duration_ns{3723000001000},
cudf::duration_ns{3723000001000},
cudf::duration_ns{3723100000000},
cudf::duration_ns{3723010000000},
cudf::duration_ns{3723009870000},
cudf::duration_ns{3723002345600}};
CUDF_TEST_EXPECT_COLUMNS_EQUAL(*durations, expected);
CUDF_TEST_EXPECT_COLUMNS_EQUAL(*durations, expected1);

results = cudf::strings::is_timestamp(strings_view, "%H:%M:%S.%f");
CUDF_TEST_EXPECT_COLUMNS_EQUAL(*results,
cudf::test::fixed_width_column_wrapper<bool>{1, 1, 1, 1, 1, 1});

cudf::test::strings_column_wrapper test2{"01:02:03.100001Z",
"01:02:03.001Z",
"01:02:03.1Z",
"01:02:03.01Z",
"01:02:03.0098Z",
"01:02:03.00234Z"};
strings_view = cudf::strings_column_view(test2);
results = cudf::strings::to_timestamps(
strings_view, cudf::data_type{cudf::type_id::TIMESTAMP_MICROSECONDS}, "%H:%M:%S.%6f%Z");
durations = cudf::cast(results->view(), cudf::data_type{cudf::type_id::DURATION_MICROSECONDS});

cudf::test::fixed_width_column_wrapper<cudf::duration_us> expected2{
cudf::duration_us{3723100001},
cudf::duration_us{3723001000},
cudf::duration_us{3723100000},
cudf::duration_us{3723010000},
cudf::duration_us{3723009800},
cudf::duration_us{3723002340}};
CUDF_TEST_EXPECT_COLUMNS_EQUAL(*durations, expected2);
}

TEST_F(StringsDatetimeTest, ToTimestampYear)
Expand Down