This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 1836fb23cc Port tests in `describe.rs` to sqllogictest (#8242)
1836fb23cc is described below
commit 1836fb23cc21628f38b248ab993339e20bdb0d9d
Author: Asura7969 <[email protected]>
AuthorDate: Sat Nov 18 03:50:06 2023 +0800
Port tests in `describe.rs` to sqllogictest (#8242)
* Minor: Improve the document format of JoinHashMap
* Port tests in describe.rs to sqllogictest
---------
Co-authored-by: Andrew Lamb <[email protected]>
---
datafusion/core/tests/sql/describe.rs | 72 -------------------------
datafusion/core/tests/sql/mod.rs | 1 -
datafusion/sqllogictest/test_files/describe.slt | 24 +++++++++
3 files changed, 24 insertions(+), 73 deletions(-)
diff --git a/datafusion/core/tests/sql/describe.rs
b/datafusion/core/tests/sql/describe.rs
deleted file mode 100644
index cd8e79b2c9..0000000000
--- a/datafusion/core/tests/sql/describe.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-use datafusion::assert_batches_eq;
-use datafusion::prelude::*;
-use datafusion_common::test_util::parquet_test_data;
-
-#[tokio::test]
-async fn describe_plan() {
- let ctx = parquet_context().await;
-
- let query = "describe alltypes_tiny_pages";
- let results = ctx.sql(query).await.unwrap().collect().await.unwrap();
-
- let expected = vec![
- "+-----------------+-----------------------------+-------------+",
- "| column_name | data_type | is_nullable |",
- "+-----------------+-----------------------------+-------------+",
- "| id | Int32 | YES |",
- "| bool_col | Boolean | YES |",
- "| tinyint_col | Int8 | YES |",
- "| smallint_col | Int16 | YES |",
- "| int_col | Int32 | YES |",
- "| bigint_col | Int64 | YES |",
- "| float_col | Float32 | YES |",
- "| double_col | Float64 | YES |",
- "| date_string_col | Utf8 | YES |",
- "| string_col | Utf8 | YES |",
- "| timestamp_col | Timestamp(Nanosecond, None) | YES |",
- "| year | Int32 | YES |",
- "| month | Int32 | YES |",
- "+-----------------+-----------------------------+-------------+",
- ];
-
- assert_batches_eq!(expected, &results);
-
- // also ensure we plan Describe via SessionState
- let state = ctx.state();
- let plan = state.create_logical_plan(query).await.unwrap();
- let df = DataFrame::new(state, plan);
- let results = df.collect().await.unwrap();
-
- assert_batches_eq!(expected, &results);
-}
-
-/// Return a SessionContext with parquet file registered
-async fn parquet_context() -> SessionContext {
- let ctx = SessionContext::new();
- let testdata = parquet_test_data();
- ctx.register_parquet(
- "alltypes_tiny_pages",
- &format!("{testdata}/alltypes_tiny_pages.parquet"),
- ParquetReadOptions::default(),
- )
- .await
- .unwrap();
- ctx
-}
diff --git a/datafusion/core/tests/sql/mod.rs b/datafusion/core/tests/sql/mod.rs
index b04ba573af..6d783a5031 100644
--- a/datafusion/core/tests/sql/mod.rs
+++ b/datafusion/core/tests/sql/mod.rs
@@ -75,7 +75,6 @@ macro_rules! test_expression {
pub mod aggregates;
pub mod create_drop;
pub mod csv_files;
-pub mod describe;
pub mod explain_analyze;
pub mod expr;
pub mod group_by;
diff --git a/datafusion/sqllogictest/test_files/describe.slt
b/datafusion/sqllogictest/test_files/describe.slt
index 007aec443c..f94a2e4538 100644
--- a/datafusion/sqllogictest/test_files/describe.slt
+++ b/datafusion/sqllogictest/test_files/describe.slt
@@ -62,3 +62,27 @@ DROP TABLE aggregate_simple;
statement error Error during planning: table
'datafusion.public.../core/tests/data/aggregate_simple.csv' not found
DESCRIBE '../core/tests/data/aggregate_simple.csv';
+
+##########
+# Describe command
+##########
+
+statement ok
+CREATE EXTERNAL TABLE alltypes_tiny_pages STORED AS PARQUET LOCATION
'../../parquet-testing/data/alltypes_tiny_pages.parquet';
+
+query TTT
+describe alltypes_tiny_pages;
+----
+id Int32 YES
+bool_col Boolean YES
+tinyint_col Int8 YES
+smallint_col Int16 YES
+int_col Int32 YES
+bigint_col Int64 YES
+float_col Float32 YES
+double_col Float64 YES
+date_string_col Utf8 YES
+string_col Utf8 YES
+timestamp_col Timestamp(Nanosecond, None) YES
+year Int32 YES
+month Int32 YES
