Skip to content

Commit

Permalink
Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Chong Gao committed Jan 30, 2024
1 parent 863cb83 commit de74645
Showing 1 changed file with 42 additions and 37 deletions.
79 changes: 42 additions & 37 deletions src/main/cpp/src/datetime_parser.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,14 @@ struct parse_timestamp_string_fn {
return thrust::make_tuple(cudf::timestamp_us{cudf::duration_us{0}}, ParseResult::INVALID);
}

auto const d_str = d_strings.element<cudf::string_view>(idx);

timestamp_components ts_comp{};
char const* tz_lit_ptr = nullptr;
cudf::size_type tz_lit_len = 0;
switch (parse_string_to_timestamp_us(&ts_comp, &tz_lit_ptr, &tz_lit_len, d_str)) {
auto const d_str = d_strings.element<cudf::string_view>(idx);
auto parse_ret_tuple = parse_string_to_timestamp_us(d_str);
auto ts_comp = thrust::get<0>(parse_ret_tuple);
auto tz_lit_ptr = thrust::get<1>(parse_ret_tuple);
auto tz_lit_len = thrust::get<2>(parse_ret_tuple);
auto result = thrust::get<3>(parse_ret_tuple);

switch (result) {
case ParseResult::INVALID:
return thrust::make_tuple(cudf::timestamp_us{cudf::duration_us{0}}, ParseResult::INVALID);
case ParseResult::UNSUPPORTED:
Expand Down Expand Up @@ -391,12 +393,15 @@ struct parse_timestamp_string_fn {
* Parse a string with time zone to a timestamp.
* The bool in the returned tuple is false if the parse failed.
*/
__device__ inline ParseResult parse_string_to_timestamp_us(
timestamp_components* ts_comp,
char const** parsed_tz_ptr,
cudf::size_type* parsed_tz_length,
cudf::string_view const& timestamp_str) const
__device__ inline thrust::tuple<timestamp_components, char const*, cudf::size_type, ParseResult>
parse_string_to_timestamp_us(cudf::string_view const& timestamp_str) const
{
timestamp_components ts_comp{};
char const* parsed_tz_ptr = nullptr;
cudf::size_type parsed_tz_length = -1;
auto invalid_ret =
thrust::make_tuple(ts_comp, parsed_tz_ptr, parsed_tz_length, ParseResult::INVALID);

const char* curr_ptr = timestamp_str.data();
const char* end_ptr = curr_ptr + timestamp_str.size_bytes();

Expand All @@ -409,7 +414,7 @@ struct parse_timestamp_string_fn {
--end_ptr;
}

if (curr_ptr == end_ptr) { return ParseResult::INVALID; }
if (curr_ptr == end_ptr) { return invalid_ret; }

const char* const bytes = curr_ptr;
const cudf::size_type bytes_length = end_ptr - curr_ptr;
Expand Down Expand Up @@ -441,72 +446,72 @@ struct parse_timestamp_string_fn {
i += 3;
} else if (i < 2) {
if (b == '-') {
if (!is_valid_digits(i, current_segment_digits)) { return ParseResult::INVALID; }
if (!is_valid_digits(i, current_segment_digits)) { return invalid_ret; }
segments[i] = current_segment_value;
current_segment_value = 0;
current_segment_digits = 0;
i += 1;
} else if (0 == i && ':' == b && !year_sign.has_value()) {
if (!is_valid_digits(3, current_segment_digits)) { return ParseResult::INVALID; }
if (!is_valid_digits(3, current_segment_digits)) { return invalid_ret; }
segments[3] = current_segment_value;
current_segment_value = 0;
current_segment_digits = 0;
i = 4;
} else {
return ParseResult::INVALID;
return invalid_ret;
}
} else if (2 == i) {
if (' ' == b || 'T' == b) {
if (!is_valid_digits(i, current_segment_digits)) { return ParseResult::INVALID; }
if (!is_valid_digits(i, current_segment_digits)) { return invalid_ret; }
segments[i] = current_segment_value;
current_segment_value = 0;
current_segment_digits = 0;
i += 1;
} else {
return ParseResult::INVALID;
return invalid_ret;
}
} else if (3 == i || 4 == i) {
if (':' == b) {
if (!is_valid_digits(i, current_segment_digits)) { return ParseResult::INVALID; }
if (!is_valid_digits(i, current_segment_digits)) { return invalid_ret; }
segments[i] = current_segment_value;
current_segment_value = 0;
current_segment_digits = 0;
i += 1;
} else {
return ParseResult::INVALID;
return invalid_ret;
}
} else if (5 == i || 6 == i) {
if ('.' == b && 5 == i) {
if (!is_valid_digits(i, current_segment_digits)) { return ParseResult::INVALID; }
if (!is_valid_digits(i, current_segment_digits)) { return invalid_ret; }
segments[i] = current_segment_value;
current_segment_value = 0;
current_segment_digits = 0;
i += 1;
} else {
if (!is_valid_digits(i, current_segment_digits) || !allow_tz_in_date_str) {
return ParseResult::INVALID;
return invalid_ret;
}
segments[i] = current_segment_value;
current_segment_value = 0;
current_segment_digits = 0;
i += 1;
*parsed_tz_ptr = bytes + j;
parsed_tz_ptr = bytes + j;
// strip the whitespace between timestamp and timezone
while (*parsed_tz_ptr < end_ptr && is_whitespace(**parsed_tz_ptr))
++(*parsed_tz_ptr);
*parsed_tz_length = end_ptr - *parsed_tz_ptr;
while (parsed_tz_ptr < end_ptr && is_whitespace(*parsed_tz_ptr))
++parsed_tz_ptr;
parsed_tz_length = end_ptr - parsed_tz_ptr;
break;
}
if (i == 6 && '.' != b) { i += 1; }
} else {
if (i < segments_len && (':' == b || ' ' == b)) {
if (!is_valid_digits(i, current_segment_digits)) { return ParseResult::INVALID; }
if (!is_valid_digits(i, current_segment_digits)) { return invalid_ret; }
segments[i] = current_segment_value;
current_segment_value = 0;
current_segment_digits = 0;
i += 1;
} else {
return ParseResult::INVALID;
return invalid_ret;
}
}
} else {
Expand All @@ -521,7 +526,7 @@ struct parse_timestamp_string_fn {
j += 1;
}

if (!is_valid_digits(i, current_segment_digits)) { return ParseResult::INVALID; }
if (!is_valid_digits(i, current_segment_digits)) { return invalid_ret; }
segments[i] = current_segment_value;

while (digits_milli < 6) {
Expand All @@ -535,15 +540,15 @@ struct parse_timestamp_string_fn {
// copy segments to equivalent kernel timestamp_components
// Note: In order to keep above code is equivalent to Spark implementation,
// did not use `timestamp_components` directly to save values.
ts_comp->year = segments[0];
ts_comp->month = static_cast<int8_t>(segments[1]);
ts_comp->day = static_cast<int8_t>(segments[2]);
ts_comp->hour = static_cast<int8_t>(segments[3]);
ts_comp->minute = static_cast<int8_t>(segments[4]);
ts_comp->second = static_cast<int8_t>(segments[5]);
ts_comp->microseconds = segments[6];

return ParseResult::OK;
ts_comp.year = segments[0];
ts_comp.month = static_cast<int8_t>(segments[1]);
ts_comp.day = static_cast<int8_t>(segments[2]);
ts_comp.hour = static_cast<int8_t>(segments[3]);
ts_comp.minute = static_cast<int8_t>(segments[4]);
ts_comp.second = static_cast<int8_t>(segments[5]);
ts_comp.microseconds = segments[6];

return thrust::make_tuple(ts_comp, parsed_tz_ptr, parsed_tz_length, ParseResult::OK);
}
};

Expand Down

0 comments on commit de74645

Please sign in to comment.