fix(tdengine): preserve query timezone when formatting timestamps

Closes #5926
This commit is contained in:
t8y2 committed 2026-08-11 12:22:42 +00:00
1 parent 11d9df0169
commit e04dad4622
3 files changed
+36 -2

No files matched your search

+18 -2
View File
@@ -3,6 +3,7 @@ use std::future::Future;
use std::time::{Duration, Instant};
use anyhow::{anyhow, bail, Context, Result};
use chrono_tz::Tz;
use futures::future::poll_fn;
use serde_json::Value;
use taos::{AsyncFetchable, AsyncQueryable, AsyncTBuilder, RawBlock, ResultSet, Taos, TaosBuilder};
@@ -40,6 +41,7 @@ struct TableCache {
struct QueryCursor {
result_set: ResultSet,
timezone: Option<Tz>,
columns: Vec<String>,
column_types: Vec<String>,
affected_rows: i64,
@@ -460,11 +462,13 @@ impl TdengineDriver {
bail!("SQL is required");
}
let result_set = cancellable(token, timeout_secs, self.require_connection()?.query(sql)).await?;
let timezone = result_set.timezone();
let columns = result_set.fields().iter().map(|field| field.name().to_string()).collect();
let column_types = result_set.fields().iter().map(|field| field.ty().name().to_string()).collect();
let affected_rows = i64::from(result_set.affected_rows());
Ok(QueryCursor {
result_set,
timezone,
columns,
column_types,
affected_rows,
@@ -690,7 +694,7 @@ impl QueryCursor {
loop {
if let Some(block) = &self.pending_block {
if self.pending_row_index < block.nrows() {
let timezone = block.timezone();
let timezone = preferred_timezone(self.timezone, block.timezone());
let row_index = self.pending_row_index;
self.pending_row_index += 1;
let row = (0..block.ncols())
@@ -749,6 +753,7 @@ async fn query_scalar_string(
timeout_secs: u64,
) -> Result<String> {
let mut result = cancellable(token, timeout_secs, connection.query(sql)).await?;
let timezone = result.timezone();
loop {
let block = cancellable(token, timeout_secs, poll_fn(|context| result.fetch_raw_block(context))).await?;
let Some(block) = block else {
@@ -758,13 +763,17 @@ async fn query_scalar_string(
continue;
}
let value = block.get_ref(0, 0).ok_or_else(|| anyhow!("TDengine query returned an empty value"))?;
return match borrowed_value_to_json(value, block.timezone()) {
return match borrowed_value_to_json(value, preferred_timezone(timezone, block.timezone())) {
Value::String(value) => Ok(value),
value => Ok(value.to_string()),
};
}
}
fn preferred_timezone(query_timezone: Option<Tz>, block_timezone: Option<Tz>) -> Option<Tz> {
query_timezone.or(block_timezone)
}
async fn cancellable<T, F>(token: &CancellationToken, timeout_secs: u64, future: F) -> Result<T>
where
F: Future<Output = taos::RawResult<T>>,
@@ -1052,6 +1061,13 @@ mod tests {
assert!(!text_matches("sensor_metrics", "xyz"));
}
#[test]
fn prefers_query_timezone_and_falls_back_to_block_timezone() {
assert_eq!(preferred_timezone(Some(chrono_tz::UTC), Some(chrono_tz::Asia::Shanghai)), Some(chrono_tz::UTC));
assert_eq!(preferred_timezone(None, Some(chrono_tz::Asia::Shanghai)), Some(chrono_tz::Asia::Shanghai));
assert_eq!(preferred_timezone(None, None), None);
}
#[test]
fn sorts_stables_before_their_children() {
let mut tables = vec![
+17
View File
@@ -102,6 +102,23 @@ mod tests {
),
Value::String("2024-01-01 00:00:00.1234".into())
);
assert_eq!(
borrowed_value_to_json(
BorrowedValue::Timestamp(Timestamp::Nanoseconds(1_704_067_200_123_456_789)),
Some(chrono_tz::UTC)
),
Value::String("2024-01-01 00:00:00.123456789".into())
);
}
#[test]
fn formats_timestamps_in_the_selected_timezone() {
let timestamp = BorrowedValue::Timestamp(Timestamp::Milliseconds(1_704_067_200_123));
assert_eq!(
borrowed_value_to_json(timestamp.clone(), Some(chrono_tz::Asia::Shanghai)),
Value::String("2024-01-01 08:00:00.123".into())
);
assert_eq!(borrowed_value_to_json(timestamp, None), Value::String("2024-01-01 00:00:00.123".into()));
}
#[test]