Add variable precision time and timestamp support #229
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -740,7 +740,14 @@ def execute(self, additional_http_headers=None) -> TrinoResult: | |
| if self.cancelled: | ||
| raise exceptions.TrinoUserError("Query has been cancelled", self.query_id) | ||
|
|
||
| if self._experimental_python_types: | ||
| http_headers = {constants.HEADER_CLIENT_CAPABILITIES: 'PARAMETRIC_DATETIME'} | ||
|
Member
There was a problem hiding this comment. Another naive question - how come this doesn't require any other changes in how the client parses results from the server?
Member
There was a problem hiding this comment. What's the current behavior, without setting this header?
Member
There was a problem hiding this comment. The server just starts sending back the precision in the type signatures and the values have additional precision to match.
Member
There was a problem hiding this comment. The client capabilities doesn't seem to be documented anywhere, but I found this comment in the server: https://github.com/trinodb/trino/blob/master/core/trino-main/src/main/java/io/trino/server/protocol/QueryResultRows.java#L355
Member
Author
There was a problem hiding this comment. All the other Trino clients I've seen (JDBC, ODBC, Go) are all passing
Member
Author
There was a problem hiding this comment. @nineinchnick as far as how come no other change is required on how the client parses the results from the server, it's because in my last PR I made sure that the code worked with either type of result.
Member
There was a problem hiding this comment.
|
||
| if additional_http_headers: | ||
| http_headers.update(additional_http_headers) | ||
| else: | ||
| http_headers = additional_http_headers | ||
|
|
||
| response = self._request.post(self._sql, http_headers) | ||
| status = self._request.process(response) | ||
| self._info_uri = status.info_uri | ||
| self.query_id = status.id | ||
|
|
@@ -907,66 +914,95 @@ def _double_map_func(self): | |
| else float(val) | ||
|
|
||
| def _timestamp_map_func(self, column, col_type): | ||
| datetime_default_size = len('YYYY-MM-DD HH:MM:SS.') | ||
| pattern = "%Y-%m-%d %H:%M:%S" | ||
| millis_length, millis_div = self._get_number_of_millis_digits(column) | ||
| if millis_length > 0: | ||
| pattern += ".%f" | ||
|
|
||
| timestamp_length = datetime_default_size | ||
| dt_tz_offset = datetime_default_size + millis_length | ||
| if 'with time zone' in col_type: | ||
| if millis_div > 1: | ||
| return lambda val: \ | ||
| [datetime.strptime(val[:timestamp_length] | ||
| + str(round(int(val[timestamp_length:dt_tz_offset]) / millis_div)) | ||
| + val[dt_tz_offset:], pattern + ' %z') | ||
| if tz.startswith('+') or tz.startswith('-') | ||
| else pytz.timezone(tz).localize(datetime.strptime(dt[:timestamp_length] | ||
| + str(round(int(val[timestamp_length:dt_tz_offset]) | ||
| / millis_div)) | ||
| + dt[dt_tz_offset:], pattern)) | ||
| for dt, tz in [val.rsplit(' ', 1)]][0] | ||
| else: | ||
| return lambda val: [datetime.strptime(val, pattern + ' %z') | ||
| if tz.startswith('+') or tz.startswith('-') | ||
| else pytz.timezone(tz).localize(datetime.strptime(dt, pattern)) | ||
| for dt, tz in [val.rsplit(' ', 1)]][0] | ||
|
|
||
| if millis_div > 1: | ||
| return lambda val: datetime.strptime(val[:timestamp_length] | ||
| + str(round(int(val[timestamp_length:dt_tz_offset]) / millis_div)) | ||
| + val[dt_tz_offset:], pattern) | ||
| else: | ||
| return lambda val: datetime.strptime(val, pattern) | ||
|
|
||
| def _time_map_func(self, column, col_type): | ||
| datetime_default_size = 9 # size of 'HH:MM:SS.' | ||
|
lpoulain marked this conversation as resolved.
|
||
| pattern = "%H:%M:%S" | ||
| millis_length, millis_div = self._get_number_of_millis_digits(column) | ||
| if millis_length > 0: | ||
| pattern += ".%f" | ||
|
|
||
| time_size = datetime_default_size + millis_length | ||
|
|
||
| if 'with time zone' in col_type: | ||
| if millis_div > 1: | ||
| return lambda val: self._get_time_with_timezone_round_ms(val, | ||
| datetime_default_size, | ||
| millis_div, | ||
| pattern) | ||
| else: | ||
| return lambda val: self._get_time_with_timezone(val, time_size, pattern) | ||
| else: | ||
| if millis_div > 1: | ||
| return lambda val: datetime.strptime(val[:datetime_default_size] | ||
| + str(round(int(val[datetime_default_size:]) / millis_div)), | ||
| pattern).time() | ||
| else: | ||
| return lambda val: datetime.strptime(val[:time_size], pattern).time() | ||
|
|
||
| def _get_time_with_timezone(self, value, time_size, pattern): | ||
| matches = re.match(r'^(?P<time>.*)(?P<sign>[\+\-])(?P<hours>\d{2}):(?P<minutes>\d{2})$', value) | ||
| assert matches is not None | ||
| assert len(matches.groups()) == 4 | ||
| if matches.group('sign') == '-': | ||
| tz = -timedelta(hours=int(matches.group('hours')), minutes=int(matches.group('minutes'))) | ||
| else: | ||
| tz = timedelta(hours=int(matches.group('hours')), minutes=int(matches.group('minutes'))) | ||
| return datetime.strptime(matches.group('time')[:time_size], pattern).time().replace(tzinfo=timezone(tz)) | ||
|
|
||
| def _get_time_with_timezone_round_ms(self, value, time_size, ms_div, pattern): | ||
|
Contributor
There was a problem hiding this comment. arguments sounds quite cryptic. Could we name them better? |
||
| matches = re.match(r'^(?P<time>.*)(?P<sign>[\+\-])(?P<hours>\d{2}):(?P<minutes>\d{2})$', value) | ||
| assert matches is not None | ||
| assert len(matches.groups()) == 4 | ||
| if matches.group('sign') == '-': | ||
| tz = -timedelta(hours=int(matches.group('hours')), minutes=int(matches.group('minutes'))) | ||
| else: | ||
| tz = timedelta(hours=int(matches.group('hours')), minutes=int(matches.group('minutes'))) | ||
| time_str = matches.group('time')[:time_size] | ||
| millis_str = str(round(int(matches.group('time')[time_size:]) / ms_div)) | ||
| return datetime.strptime(time_str + millis_str, pattern).time().replace(tzinfo=timezone(tz)) | ||
|
|
||
| def _get_number_of_millis_digits(self, column): | ||
|
lpoulain marked this conversation as resolved.
Outdated
|
||
| args = column['arguments'] | ||
| if len(args) == 0: | ||
| return 3, 1 | ||
| ms_size = column['arguments'][0]['value'] | ||
| if ms_size == 0: | ||
| return -1, 1 | ||
| ms_to_trim = ms_size - min(ms_size, 6) | ||
| return ms_size, 10 ** ms_to_trim | ||
|
|
||
|
|
||
| class RowMapper: | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.