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: include chrono-tz in flight sql cli #6650

Merged
merged 1 commit into from
Oct 30, 2024
Merged

fix: include chrono-tz in flight sql cli #6650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 arrow-flight/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ flight-sql-experimental = ["arrow-arith", "arrow-data", "arrow-ord", "arrow-row"
tls = ["tonic/tls"]

# Enable CLI tools
cli = ["anyhow", "arrow-cast/prettyprint", "clap", "tracing-log", "tracing-subscriber", "tonic/tls-webpki-roots"]
cli = ["anyhow", "arrow-array/chrono-tz", "arrow-cast/prettyprint", "clap", "tracing-log", "tracing-subscriber", "tonic/tls-webpki-roots"]

[dev-dependencies]
arrow-cast = { workspace = true, features = ["prettyprint"] }
Expand Down
64 changes: 41 additions & 23 deletions arrow-flight/tests/flight_sql_client_cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mod common;
use std::{pin::Pin, sync::Arc};

use crate::common::fixture::TestFixture;
use arrow_array::{ArrayRef, Int64Array, RecordBatch, StringArray};
use arrow_array::{ArrayRef, Int64Array, RecordBatch, StringArray, TimestampNanosecondArray};
use arrow_flight::{
decode::FlightRecordBatchStream,
encode::FlightDataEncoderBuilder,
Expand All @@ -37,7 +37,7 @@ use arrow_flight::{
HandshakeResponse, IpcMessage, SchemaAsIpc, Ticket,
};
use arrow_ipc::writer::IpcWriteOptions;
use arrow_schema::{ArrowError, DataType, Field, Schema};
use arrow_schema::{ArrowError, DataType, Field, Schema, TimeUnit};
use assert_cmd::Command;
use bytes::Bytes;
use futures::{Stream, TryStreamExt};
Expand Down Expand Up @@ -77,13 +77,13 @@ async fn test_simple() {

assert_eq!(
std::str::from_utf8(&stdout).unwrap().trim(),
"+--------------+-----------+\
\n| field_string | field_int |\
\n+--------------+-----------+\
\n| Hello | 42 |\
\n| lovely | |\
\n| FlightSQL! | 1337 |\
\n+--------------+-----------+",
"+--------------+-----------+---------------------------+-----------------------------+\
\n| field_string | field_int | field_timestamp_nano_notz | field_timestamp_nano_berlin |\
\n+--------------+-----------+---------------------------+-----------------------------+\
\n| Hello | 42 | | |\
\n| lovely | | 1970-01-01T00:00:00 | 1970-01-01T01:00:00+01:00 |\
\n| FlightSQL! | 1337 | 2024-10-30T11:36:57 | 2024-10-30T12:36:57+01:00 |\
\n+--------------+-----------+---------------------------+-----------------------------+",
);
}

Expand Down Expand Up @@ -321,13 +321,13 @@ async fn test_do_put_prepared_statement(test_server: FlightSqlServiceImpl) {

assert_eq!(
std::str::from_utf8(&stdout).unwrap().trim(),
"+--------------+-----------+\
\n| field_string | field_int |\
\n+--------------+-----------+\
\n| Hello | 42 |\
\n| lovely | |\
\n| FlightSQL! | 1337 |\
\n+--------------+-----------+",
"+--------------+-----------+---------------------------+-----------------------------+\
\n| field_string | field_int | field_timestamp_nano_notz | field_timestamp_nano_berlin |\
\n+--------------+-----------+---------------------------+-----------------------------+\
\n| Hello | 42 | | |\
\n| lovely | | 1970-01-01T00:00:00 | 1970-01-01T01:00:00+01:00 |\
\n| FlightSQL! | 1337 | 2024-10-30T11:36:57 | 2024-10-30T12:36:57+01:00 |\
\n+--------------+-----------+---------------------------+-----------------------------+",
);
}

Expand Down Expand Up @@ -371,28 +371,46 @@ impl FlightSqlServiceImpl {
FlightServiceServer::new(self.clone())
}

fn fake_result() -> Result<RecordBatch, ArrowError> {
let schema = Schema::new(vec![
fn schema() -> Schema {
Schema::new(vec![
Field::new("field_string", DataType::Utf8, false),
Field::new("field_int", DataType::Int64, true),
]);
Field::new(
"field_timestamp_nano_notz",
DataType::Timestamp(TimeUnit::Nanosecond, None),
true,
),
Field::new(
"field_timestamp_nano_berlin",
DataType::Timestamp(TimeUnit::Nanosecond, Some(Arc::from("Europe/Berlin"))),
true,
),
])
}

fn fake_result() -> Result<RecordBatch, ArrowError> {
let schema = Self::schema();

let string_array = StringArray::from(vec!["Hello", "lovely", "FlightSQL!"]);
let int_array = Int64Array::from(vec![Some(42), None, Some(1337)]);
let timestamp_array =
TimestampNanosecondArray::from(vec![None, Some(0), Some(1730288217000000000)]);
let timestamp_ts_array = timestamp_array
.clone()
.with_timezone(Arc::from("Europe/Berlin"));

let cols = vec![
Arc::new(string_array) as ArrayRef,
Arc::new(int_array) as ArrayRef,
Arc::new(timestamp_array) as ArrayRef,
Arc::new(timestamp_ts_array) as ArrayRef,
];
RecordBatch::try_new(Arc::new(schema), cols)
}

fn create_fake_prepared_stmt() -> Result<ActionCreatePreparedStatementResult, ArrowError> {
let handle = PREPARED_STATEMENT_HANDLE.to_string();
let schema = Schema::new(vec![
Field::new("field_string", DataType::Utf8, false),
Field::new("field_int", DataType::Int64, true),
]);
let schema = Self::schema();

let parameter_schema = Schema::new(vec![
Field::new("$1", DataType::Utf8, false),
Expand Down
Loading