diff --git a/.github/workflows/dev_pr/labeler.yml b/.github/workflows/dev_pr/labeler.yml index bcfb1b479170..e84cf5efb1d8 100644 --- a/.github/workflows/dev_pr/labeler.yml +++ b/.github/workflows/dev_pr/labeler.yml @@ -47,4 +47,4 @@ substrait: - datafusion/substrait/**/* sqllogictest: - - datafusion/core/tests/sqllogictests/**/* + - datafusion/sqllogictest/**/* diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c84dab964e4e..f05c36c79205 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -229,17 +229,17 @@ jobs: rust-version: stable - name: Generate benchmark data and expected query results run: | - mkdir -p datafusion/core/tests/sqllogictests/test_files/tpch/data + mkdir -p datafusion/sqllogictest/test_files/tpch/data git clone https://github.com/databricks/tpch-dbgen.git cd tpch-dbgen make ./dbgen -f -s 0.1 - mv *.tbl ../datafusion/core/tests/sqllogictests/test_files/tpch/data + mv *.tbl ../datafusion/sqllogictest/test_files/tpch/data - name: Verify that benchmark queries return expected results run: | - export TPCH_DATA=`realpath datafusion/core/tests/sqllogictests/test_files/tpch/data` + export TPCH_DATA=`realpath datafusion/sqllogictest/test_files/tpch/data` cargo test serde_q --profile release-nonlto --features=ci -- --test-threads=1 - INCLUDE_TPCH=true cargo test -p datafusion --test sqllogictests + INCLUDE_TPCH=true cargo test --test sqllogictests - name: Verify Working Directory Clean run: git diff --exit-code @@ -270,7 +270,7 @@ jobs: rustup toolchain install stable rustup default stable - name: Run sqllogictest - run: PG_COMPAT=true PG_URI="postgresql://postgres:postgres@localhost:$POSTGRES_PORT/db_test" cargo test -p datafusion --test sqllogictests + run: PG_COMPAT=true PG_URI="postgresql://postgres:postgres@localhost:$POSTGRES_PORT/db_test" cargo test --features=postgres --test sqllogictests env: POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }} diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml index bd1ed2e815f8..be72fdaf0b35 100644 --- a/datafusion/core/Cargo.toml +++ b/datafusion/core/Cargo.toml @@ -102,7 +102,6 @@ bigdecimal = "0.4.1" criterion = { version = "0.5", features = ["async_tokio"] } csv = "1.1.6" ctor = "0.2.0" -datafusion-sqllogictest = { path = "../sqllogictest", version = "29.0.0", features = ["postgres"] } doc-comment = "0.3" env_logger = "0.10" half = "2.2.1" @@ -111,7 +110,6 @@ postgres-types = { version = "0.2.4", features = ["derive", "with-chrono-0_4"] } regex = "1.5.4" rstest = "0.18.0" rust_decimal = { version = "1.27.0", features = ["tokio-pg"] } -sqllogictest = "0.15.0" test-utils = { path = "../../test-utils" } thiserror = "1.0.37" tokio-postgres = "0.7.7" @@ -161,8 +159,3 @@ name = "sql_query_with_io" [[bench]] harness = false name = "sort" - -[[test]] -harness = false -name = "sqllogictests" -path = "tests/sqllogictests/src/main.rs" diff --git a/datafusion/core/tests/sqllogictests/.gitignore b/datafusion/core/tests/sqllogictests/.gitignore deleted file mode 100644 index 8e5bbf044f1e..000000000000 --- a/datafusion/core/tests/sqllogictests/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.py \ No newline at end of file diff --git a/datafusion/core/tests/sqllogictests/MOVED.md b/datafusion/core/tests/sqllogictests/MOVED.md new file mode 100644 index 000000000000..dd70dab9d11f --- /dev/null +++ b/datafusion/core/tests/sqllogictests/MOVED.md @@ -0,0 +1,20 @@ + + +The SQL Logic Test code has moved to `datafusion/sqllogictest` diff --git a/datafusion/sqllogictest/.gitignore b/datafusion/sqllogictest/.gitignore new file mode 100644 index 000000000000..e90171b0acca --- /dev/null +++ b/datafusion/sqllogictest/.gitignore @@ -0,0 +1,2 @@ +*.py +test_files/tpch/data \ No newline at end of file diff --git a/datafusion/sqllogictest/Cargo.toml b/datafusion/sqllogictest/Cargo.toml index 0d80ed6c2246..fcfa81e7c392 100644 --- a/datafusion/sqllogictest/Cargo.toml +++ b/datafusion/sqllogictest/Cargo.toml @@ -44,14 +44,25 @@ rust_decimal = {version = "1.27.0"} log = "^0.4" sqllogictest = "0.15.0" sqlparser.workspace = true +tempfile = "3" thiserror = "1.0.44" tokio = {version = "1.0"} bytes = {version = "1.4.0", optional = true} -futures = {version = "0.3.28", optional = true} +futures = {version = "0.3.28"} chrono = {version = "0.4.26", optional = true} tokio-postgres = {version = "0.7.7", optional = true} postgres-types = {version = "0.2.4", optional = true} postgres-protocol = {version = "0.6.4", optional = true} [features] -postgres = ["bytes", "futures", "chrono", "tokio-postgres", "postgres-types", "postgres-protocol"] +postgres = ["bytes", "chrono", "tokio-postgres", "postgres-types", "postgres-protocol"] + +[dev-dependencies] +env_logger = "0.10" +num_cpus = "1.13.0" + + +[[test]] +harness = false +name = "sqllogictests" +path = "bin/sqllogictests.rs" diff --git a/datafusion/core/tests/sqllogictests/README.md b/datafusion/sqllogictest/README.md similarity index 90% rename from datafusion/core/tests/sqllogictests/README.md rename to datafusion/sqllogictest/README.md index b6a83e4c6795..1f69bb864e71 100644 --- a/datafusion/core/tests/sqllogictests/README.md +++ b/datafusion/sqllogictest/README.md @@ -33,27 +33,27 @@ in [`test_files`](test_files). ```shell # Run all tests -cargo test -p datafusion --test sqllogictests +cargo test --test sqllogictests ``` ```shell # Run all tests, with debug logging enabled -RUST_LOG=debug cargo test -p datafusion --test sqllogictests +RUST_LOG=debug cargo test --test sqllogictests ``` ```shell # Run only the tests in `information_schema.slt` -cargo test -p datafusion --test sqllogictests -- information_schema +cargo test --test sqllogictests -- information_schema ``` ```shell # Automatically update ddl.slt with expected output -cargo test -p datafusion --test sqllogictests -- ddl --complete +cargo test --test sqllogictests -- ddl --complete ``` ```shell # Run ddl.slt, printing debug logging to stdout -RUST_LOG=debug cargo test -p datafusion --test sqllogictests -- ddl +RUST_LOG=debug cargo test --test sqllogictests -- ddl ``` #### Cookbook: Adding Tests @@ -76,7 +76,7 @@ SELECT * from foo; Running the following command will update `my_awesome_test.slt` with the expected output: ```shell -cargo test -p datafusion --test sqllogictests -- my_awesome_test --complete +cargo test --test sqllogictests -- my_awesome_test --complete ``` 3. Verify the content @@ -105,14 +105,14 @@ file to the output produced by that run. For example, to run all tests suites in validation mode ```shell -cargo test -p datafusion --test sqllogictests +cargo test --test sqllogictests ``` sqllogictests also supports `cargo test` style substring matches on file names to restrict which tests to run ```shell # information_schema.slt matches due to substring matching `information` -cargo test -p datafusion --test sqllogictests -- information +cargo test --test sqllogictests -- information ``` #### Running tests: Postgres compatibility @@ -123,7 +123,7 @@ with Postgres by running the same script files both with DataFusion and with Pos In order to run the sqllogictests running against a previously running Postgres instance, do: ```shell -PG_COMPAT=true PG_URI="postgresql://postgres@127.0.0.1/postgres" cargo test -p datafusion --test sqllogictests +PG_COMPAT=true PG_URI="postgresql://postgres@127.0.0.1/postgres" cargo test --features=postgres --test sqllogictests ``` The environemnt variables: @@ -153,15 +153,16 @@ command to generate tpch data, assuming you are in the repository root: ```shell +mkdir -p datafusion/sqllogictest/test_files/tpch/data docker run -it \ - -v "$(realpath datafusion/core/tests/sqllogictests/test_files/tpch/data)":/data \ + -v "$(realpath datafusion/sqllogictest/test_files/tpch/data)":/data \ ghcr.io/databloom-ai/tpch-docker:main -vf -s 0.1 ``` Then you need to add `INCLUDE_TPCH=true` to run tpch tests: ```shell -INCLUDE_TPCH=true cargo test -p datafusion --test sqllogictests +INCLUDE_TPCH=true cargo test --test sqllogictests ``` #### Updating tests: Completion Mode @@ -173,7 +174,7 @@ You can update the tests / generate expected output by passing the `--complete` ```shell # Update ddl.slt with output from running -cargo test -p datafusion --test sqllogictests -- ddl --complete +cargo test --test sqllogictests -- ddl --complete ``` #### sqllogictests diff --git a/datafusion/core/tests/sqllogictests/src/main.rs b/datafusion/sqllogictest/bin/sqllogictests.rs similarity index 74% rename from datafusion/core/tests/sqllogictests/src/main.rs rename to datafusion/sqllogictest/bin/sqllogictests.rs index 7d23971fbfca..f28fdbe23c13 100644 --- a/datafusion/core/tests/sqllogictests/src/main.rs +++ b/datafusion/sqllogictest/bin/sqllogictests.rs @@ -20,18 +20,14 @@ use std::path::{Path, PathBuf}; #[cfg(target_family = "windows")] use std::thread; -use datafusion_sqllogictest::{DataFusion, Postgres}; +use datafusion_sqllogictest::{DataFusion, TestContext}; use futures::stream::StreamExt; use log::info; use sqllogictest::strict_column_validator; -use tempfile::TempDir; -use datafusion::prelude::{SessionConfig, SessionContext}; use datafusion_common::{DataFusionError, Result}; -mod setup; - -const TEST_DIRECTORY: &str = "tests/sqllogictests/test_files/"; +const TEST_DIRECTORY: &str = "test_files/"; const PG_COMPAT_FILE_PREFIX: &str = "pg_compat_"; #[cfg(target_family = "windows")] @@ -121,7 +117,7 @@ async fn run_test_file(test_file: TestFile) -> Result<()> { relative_path, } = test_file; info!("Running with DataFusion runner: {}", path.display()); - let Some(test_ctx) = context_for_test_file(&relative_path).await else { + let Some(test_ctx) = TestContext::try_new_for_test_file(&relative_path).await else { info!("Skipping: {}", path.display()); return Ok(()); }; @@ -138,7 +134,9 @@ async fn run_test_file(test_file: TestFile) -> Result<()> { .map_err(|e| DataFusionError::External(Box::new(e))) } +#[cfg(feature = "postgres")] async fn run_test_file_with_postgres(test_file: TestFile) -> Result<()> { + use datafusion_sqllogictest::Postgres; let TestFile { path, relative_path, @@ -154,6 +152,12 @@ async fn run_test_file_with_postgres(test_file: TestFile) -> Result<()> { Ok(()) } +#[cfg(not(feature = "postgres"))] +async fn run_test_file_with_postgres(_test_file: TestFile) -> Result<()> { + use datafusion_common::plan_err; + plan_err!("Can not run with postgres as postgres feature is not enabled") +} + async fn run_complete_file(test_file: TestFile) -> Result<()> { let TestFile { path, @@ -163,7 +167,7 @@ async fn run_complete_file(test_file: TestFile) -> Result<()> { info!("Using complete mode to complete: {}", path.display()); - let Some(test_ctx) = context_for_test_file(&relative_path).await else { + let Some(test_ctx) = TestContext::try_new_for_test_file(&relative_path).await else { info!("Skipping: {}", path.display()); return Ok(()); }; @@ -250,96 +254,6 @@ fn read_dir_recursive>(path: P) -> Box Option { - let config = SessionConfig::new() - // hardcode target partitions so plans are deterministic - .with_target_partitions(4); - - let test_ctx = TestContext::new(SessionContext::with_config(config)); - - let file_name = relative_path.file_name().unwrap().to_str().unwrap(); - match file_name { - "scalar.slt" => { - info!("Registering scalar tables"); - setup::register_scalar_tables(test_ctx.session_ctx()).await; - } - "information_schema_table_types.slt" => { - info!("Registering local temporary table"); - setup::register_temp_table(test_ctx.session_ctx()).await; - } - "information_schema_columns.slt" => { - info!("Registering table with many types"); - setup::register_table_with_many_types(test_ctx.session_ctx()).await; - } - "avro.slt" => { - #[cfg(feature = "avro")] - { - let mut test_ctx = test_ctx; - info!("Registering avro tables"); - setup::register_avro_tables(&mut test_ctx).await; - return Some(test_ctx); - } - #[cfg(not(feature = "avro"))] - { - info!("Skipping {file_name} because avro feature is not enabled"); - return None; - } - } - "joins.slt" => { - info!("Registering partition table tables"); - - let mut test_ctx = test_ctx; - setup::register_partition_table(&mut test_ctx).await; - return Some(test_ctx); - } - _ => { - info!("Using default SessionContext"); - } - }; - Some(test_ctx) -} - -/// Context for running tests -pub struct TestContext { - /// Context for running queries - ctx: SessionContext, - /// Temporary directory created and cleared at the end of the test - test_dir: Option, -} - -impl TestContext { - pub fn new(ctx: SessionContext) -> Self { - Self { - ctx, - test_dir: None, - } - } - - /// Enables the test directory feature. If not enabled, - /// calling `testdir_path` will result in a panic. - pub fn enable_testdir(&mut self) { - if self.test_dir.is_none() { - self.test_dir = Some(TempDir::new().expect("failed to create testdir")); - } - } - - /// Returns the path to the test directory. Panics if the test - /// directory feature is not enabled via `enable_testdir`. - pub fn testdir_path(&self) -> &Path { - self.test_dir.as_ref().expect("testdir not enabled").path() - } - - /// Returns a reference to the internal SessionContext - fn session_ctx(&self) -> &SessionContext { - &self.ctx - } -} - /// Parsed command line options struct Options { // regex like diff --git a/datafusion/sqllogictest/src/engines/conversion.rs b/datafusion/sqllogictest/src/engines/conversion.rs index a44783b098c9..5be287ac95f8 100644 --- a/datafusion/sqllogictest/src/engines/conversion.rs +++ b/datafusion/sqllogictest/src/engines/conversion.rs @@ -82,6 +82,7 @@ pub(crate) fn i128_to_str(value: i128, precision: &u8, scale: &i8) -> String { ) } +#[cfg(feature = "postgres")] pub(crate) fn decimal_to_str(value: Decimal) -> String { big_decimal_to_str(BigDecimal::from_str(&value.to_string()).unwrap()) } diff --git a/datafusion/sqllogictest/src/lib.rs b/datafusion/sqllogictest/src/lib.rs index b739d75777de..1bcfd71af0fd 100644 --- a/datafusion/sqllogictest/src/lib.rs +++ b/datafusion/sqllogictest/src/lib.rs @@ -15,9 +15,14 @@ // specific language governing permissions and limitations // under the License. +//! DataFusion sqllogictest driver + mod engines; pub use engines::DataFusion; #[cfg(feature = "postgres")] pub use engines::Postgres; + +mod test_context; +pub use test_context::TestContext; diff --git a/datafusion/core/tests/sqllogictests/src/setup.rs b/datafusion/sqllogictest/src/test_context.rs similarity index 66% rename from datafusion/core/tests/sqllogictests/src/setup.rs rename to datafusion/sqllogictest/src/test_context.rs index 32569c7575ce..9af2de1af49e 100644 --- a/datafusion/core/tests/sqllogictests/src/setup.rs +++ b/datafusion/sqllogictest/src/test_context.rs @@ -15,17 +15,18 @@ // specific language governing permissions and limitations // under the License. -use arrow_schema::TimeUnit; use async_trait::async_trait; use datafusion::execution::context::SessionState; +use datafusion::logical_expr::Expr; use datafusion::physical_plan::ExecutionPlan; +use datafusion::prelude::SessionConfig; use datafusion::{ arrow::{ array::{ BinaryArray, Float64Array, Int32Array, LargeBinaryArray, LargeStringArray, StringArray, TimestampNanosecondArray, }, - datatypes::{DataType, Field, Schema, SchemaRef}, + datatypes::{DataType, Field, Schema, SchemaRef, TimeUnit}, record_batch::RecordBatch, }, catalog::{schema::MemorySchemaProvider, CatalogProvider, MemoryCatalogProvider}, @@ -33,12 +34,102 @@ use datafusion::{ prelude::{CsvReadOptions, SessionContext}, }; use datafusion_common::DataFusionError; -use datafusion_expr::Expr; +use log::info; use std::fs::File; use std::io::Write; +use std::path::Path; use std::sync::Arc; +use tempfile::TempDir; -use crate::TestContext; +/// Context for running tests +pub struct TestContext { + /// Context for running queries + ctx: SessionContext, + /// Temporary directory created and cleared at the end of the test + test_dir: Option, +} + +impl TestContext { + pub fn new(ctx: SessionContext) -> Self { + Self { + ctx, + test_dir: None, + } + } + + /// Create a SessionContext, configured for the specific test, if + /// possible. + /// + /// If `None` is returned (e.g. because some needed feature is not + /// enabled), the file should be skipped + pub async fn try_new_for_test_file(relative_path: &Path) -> Option { + let config = SessionConfig::new() + // hardcode target partitions so plans are deterministic + .with_target_partitions(4); + + let test_ctx = TestContext::new(SessionContext::with_config(config)); + + let file_name = relative_path.file_name().unwrap().to_str().unwrap(); + match file_name { + "scalar.slt" => { + info!("Registering scalar tables"); + register_scalar_tables(test_ctx.session_ctx()).await; + } + "information_schema_table_types.slt" => { + info!("Registering local temporary table"); + register_temp_table(test_ctx.session_ctx()).await; + } + "information_schema_columns.slt" => { + info!("Registering table with many types"); + register_table_with_many_types(test_ctx.session_ctx()).await; + } + "avro.slt" => { + #[cfg(feature = "avro")] + { + let mut test_ctx = test_ctx; + info!("Registering avro tables"); + register_avro_tables(&mut test_ctx).await; + return Some(test_ctx); + } + #[cfg(not(feature = "avro"))] + { + info!("Skipping {file_name} because avro feature is not enabled"); + return None; + } + } + "joins.slt" => { + info!("Registering partition table tables"); + + let mut test_ctx = test_ctx; + register_partition_table(&mut test_ctx).await; + return Some(test_ctx); + } + _ => { + info!("Using default SessionContext"); + } + }; + Some(test_ctx) + } + + /// Enables the test directory feature. If not enabled, + /// calling `testdir_path` will result in a panic. + pub fn enable_testdir(&mut self) { + if self.test_dir.is_none() { + self.test_dir = Some(TempDir::new().expect("failed to create testdir")); + } + } + + /// Returns the path to the test directory. Panics if the test + /// directory feature is not enabled via `enable_testdir`. + pub fn testdir_path(&self) -> &Path { + self.test_dir.as_ref().expect("testdir not enabled").path() + } + + /// Returns a reference to the internal SessionContext + pub fn session_ctx(&self) -> &SessionContext { + &self.ctx + } +} #[cfg(feature = "avro")] pub async fn register_avro_tables(ctx: &mut crate::TestContext) { diff --git a/datafusion/core/tests/sqllogictests/test_files/aggregate.slt b/datafusion/sqllogictest/test_files/aggregate.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/aggregate.slt rename to datafusion/sqllogictest/test_files/aggregate.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/array.slt b/datafusion/sqllogictest/test_files/array.slt similarity index 99% rename from datafusion/core/tests/sqllogictests/test_files/array.slt rename to datafusion/sqllogictest/test_files/array.slt index 569f14f99a4e..995ac901ff6b 100644 --- a/datafusion/core/tests/sqllogictests/test_files/array.slt +++ b/datafusion/sqllogictest/test_files/array.slt @@ -2289,7 +2289,7 @@ select make_array(1.0, '2', null) ### FixedSizeListArray statement ok -CREATE EXTERNAL TABLE fixed_size_list_array STORED AS PARQUET LOCATION 'tests/data/fixed_size_list_array.parquet'; +CREATE EXTERNAL TABLE fixed_size_list_array STORED AS PARQUET LOCATION '../core/tests/data/fixed_size_list_array.parquet'; query T select arrow_typeof(f0) from fixed_size_list_array; diff --git a/datafusion/core/tests/sqllogictests/test_files/arrow_typeof.slt b/datafusion/sqllogictest/test_files/arrow_typeof.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/arrow_typeof.slt rename to datafusion/sqllogictest/test_files/arrow_typeof.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/avro.slt b/datafusion/sqllogictest/test_files/avro.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/avro.slt rename to datafusion/sqllogictest/test_files/avro.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/binary.slt b/datafusion/sqllogictest/test_files/binary.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/binary.slt rename to datafusion/sqllogictest/test_files/binary.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/cast.slt b/datafusion/sqllogictest/test_files/cast.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/cast.slt rename to datafusion/sqllogictest/test_files/cast.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/clickbench.slt b/datafusion/sqllogictest/test_files/clickbench.slt similarity index 99% rename from datafusion/core/tests/sqllogictests/test_files/clickbench.slt rename to datafusion/sqllogictest/test_files/clickbench.slt index bf785545d849..f6afa525adcc 100644 --- a/datafusion/core/tests/sqllogictests/test_files/clickbench.slt +++ b/datafusion/sqllogictest/test_files/clickbench.slt @@ -28,7 +28,7 @@ statement ok CREATE EXTERNAL TABLE hits STORED AS PARQUET -LOCATION 'tests/data/clickbench_hits_10.parquet'; +LOCATION '../core/tests/data/clickbench_hits_10.parquet'; # queries.sql came from diff --git a/datafusion/core/tests/sqllogictests/test_files/copy.slt b/datafusion/sqllogictest/test_files/copy.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/copy.slt rename to datafusion/sqllogictest/test_files/copy.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/create_external_table.slt b/datafusion/sqllogictest/test_files/create_external_table.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/create_external_table.slt rename to datafusion/sqllogictest/test_files/create_external_table.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/cte.slt b/datafusion/sqllogictest/test_files/cte.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/cte.slt rename to datafusion/sqllogictest/test_files/cte.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/dates.slt b/datafusion/sqllogictest/test_files/dates.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/dates.slt rename to datafusion/sqllogictest/test_files/dates.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/ddl.slt b/datafusion/sqllogictest/test_files/ddl.slt similarity index 96% rename from datafusion/core/tests/sqllogictests/test_files/ddl.slt rename to datafusion/sqllogictest/test_files/ddl.slt index 954bc4d991bc..b323d1409f20 100644 --- a/datafusion/core/tests/sqllogictests/test_files/ddl.slt +++ b/datafusion/sqllogictest/test_files/ddl.slt @@ -256,7 +256,7 @@ DROP VIEW non_existent_view ########## statement ok -CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION 'tests/data/aggregate_simple.csv'; +CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION '../core/tests/data/aggregate_simple.csv'; # create_table_as statement ok @@ -312,7 +312,7 @@ DROP TABLE aggregate_simple # Arrow format statement ok -CREATE external table arrow_simple STORED as ARROW LOCATION 'tests/data/example.arrow'; +CREATE external table arrow_simple STORED as ARROW LOCATION '../core/tests/data/example.arrow'; query ITB rowsort SELECT * FROM arrow_simple order by f1 LIMIT 1 @@ -470,7 +470,7 @@ statement ok CREATE EXTERNAL TABLE csv_with_timestamps ( name VARCHAR, ts TIMESTAMP -) STORED AS CSV LOCATION 'tests/data/timestamps.csv'; +) STORED AS CSV LOCATION '../core/tests/data/timestamps.csv'; query TP SELECT * from csv_with_timestamps @@ -496,7 +496,7 @@ CREATE EXTERNAL TABLE csv_with_timestamps ( ) STORED AS CSV PARTITIONED BY (c_date) -LOCATION 'tests/data/partitioned_table'; +LOCATION '../core/tests/data/partitioned_table'; query TPD SELECT * from csv_with_timestamps where c_date='2018-11-13' @@ -535,7 +535,7 @@ DROP VIEW y; # create_pipe_delimited_csv_table() statement ok -CREATE EXTERNAL TABLE aggregate_simple STORED AS CSV WITH HEADER ROW DELIMITER '|' LOCATION 'tests/data/aggregate_simple_pipe.csv'; +CREATE EXTERNAL TABLE aggregate_simple STORED AS CSV WITH HEADER ROW DELIMITER '|' LOCATION '../core/tests/data/aggregate_simple_pipe.csv'; query RRB @@ -581,14 +581,14 @@ statement ok CREATE TABLE IF NOT EXISTS table_without_values(field1 BIGINT, field2 BIGINT); statement ok -CREATE EXTERNAL TABLE aggregate_simple STORED AS CSV WITH HEADER ROW LOCATION 'tests/data/aggregate_simple.csv' +CREATE EXTERNAL TABLE aggregate_simple STORED AS CSV WITH HEADER ROW LOCATION '../core/tests/data/aggregate_simple.csv' # Should not recreate the same EXTERNAL table statement error Execution error: Table 'aggregate_simple' already exists -CREATE EXTERNAL TABLE aggregate_simple STORED AS CSV WITH HEADER ROW LOCATION 'tests/data/aggregate_simple.csv' +CREATE EXTERNAL TABLE aggregate_simple STORED AS CSV WITH HEADER ROW LOCATION '../core/tests/data/aggregate_simple.csv' statement ok -CREATE EXTERNAL TABLE IF NOT EXISTS aggregate_simple STORED AS CSV WITH HEADER ROW LOCATION 'tests/data/aggregate_simple.csv' +CREATE EXTERNAL TABLE IF NOT EXISTS aggregate_simple STORED AS CSV WITH HEADER ROW LOCATION '../core/tests/data/aggregate_simple.csv' # create bad custom table statement error DataFusion error: Execution error: Unable to find factory for DELTATABLE @@ -717,7 +717,7 @@ drop table foo; # create csv table with empty csv file statement ok -CREATE EXTERNAL TABLE empty STORED AS CSV WITH HEADER ROW LOCATION 'tests/data/empty.csv'; +CREATE EXTERNAL TABLE empty STORED AS CSV WITH HEADER ROW LOCATION '../core/tests/data/empty.csv'; query TTI select column_name, data_type, ordinal_position from information_schema.columns where table_name='empty';; @@ -770,7 +770,7 @@ statement ok CREATE UNBOUNDED external table t(c1 integer, c2 integer, c3 integer) STORED as CSV WITH HEADER ROW -LOCATION 'tests/data/empty.csv'; +LOCATION '../core/tests/data/empty.csv'; # should see infinite_source=true in the explain query TT @@ -788,7 +788,7 @@ statement ok CREATE external table t(c1 integer, c2 integer, c3 integer) STORED as CSV WITH HEADER ROW -LOCATION 'tests/data/empty.csv'; +LOCATION '../core/tests/data/empty.csv'; # expect to see no infinite_source in the explain query TT diff --git a/datafusion/core/tests/sqllogictests/test_files/decimal.slt b/datafusion/sqllogictest/test_files/decimal.slt similarity index 99% rename from datafusion/core/tests/sqllogictests/test_files/decimal.slt rename to datafusion/sqllogictest/test_files/decimal.slt index ec2bb3edaba6..da448f0857f1 100644 --- a/datafusion/core/tests/sqllogictests/test_files/decimal.slt +++ b/datafusion/sqllogictest/test_files/decimal.slt @@ -45,7 +45,7 @@ c5 DECIMAL(12,7) NOT NULL ) STORED AS CSV WITH HEADER ROW -LOCATION 'tests/data/decimal_data.csv'; +LOCATION '../core/tests/data/decimal_data.csv'; query TT diff --git a/datafusion/core/tests/sqllogictests/test_files/describe.slt b/datafusion/sqllogictest/test_files/describe.slt similarity index 85% rename from datafusion/core/tests/sqllogictests/test_files/describe.slt rename to datafusion/sqllogictest/test_files/describe.slt index 5ee4d1cd2197..007aec443cbc 100644 --- a/datafusion/core/tests/sqllogictests/test_files/describe.slt +++ b/datafusion/sqllogictest/test_files/describe.slt @@ -24,7 +24,7 @@ statement ok set datafusion.catalog.information_schema = true statement ok -CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION 'tests/data/aggregate_simple.csv'; +CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION '../core/tests/data/aggregate_simple.csv'; query TTT rowsort DESCRIBE aggregate_simple; @@ -44,7 +44,7 @@ statement ok set datafusion.catalog.information_schema = false statement ok -CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION 'tests/data/aggregate_simple.csv'; +CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION '../core/tests/data/aggregate_simple.csv'; query TTT rowsort DESCRIBE aggregate_simple; @@ -60,5 +60,5 @@ DROP TABLE aggregate_simple; # Describe file (currently we can only describe file in datafusion-cli, fix this after issue (#4850) has been done) ########## -statement error Error during planning: table 'datafusion.public.tests/data/aggregate_simple.csv' not found -DESCRIBE 'tests/data/aggregate_simple.csv'; +statement error Error during planning: table 'datafusion.public.../core/tests/data/aggregate_simple.csv' not found +DESCRIBE '../core/tests/data/aggregate_simple.csv'; diff --git a/datafusion/core/tests/sqllogictests/test_files/encoding.slt b/datafusion/sqllogictest/test_files/encoding.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/encoding.slt rename to datafusion/sqllogictest/test_files/encoding.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/errors.slt b/datafusion/sqllogictest/test_files/errors.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/errors.slt rename to datafusion/sqllogictest/test_files/errors.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/explain.slt b/datafusion/sqllogictest/test_files/explain.slt similarity index 98% rename from datafusion/core/tests/sqllogictests/test_files/explain.slt rename to datafusion/sqllogictest/test_files/explain.slt index aa560961d2f3..7aa7870630df 100644 --- a/datafusion/core/tests/sqllogictests/test_files/explain.slt +++ b/datafusion/sqllogictest/test_files/explain.slt @@ -70,7 +70,7 @@ CREATE EXTERNAL TABLE aggregate_test_100_with_order ( STORED AS CSV WITH HEADER ROW WITH ORDER (c1 ASC) -LOCATION 'tests/data/aggregate_test_100_order_by_c1_asc.csv'; +LOCATION '../core/tests/data/aggregate_test_100_order_by_c1_asc.csv'; query TT explain SELECT c1 FROM aggregate_test_100_with_order order by c1 ASC limit 10 @@ -125,7 +125,7 @@ CREATE EXTERNAL TABLE simple_explain_test ( ) STORED AS CSV WITH HEADER ROW -LOCATION './tests/data/example.csv' +LOCATION '../core/tests/data/example.csv' query TT EXPLAIN SELECT a, b, c FROM simple_explain_test diff --git a/datafusion/core/tests/sqllogictests/test_files/functions.slt b/datafusion/sqllogictest/test_files/functions.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/functions.slt rename to datafusion/sqllogictest/test_files/functions.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/group.slt b/datafusion/sqllogictest/test_files/group.slt similarity index 98% rename from datafusion/core/tests/sqllogictests/test_files/group.slt rename to datafusion/sqllogictest/test_files/group.slt index a56451d7aaea..2a28efa73a62 100644 --- a/datafusion/core/tests/sqllogictests/test_files/group.slt +++ b/datafusion/sqllogictest/test_files/group.slt @@ -36,7 +36,7 @@ WITH HEADER ROW LOCATION '../../testing/data/csv/aggregate_test_100.csv' statement ok -CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION 'tests/data/aggregate_simple.csv'; +CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION '../core/tests/data/aggregate_simple.csv'; # csv_query_group_by_int_min_max diff --git a/datafusion/core/tests/sqllogictests/test_files/groupby.slt b/datafusion/sqllogictest/test_files/groupby.slt similarity index 99% rename from datafusion/core/tests/sqllogictests/test_files/groupby.slt rename to datafusion/sqllogictest/test_files/groupby.slt index 4490be50a2fc..14638a833f5e 100644 --- a/datafusion/core/tests/sqllogictests/test_files/groupby.slt +++ b/datafusion/sqllogictest/test_files/groupby.slt @@ -1989,7 +1989,7 @@ CREATE UNBOUNDED EXTERNAL TABLE annotated_data_infinite2 ( STORED AS CSV WITH HEADER ROW WITH ORDER (a ASC, b ASC, c ASC) -LOCATION 'tests/data/window_2.csv'; +LOCATION '../core/tests/data/window_2.csv'; # Create a table with 2 ordered columns. # In the next step, we will expect to observe the removed sort execs. @@ -2005,7 +2005,7 @@ STORED AS CSV WITH HEADER ROW WITH ORDER (a ASC, b ASC) WITH ORDER (c ASC) -LOCATION 'tests/data/window_2.csv'; +LOCATION '../core/tests/data/window_2.csv'; # Expected a sort exec for b DESC query TT diff --git a/datafusion/core/tests/sqllogictests/test_files/identifiers.slt b/datafusion/sqllogictest/test_files/identifiers.slt similarity index 98% rename from datafusion/core/tests/sqllogictests/test_files/identifiers.slt rename to datafusion/sqllogictest/test_files/identifiers.slt index c4605979d151..f60d60b2bfe0 100644 --- a/datafusion/core/tests/sqllogictests/test_files/identifiers.slt +++ b/datafusion/sqllogictest/test_files/identifiers.slt @@ -23,7 +23,7 @@ CREATE EXTERNAL TABLE case_insensitive_test ( ) STORED AS CSV WITH HEADER ROW -LOCATION './tests/data/example.csv' +LOCATION '../core/tests/data/example.csv' # normalized column identifiers query II diff --git a/datafusion/core/tests/sqllogictests/test_files/information_schema.slt b/datafusion/sqllogictest/test_files/information_schema.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/information_schema.slt rename to datafusion/sqllogictest/test_files/information_schema.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/information_schema_columns.slt b/datafusion/sqllogictest/test_files/information_schema_columns.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/information_schema_columns.slt rename to datafusion/sqllogictest/test_files/information_schema_columns.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/information_schema_multiple_catalogs.slt b/datafusion/sqllogictest/test_files/information_schema_multiple_catalogs.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/information_schema_multiple_catalogs.slt rename to datafusion/sqllogictest/test_files/information_schema_multiple_catalogs.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/information_schema_table_types.slt b/datafusion/sqllogictest/test_files/information_schema_table_types.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/information_schema_table_types.slt rename to datafusion/sqllogictest/test_files/information_schema_table_types.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/insert.slt b/datafusion/sqllogictest/test_files/insert.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/insert.slt rename to datafusion/sqllogictest/test_files/insert.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/intersection.slt b/datafusion/sqllogictest/test_files/intersection.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/intersection.slt rename to datafusion/sqllogictest/test_files/intersection.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/interval.slt b/datafusion/sqllogictest/test_files/interval.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/interval.slt rename to datafusion/sqllogictest/test_files/interval.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/join.slt b/datafusion/sqllogictest/test_files/join.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/join.slt rename to datafusion/sqllogictest/test_files/join.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/join_disable_repartition_joins.slt b/datafusion/sqllogictest/test_files/join_disable_repartition_joins.slt similarity index 98% rename from datafusion/core/tests/sqllogictests/test_files/join_disable_repartition_joins.slt rename to datafusion/sqllogictest/test_files/join_disable_repartition_joins.slt index b3bd8fefb368..1312f2916ed6 100644 --- a/datafusion/core/tests/sqllogictests/test_files/join_disable_repartition_joins.slt +++ b/datafusion/sqllogictest/test_files/join_disable_repartition_joins.slt @@ -36,7 +36,7 @@ CREATE EXTERNAL TABLE annotated_data ( STORED AS CSV WITH HEADER ROW WITH ORDER (a ASC, b ASC, c ASC) -LOCATION 'tests/data/window_2.csv'; +LOCATION '../core/tests/data/window_2.csv'; query TT EXPLAIN SELECT t2.a diff --git a/datafusion/core/tests/sqllogictests/test_files/joins.slt b/datafusion/sqllogictest/test_files/joins.slt similarity index 99% rename from datafusion/core/tests/sqllogictests/test_files/joins.slt rename to datafusion/sqllogictest/test_files/joins.slt index 2455eb8a23f6..5bc36e4c6d7b 100644 --- a/datafusion/core/tests/sqllogictests/test_files/joins.slt +++ b/datafusion/sqllogictest/test_files/joins.slt @@ -3094,7 +3094,7 @@ CREATE EXTERNAL TABLE annotated_data ( STORED AS CSV WITH HEADER ROW WITH ORDER (a ASC NULLS FIRST, b ASC, c ASC) -LOCATION 'tests/data/window_2.csv'; +LOCATION '../core/tests/data/window_2.csv'; # sort merge join should propagate ordering equivalence of the left side # for inner join. Hence final requirement rn1 ASC is already satisfied at diff --git a/datafusion/core/tests/sqllogictests/test_files/json.slt b/datafusion/sqllogictest/test_files/json.slt similarity index 95% rename from datafusion/core/tests/sqllogictests/test_files/json.slt rename to datafusion/sqllogictest/test_files/json.slt index edbe6912e604..69902f2982dc 100644 --- a/datafusion/core/tests/sqllogictests/test_files/json.slt +++ b/datafusion/sqllogictest/test_files/json.slt @@ -22,12 +22,12 @@ statement ok CREATE EXTERNAL TABLE json_test STORED AS JSON -LOCATION 'tests/data/2.json'; +LOCATION '../core/tests/data/2.json'; statement ok CREATE EXTERNAL TABLE single_nan STORED AS JSON -LOCATION 'tests/data/3.json'; +LOCATION '../core/tests/data/3.json'; query IR rowsort SELECT a, b FROM json_test diff --git a/datafusion/core/tests/sqllogictests/test_files/limit.slt b/datafusion/sqllogictest/test_files/limit.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/limit.slt rename to datafusion/sqllogictest/test_files/limit.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/math.slt b/datafusion/sqllogictest/test_files/math.slt similarity index 94% rename from datafusion/core/tests/sqllogictests/test_files/math.slt rename to datafusion/sqllogictest/test_files/math.slt index fc27333ec0af..9965821e52bd 100644 --- a/datafusion/core/tests/sqllogictests/test_files/math.slt +++ b/datafusion/sqllogictest/test_files/math.slt @@ -20,7 +20,7 @@ ########## statement ok -CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION 'tests/data/aggregate_simple.csv'; +CREATE external table aggregate_simple(c1 real, c2 double, c3 boolean) STORED as CSV WITH HEADER ROW LOCATION '../core/tests/data/aggregate_simple.csv'; # Round query R @@ -98,4 +98,4 @@ SELECT atan2(2.0, 1.0), atan2(-2.0, 1.0), atan2(2.0, -1.0), atan2(-2.0, -1.0), a query RRR SELECT nanvl(asin(10), 1.0), nanvl(1.0, 2.0), nanvl(asin(10), asin(10)) ---- -1 1 NaN \ No newline at end of file +1 1 NaN diff --git a/datafusion/core/tests/sqllogictests/test_files/misc.slt b/datafusion/sqllogictest/test_files/misc.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/misc.slt rename to datafusion/sqllogictest/test_files/misc.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/nullif.slt b/datafusion/sqllogictest/test_files/nullif.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/nullif.slt rename to datafusion/sqllogictest/test_files/nullif.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/options.slt b/datafusion/sqllogictest/test_files/options.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/options.slt rename to datafusion/sqllogictest/test_files/options.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/order.slt b/datafusion/sqllogictest/test_files/order.slt similarity index 99% rename from datafusion/core/tests/sqllogictests/test_files/order.slt rename to datafusion/sqllogictest/test_files/order.slt index 92faff623c1e..47c7acde32ec 100644 --- a/datafusion/core/tests/sqllogictests/test_files/order.slt +++ b/datafusion/sqllogictest/test_files/order.slt @@ -98,7 +98,7 @@ NULL three statement ok CREATE EXTERNAL TABLE test (c1 int, c2 bigint, c3 boolean) -STORED AS CSV LOCATION 'tests/data/partitioned_csv'; +STORED AS CSV LOCATION '../core/tests/data/partitioned_csv'; # Demonstrate types query TTT diff --git a/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_null.slt b/datafusion/sqllogictest/test_files/pg_compat/pg_compat_null.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_null.slt rename to datafusion/sqllogictest/test_files/pg_compat/pg_compat_null.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_simple.slt b/datafusion/sqllogictest/test_files/pg_compat/pg_compat_simple.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_simple.slt rename to datafusion/sqllogictest/test_files/pg_compat/pg_compat_simple.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_type_coercion.slt b/datafusion/sqllogictest/test_files/pg_compat/pg_compat_type_coercion.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_type_coercion.slt rename to datafusion/sqllogictest/test_files/pg_compat/pg_compat_type_coercion.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_types.slt b/datafusion/sqllogictest/test_files/pg_compat/pg_compat_types.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_types.slt rename to datafusion/sqllogictest/test_files/pg_compat/pg_compat_types.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_union.slt b/datafusion/sqllogictest/test_files/pg_compat/pg_compat_union.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_union.slt rename to datafusion/sqllogictest/test_files/pg_compat/pg_compat_union.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_window.slt b/datafusion/sqllogictest/test_files/pg_compat/pg_compat_window.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_window.slt rename to datafusion/sqllogictest/test_files/pg_compat/pg_compat_window.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/predicates.slt b/datafusion/sqllogictest/test_files/predicates.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/predicates.slt rename to datafusion/sqllogictest/test_files/predicates.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/prepare.slt b/datafusion/sqllogictest/test_files/prepare.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/prepare.slt rename to datafusion/sqllogictest/test_files/prepare.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/scalar.slt b/datafusion/sqllogictest/test_files/scalar.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/scalar.slt rename to datafusion/sqllogictest/test_files/scalar.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/select.slt b/datafusion/sqllogictest/test_files/select.slt similarity index 99% rename from datafusion/core/tests/sqllogictests/test_files/select.slt rename to datafusion/sqllogictest/test_files/select.slt index 84f7c3be526b..7b39bccf3f26 100644 --- a/datafusion/core/tests/sqllogictests/test_files/select.slt +++ b/datafusion/sqllogictest/test_files/select.slt @@ -44,7 +44,7 @@ CREATE EXTERNAL TABLE aggregate_simple ( ) STORED AS CSV WITH HEADER ROW -LOCATION 'tests/data/aggregate_simple.csv' +LOCATION '../core/tests/data/aggregate_simple.csv' ########## @@ -729,7 +729,7 @@ CREATE EXTERNAL TABLE annotated_data_finite2 ( STORED AS CSV WITH HEADER ROW WITH ORDER (a ASC, b ASC, c ASC) -LOCATION 'tests/data/window_2.csv'; +LOCATION '../core/tests/data/window_2.csv'; # test_source_projection diff --git a/datafusion/core/tests/sqllogictests/test_files/set_variable.slt b/datafusion/sqllogictest/test_files/set_variable.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/set_variable.slt rename to datafusion/sqllogictest/test_files/set_variable.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/strings.slt b/datafusion/sqllogictest/test_files/strings.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/strings.slt rename to datafusion/sqllogictest/test_files/strings.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/struct.slt b/datafusion/sqllogictest/test_files/struct.slt similarity index 98% rename from datafusion/core/tests/sqllogictests/test_files/struct.slt rename to datafusion/sqllogictest/test_files/struct.slt index 2629b6b038a3..fc14798a3bfe 100644 --- a/datafusion/core/tests/sqllogictests/test_files/struct.slt +++ b/datafusion/sqllogictest/test_files/struct.slt @@ -59,4 +59,4 @@ select struct(a, b, c) from values; {c0: 3, c1: 3.3, c2: c} statement ok -drop table values; \ No newline at end of file +drop table values; diff --git a/datafusion/core/tests/sqllogictests/test_files/subquery.slt b/datafusion/sqllogictest/test_files/subquery.slt similarity index 99% rename from datafusion/core/tests/sqllogictests/test_files/subquery.slt rename to datafusion/sqllogictest/test_files/subquery.slt index 2857f4381d49..bdc8991b901d 100644 --- a/datafusion/core/tests/sqllogictests/test_files/subquery.slt +++ b/datafusion/sqllogictest/test_files/subquery.slt @@ -55,7 +55,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS customer ( c_acctbal DECIMAL(15, 2), c_mktsegment VARCHAR, c_comment VARCHAR, -) STORED AS CSV DELIMITER ',' WITH HEADER ROW LOCATION 'tests/tpch-csv/customer.csv'; +) STORED AS CSV DELIMITER ',' WITH HEADER ROW LOCATION '../core/tests/tpch-csv/customer.csv'; statement ok CREATE EXTERNAL TABLE IF NOT EXISTS orders ( @@ -68,7 +68,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS orders ( o_clerk VARCHAR, o_shippriority INTEGER, o_comment VARCHAR, -) STORED AS CSV DELIMITER ',' WITH HEADER ROW LOCATION 'tests/tpch-csv/orders.csv'; +) STORED AS CSV DELIMITER ',' WITH HEADER ROW LOCATION '../core/tests/tpch-csv/orders.csv'; statement ok CREATE EXTERNAL TABLE IF NOT EXISTS lineitem ( @@ -88,7 +88,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS lineitem ( l_shipinstruct VARCHAR, l_shipmode VARCHAR, l_comment VARCHAR, -) STORED AS CSV DELIMITER ',' WITH HEADER ROW LOCATION 'tests/tpch-csv/lineitem.csv'; +) STORED AS CSV DELIMITER ',' WITH HEADER ROW LOCATION '../core/tests/tpch-csv/lineitem.csv'; # in_subquery_to_join_with_correlated_outer_filter query ITI rowsort @@ -652,7 +652,7 @@ explain SELECT t1_id, (SELECT t2_id FROM t2 limit 0) FROM t1 ---- logical_plan Projection: t1.t1_id, __scalar_sq_1.t2_id AS t2_id ---Left Join: +--Left Join: ----TableScan: t1 projection=[t1_id] ----EmptyRelation @@ -696,7 +696,7 @@ explain select (select count(*) from t1) as b, (select count(1) from t2) ---- logical_plan Projection: __scalar_sq_1.COUNT(*) AS b, __scalar_sq_2.COUNT(Int64(1)) AS COUNT(Int64(1)) ---Left Join: +--Left Join: ----SubqueryAlias: __scalar_sq_1 ------Aggregate: groupBy=[[]], aggr=[[COUNT(UInt8(1)) AS COUNT(*)]] --------TableScan: t1 projection=[t1_id] diff --git a/datafusion/core/tests/sqllogictests/test_files/timestamps.slt b/datafusion/sqllogictest/test_files/timestamps.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/timestamps.slt rename to datafusion/sqllogictest/test_files/timestamps.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/create_tables.slt.part b/datafusion/sqllogictest/test_files/tpch/create_tables.slt.part similarity index 81% rename from datafusion/core/tests/sqllogictests/test_files/tpch/create_tables.slt.part rename to datafusion/sqllogictest/test_files/tpch/create_tables.slt.part index 007cfd7062b7..2f5e2d5a7616 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/create_tables.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/create_tables.slt.part @@ -31,7 +31,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS supplier ( s_acctbal DECIMAL(15, 2), s_comment VARCHAR, s_rev VARCHAR, -) STORED AS CSV DELIMITER '|' LOCATION 'tests/sqllogictests/test_files/tpch/data/supplier.tbl'; +) STORED AS CSV DELIMITER '|' LOCATION 'test_files/tpch/data/supplier.tbl'; statement ok CREATE EXTERNAL TABLE IF NOT EXISTS part ( @@ -45,7 +45,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS part ( p_retailprice DECIMAL(15, 2), p_comment VARCHAR, p_rev VARCHAR, -) STORED AS CSV DELIMITER '|' LOCATION 'tests/sqllogictests/test_files/tpch/data/part.tbl'; +) STORED AS CSV DELIMITER '|' LOCATION 'test_files/tpch/data/part.tbl'; statement ok @@ -56,7 +56,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS partsupp ( ps_supplycost DECIMAL(15, 2), ps_comment VARCHAR, ps_rev VARCHAR, -) STORED AS CSV DELIMITER '|' LOCATION 'tests/sqllogictests/test_files/tpch/data/partsupp.tbl'; +) STORED AS CSV DELIMITER '|' LOCATION 'test_files/tpch/data/partsupp.tbl'; statement ok CREATE EXTERNAL TABLE IF NOT EXISTS customer ( @@ -69,7 +69,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS customer ( c_mktsegment VARCHAR, c_comment VARCHAR, c_rev VARCHAR, -) STORED AS CSV DELIMITER '|' LOCATION 'tests/sqllogictests/test_files/tpch/data/customer.tbl'; +) STORED AS CSV DELIMITER '|' LOCATION 'test_files/tpch/data/customer.tbl'; statement ok CREATE EXTERNAL TABLE IF NOT EXISTS orders ( @@ -83,7 +83,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS orders ( o_shippriority INTEGER, o_comment VARCHAR, o_rev VARCHAR, -) STORED AS CSV DELIMITER '|' LOCATION 'tests/sqllogictests/test_files/tpch/data/orders.tbl'; +) STORED AS CSV DELIMITER '|' LOCATION 'test_files/tpch/data/orders.tbl'; statement ok CREATE EXTERNAL TABLE IF NOT EXISTS lineitem ( @@ -104,7 +104,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS lineitem ( l_shipmode VARCHAR, l_comment VARCHAR, l_rev VARCHAR, -) STORED AS CSV DELIMITER '|' LOCATION 'tests/sqllogictests/test_files/tpch/data/lineitem.tbl'; +) STORED AS CSV DELIMITER '|' LOCATION 'test_files/tpch/data/lineitem.tbl'; statement ok CREATE EXTERNAL TABLE IF NOT EXISTS nation ( @@ -113,7 +113,7 @@ CREATE EXTERNAL TABLE IF NOT EXISTS nation ( n_regionkey BIGINT, n_comment VARCHAR, n_rev VARCHAR, -) STORED AS CSV DELIMITER '|' LOCATION 'tests/sqllogictests/test_files/tpch/data/nation.tbl'; +) STORED AS CSV DELIMITER '|' LOCATION 'test_files/tpch/data/nation.tbl'; statement ok CREATE EXTERNAL TABLE IF NOT EXISTS region ( @@ -121,4 +121,4 @@ CREATE EXTERNAL TABLE IF NOT EXISTS region ( r_name VARCHAR, r_comment VARCHAR, r_rev VARCHAR, -) STORED AS CSV DELIMITER '|' LOCATION 'tests/sqllogictests/test_files/tpch/data/region.tbl'; +) STORED AS CSV DELIMITER '|' LOCATION 'test_files/tpch/data/region.tbl'; diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/drop_tables.slt.part b/datafusion/sqllogictest/test_files/tpch/drop_tables.slt.part similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/tpch/drop_tables.slt.part rename to datafusion/sqllogictest/test_files/tpch/drop_tables.slt.part diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q1.slt.part b/datafusion/sqllogictest/test_files/tpch/q1.slt.part similarity index 92% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q1.slt.part rename to datafusion/sqllogictest/test_files/tpch/q1.slt.part index 25485225e7c1..3086ab487aaa 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q1.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q1.slt.part @@ -57,7 +57,7 @@ SortPreservingMergeExec: [l_returnflag@0 ASC NULLS LAST,l_linestatus@1 ASC NULLS --------------ProjectionExec: expr=[l_extendedprice@1 * (Some(1),20,0 - l_discount@2) as lineitem.l_extendedprice * (Decimal128(Some(1),20,0) - lineitem.l_discount)Decimal128(Some(1),20,0) - lineitem.l_discountlineitem.l_discountDecimal128(Some(1),20,0)lineitem.l_extendedprice, l_quantity@0 as l_quantity, l_extendedprice@1 as l_extendedprice, l_discount@2 as l_discount, l_tax@3 as l_tax, l_returnflag@4 as l_returnflag, l_linestatus@5 as l_linestatus] ----------------CoalesceBatchesExec: target_batch_size=8192 ------------------FilterExec: l_shipdate@6 <= 10471 ---------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_quantity, l_extendedprice, l_discount, l_tax, l_returnflag, l_linestatus, l_shipdate], has_header=false +--------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_quantity, l_extendedprice, l_discount, l_tax, l_returnflag, l_linestatus, l_shipdate], has_header=false query TTRRRRRRRI select diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q10.slt.part b/datafusion/sqllogictest/test_files/tpch/q10.slt.part similarity index 88% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q10.slt.part rename to datafusion/sqllogictest/test_files/tpch/q10.slt.part index d46536a25349..708bcb3c9b6f 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q10.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q10.slt.part @@ -94,23 +94,23 @@ GlobalLimitExec: skip=0, fetch=10 ------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------RepartitionExec: partitioning=Hash([c_custkey@0], 4), input_partitions=4 ----------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_name, c_address, c_nationkey, c_phone, c_acctbal, c_comment], has_header=false +------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_name, c_address, c_nationkey, c_phone, c_acctbal, c_comment], has_header=false ------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------RepartitionExec: partitioning=Hash([o_custkey@1], 4), input_partitions=4 ----------------------------------------------ProjectionExec: expr=[o_orderkey@0 as o_orderkey, o_custkey@1 as o_custkey] ------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------FilterExec: o_orderdate@2 >= 8674 AND o_orderdate@2 < 8766 -----------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_orderdate], has_header=false +----------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_orderdate], has_header=false --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------RepartitionExec: partitioning=Hash([l_orderkey@0], 4), input_partitions=4 ------------------------------------ProjectionExec: expr=[l_orderkey@0 as l_orderkey, l_extendedprice@1 as l_extendedprice, l_discount@2 as l_discount] --------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------FilterExec: l_returnflag@3 = R -------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_extendedprice, l_discount, l_returnflag], has_header=false +------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_extendedprice, l_discount, l_returnflag], has_header=false ----------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 --------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false +----------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q11.slt.part b/datafusion/sqllogictest/test_files/tpch/q11.slt.part similarity index 85% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q11.slt.part rename to datafusion/sqllogictest/test_files/tpch/q11.slt.part index 9118935c4b73..0a045d4f77ca 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q11.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q11.slt.part @@ -93,18 +93,18 @@ GlobalLimitExec: skip=0, fetch=10 --------------------------------HashJoinExec: mode=Partitioned, join_type=Inner, on=[(ps_suppkey@1, s_suppkey@0)] ----------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------RepartitionExec: partitioning=Hash([ps_suppkey@1], 4), input_partitions=4 ---------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_availqty, ps_supplycost], has_header=false +--------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_availqty, ps_supplycost], has_header=false ----------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 --------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false +----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false ------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 ----------------------------ProjectionExec: expr=[n_nationkey@0 as n_nationkey] ------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------FilterExec: n_name@1 = GERMANY ----------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false +------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false ----------ProjectionExec: expr=[CAST(CAST(SUM(partsupp.ps_supplycost * partsupp.ps_availqty)@0 AS Float64) * 0.0001 AS Decimal128(38, 15)) as SUM(partsupp.ps_supplycost * partsupp.ps_availqty) * Float64(0.0001)] ------------AggregateExec: mode=Final, gby=[], aggr=[SUM(partsupp.ps_supplycost * partsupp.ps_availqty)] --------------CoalescePartitionsExec @@ -119,18 +119,18 @@ GlobalLimitExec: skip=0, fetch=10 --------------------------------HashJoinExec: mode=Partitioned, join_type=Inner, on=[(ps_suppkey@0, s_suppkey@0)] ----------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------RepartitionExec: partitioning=Hash([ps_suppkey@0], 4), input_partitions=4 ---------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_suppkey, ps_availqty, ps_supplycost], has_header=false +--------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_suppkey, ps_availqty, ps_supplycost], has_header=false ----------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 --------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false +----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false ------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 ----------------------------ProjectionExec: expr=[n_nationkey@0 as n_nationkey] ------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------FilterExec: n_name@1 = GERMANY ----------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false +------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q12.slt.part b/datafusion/sqllogictest/test_files/tpch/q12.slt.part similarity index 86% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q12.slt.part rename to datafusion/sqllogictest/test_files/tpch/q12.slt.part index 66ff3f8964d6..09939359ce12 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q12.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q12.slt.part @@ -74,10 +74,10 @@ SortPreservingMergeExec: [l_shipmode@0 ASC NULLS LAST] ------------------------ProjectionExec: expr=[l_orderkey@0 as l_orderkey, l_shipmode@4 as l_shipmode] --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------FilterExec: (l_shipmode@4 = MAIL OR l_shipmode@4 = SHIP) AND l_commitdate@2 < l_receiptdate@3 AND l_shipdate@1 < l_commitdate@2 AND l_receiptdate@3 >= 8766 AND l_receiptdate@3 < 9131 -------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_shipdate, l_commitdate, l_receiptdate, l_shipmode], has_header=false +------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_shipdate, l_commitdate, l_receiptdate, l_shipmode], has_header=false --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------RepartitionExec: partitioning=Hash([o_orderkey@0], 4), input_partitions=4 -------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_orderpriority], has_header=false +------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_orderpriority], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q13.slt.part b/datafusion/sqllogictest/test_files/tpch/q13.slt.part similarity index 88% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q13.slt.part rename to datafusion/sqllogictest/test_files/tpch/q13.slt.part index 890c4da60b47..bb33c2ad3419 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q13.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q13.slt.part @@ -70,13 +70,13 @@ GlobalLimitExec: skip=0, fetch=10 --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------RepartitionExec: partitioning=Hash([c_custkey@0], 4), input_partitions=4 ------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey], has_header=false +--------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey], has_header=false --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------RepartitionExec: partitioning=Hash([o_custkey@1], 4), input_partitions=4 ------------------------------ProjectionExec: expr=[o_orderkey@0 as o_orderkey, o_custkey@1 as o_custkey] --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------FilterExec: o_comment@2 NOT LIKE %special%requests% -------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_comment], has_header=false +------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_comment], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q14.slt.part b/datafusion/sqllogictest/test_files/tpch/q14.slt.part similarity index 90% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q14.slt.part rename to datafusion/sqllogictest/test_files/tpch/q14.slt.part index a22b1206ca4f..b584972c25bc 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q14.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q14.slt.part @@ -53,11 +53,11 @@ ProjectionExec: expr=[100 * CAST(SUM(CASE WHEN part.p_type LIKE Utf8("PROMO%") ------------------ProjectionExec: expr=[l_partkey@0 as l_partkey, l_extendedprice@1 as l_extendedprice, l_discount@2 as l_discount] --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------FilterExec: l_shipdate@3 >= 9374 AND l_shipdate@3 < 9404 -------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_extendedprice, l_discount, l_shipdate], has_header=false +------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_extendedprice, l_discount, l_shipdate], has_header=false --------------CoalesceBatchesExec: target_batch_size=8192 ----------------RepartitionExec: partitioning=Hash([p_partkey@0], 4), input_partitions=4 ------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_type], has_header=false +--------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_type], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q15.slt.part b/datafusion/sqllogictest/test_files/tpch/q15.slt.part similarity index 86% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q15.slt.part rename to datafusion/sqllogictest/test_files/tpch/q15.slt.part index 4dea89fc72f1..9ac8596f2626 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q15.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q15.slt.part @@ -84,7 +84,7 @@ SortPreservingMergeExec: [s_suppkey@0 ASC NULLS LAST] --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 ------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_name, s_address, s_phone], has_header=false +--------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_name, s_address, s_phone], has_header=false --------------------ProjectionExec: expr=[l_suppkey@0 as supplier_no, SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)@1 as total_revenue] ----------------------AggregateExec: mode=FinalPartitioned, gby=[l_suppkey@0 as l_suppkey], aggr=[SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)] ------------------------CoalesceBatchesExec: target_batch_size=8192 @@ -93,7 +93,7 @@ SortPreservingMergeExec: [s_suppkey@0 ASC NULLS LAST] ------------------------------ProjectionExec: expr=[l_suppkey@0 as l_suppkey, l_extendedprice@1 as l_extendedprice, l_discount@2 as l_discount] --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------FilterExec: l_shipdate@3 >= 9496 AND l_shipdate@3 < 9587 -------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], has_header=false +------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], has_header=false ----------CoalesceBatchesExec: target_batch_size=8192 ------------RepartitionExec: partitioning=Hash([MAX(revenue0.total_revenue)@0], 4), input_partitions=1 --------------AggregateExec: mode=Final, gby=[], aggr=[MAX(revenue0.total_revenue)] @@ -107,7 +107,7 @@ SortPreservingMergeExec: [s_suppkey@0 ASC NULLS LAST] ------------------------------ProjectionExec: expr=[l_suppkey@0 as l_suppkey, l_extendedprice@1 as l_extendedprice, l_discount@2 as l_discount] --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------FilterExec: l_shipdate@3 >= 9496 AND l_shipdate@3 < 9587 -------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], has_header=false +------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], has_header=false query ITTTR diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q16.slt.part b/datafusion/sqllogictest/test_files/tpch/q16.slt.part similarity index 90% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q16.slt.part rename to datafusion/sqllogictest/test_files/tpch/q16.slt.part index 1f24791a5693..5247fbc90d7c 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q16.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q16.slt.part @@ -87,20 +87,20 @@ GlobalLimitExec: skip=0, fetch=10 ------------------------------------HashJoinExec: mode=Partitioned, join_type=Inner, on=[(ps_partkey@0, p_partkey@0)] --------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------RepartitionExec: partitioning=Hash([ps_partkey@0], 4), input_partitions=4 -------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey], has_header=false +------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey], has_header=false --------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------RepartitionExec: partitioning=Hash([p_partkey@0], 4), input_partitions=4 ------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------FilterExec: p_brand@1 != Brand#45 AND p_type@2 NOT LIKE MEDIUM POLISHED% AND Use p_size@3 IN (SET) ([Literal { value: Int32(49) }, Literal { value: Int32(14) }, Literal { value: Int32(23) }, Literal { value: Int32(45) }, Literal { value: Int32(19) }, Literal { value: Int32(3) }, Literal { value: Int32(36) }, Literal { value: Int32(9) }]) ----------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_brand, p_type, p_size], has_header=false +------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_brand, p_type, p_size], has_header=false ----------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 --------------------------------ProjectionExec: expr=[s_suppkey@0 as s_suppkey] ----------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------FilterExec: s_comment@1 LIKE %Customer%Complaints% --------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_comment], has_header=false +----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_comment], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q17.slt.part b/datafusion/sqllogictest/test_files/tpch/q17.slt.part similarity index 82% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q17.slt.part rename to datafusion/sqllogictest/test_files/tpch/q17.slt.part index 21a13e65dce5..50661b9b10a8 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q17.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q17.slt.part @@ -65,20 +65,20 @@ ProjectionExec: expr=[CAST(SUM(lineitem.l_extendedprice)@0 AS Float64) / 7 as av ----------------------HashJoinExec: mode=Partitioned, join_type=Inner, on=[(l_partkey@0, p_partkey@0)] ------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------RepartitionExec: partitioning=Hash([l_partkey@0], 4), input_partitions=4 -----------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_quantity, l_extendedprice], has_header=false +----------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_quantity, l_extendedprice], has_header=false ------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------RepartitionExec: partitioning=Hash([p_partkey@0], 4), input_partitions=4 ----------------------------ProjectionExec: expr=[p_partkey@0 as p_partkey] ------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------FilterExec: p_brand@1 = Brand#23 AND p_container@2 = MED BOX ----------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_brand, p_container], has_header=false +------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_brand, p_container], has_header=false --------------ProjectionExec: expr=[CAST(0.2 * CAST(AVG(lineitem.l_quantity)@1 AS Float64) AS Decimal128(30, 15)) as Float64(0.2) * AVG(lineitem.l_quantity), l_partkey@0 as l_partkey] ----------------AggregateExec: mode=FinalPartitioned, gby=[l_partkey@0 as l_partkey], aggr=[AVG(lineitem.l_quantity)] ------------------CoalesceBatchesExec: target_batch_size=8192 --------------------RepartitionExec: partitioning=Hash([l_partkey@0], 4), input_partitions=4 ----------------------AggregateExec: mode=Partial, gby=[l_partkey@0 as l_partkey], aggr=[AVG(lineitem.l_quantity)] -------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_quantity], has_header=false +------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_quantity], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q18.slt.part b/datafusion/sqllogictest/test_files/tpch/q18.slt.part similarity index 80% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q18.slt.part rename to datafusion/sqllogictest/test_files/tpch/q18.slt.part index 11a188301dd7..53191a5d44e1 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q18.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q18.slt.part @@ -86,13 +86,13 @@ SortPreservingMergeExec: [o_totalprice@4 DESC,o_orderdate@3 ASC NULLS LAST] --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------RepartitionExec: partitioning=Hash([c_custkey@0], 4), input_partitions=4 ------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_name], has_header=false +--------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_name], has_header=false --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------RepartitionExec: partitioning=Hash([o_custkey@1], 4), input_partitions=4 -------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_totalprice, o_orderdate], has_header=false +------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_totalprice, o_orderdate], has_header=false ----------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------RepartitionExec: partitioning=Hash([l_orderkey@0], 4), input_partitions=4 ---------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_quantity], has_header=false +--------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_quantity], has_header=false ----------------ProjectionExec: expr=[l_orderkey@0 as l_orderkey] ------------------CoalesceBatchesExec: target_batch_size=8192 --------------------FilterExec: SUM(lineitem.l_quantity)@1 > Some(30000),25,2 @@ -100,7 +100,7 @@ SortPreservingMergeExec: [o_totalprice@4 DESC,o_orderdate@3 ASC NULLS LAST] ------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------RepartitionExec: partitioning=Hash([l_orderkey@0], 4), input_partitions=4 ----------------------------AggregateExec: mode=Partial, gby=[l_orderkey@0 as l_orderkey], aggr=[SUM(lineitem.l_quantity)] -------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_quantity], has_header=false +------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_quantity], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q19.slt.part b/datafusion/sqllogictest/test_files/tpch/q19.slt.part similarity index 93% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q19.slt.part rename to datafusion/sqllogictest/test_files/tpch/q19.slt.part index c5c2836b76b1..2df27bd41082 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q19.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q19.slt.part @@ -76,13 +76,13 @@ ProjectionExec: expr=[SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_disco ------------------ProjectionExec: expr=[l_partkey@0 as l_partkey, l_quantity@1 as l_quantity, l_extendedprice@2 as l_extendedprice, l_discount@3 as l_discount] --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------FilterExec: (l_quantity@1 >= Some(100),15,2 AND l_quantity@1 <= Some(1100),15,2 OR l_quantity@1 >= Some(1000),15,2 AND l_quantity@1 <= Some(2000),15,2 OR l_quantity@1 >= Some(2000),15,2 AND l_quantity@1 <= Some(3000),15,2) AND (l_shipmode@5 = AIR OR l_shipmode@5 = AIR REG) AND l_shipinstruct@4 = DELIVER IN PERSON -------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_quantity, l_extendedprice, l_discount, l_shipinstruct, l_shipmode], has_header=false +------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_quantity, l_extendedprice, l_discount, l_shipinstruct, l_shipmode], has_header=false --------------CoalesceBatchesExec: target_batch_size=8192 ----------------RepartitionExec: partitioning=Hash([p_partkey@0], 4), input_partitions=4 ------------------CoalesceBatchesExec: target_batch_size=8192 --------------------FilterExec: (p_brand@1 = Brand#12 AND Use p_container@3 IN (SET) ([Literal { value: Utf8("SM CASE") }, Literal { value: Utf8("SM BOX") }, Literal { value: Utf8("SM PACK") }, Literal { value: Utf8("SM PKG") }]) AND p_size@2 <= 5 OR p_brand@1 = Brand#23 AND Use p_container@3 IN (SET) ([Literal { value: Utf8("MED BAG") }, Literal { value: Utf8("MED BOX") }, Literal { value: Utf8("MED PKG") }, Literal { value: Utf8("MED PACK") }]) AND p_size@2 <= 10 OR p_brand@1 = Brand#34 AND Use p_container@3 IN (SET) ([Literal { value: Utf8("LG CASE") }, Literal { value: Utf8("LG BOX") }, Literal { value: Utf8("LG PACK") }, Literal { value: Utf8("LG PKG") }]) AND p_size@2 <= 15) AND p_size@2 >= 1 ----------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_brand, p_size, p_container], has_header=false +------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_brand, p_size, p_container], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q2.slt.part b/datafusion/sqllogictest/test_files/tpch/q2.slt.part similarity index 88% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q2.slt.part rename to datafusion/sqllogictest/test_files/tpch/q2.slt.part index 3ad63f482a3a..f98634033bf8 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q2.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q2.slt.part @@ -132,25 +132,25 @@ GlobalLimitExec: skip=0, fetch=10 ----------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------------------------FilterExec: p_size@3 = 15 AND p_type@2 LIKE %BRASS --------------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_mfgr, p_type, p_size], has_header=false +----------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_mfgr, p_type, p_size], has_header=false ----------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------------------RepartitionExec: partitioning=Hash([ps_partkey@0], 4), input_partitions=4 ---------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_supplycost], has_header=false +--------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_supplycost], has_header=false ------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 ----------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_name, s_address, s_nationkey, s_phone, s_acctbal, s_comment], has_header=false +------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_name, s_address, s_nationkey, s_phone, s_acctbal, s_comment], has_header=false --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 ------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name, n_regionkey], has_header=false +--------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name, n_regionkey], has_header=false ----------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------RepartitionExec: partitioning=Hash([r_regionkey@0], 4), input_partitions=4 --------------------------ProjectionExec: expr=[r_regionkey@0 as r_regionkey] ----------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------FilterExec: r_name@1 = EUROPE --------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/region.tbl]]}, projection=[r_regionkey, r_name], has_header=false +----------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/region.tbl]]}, projection=[r_regionkey, r_name], has_header=false ------------CoalesceBatchesExec: target_batch_size=8192 --------------RepartitionExec: partitioning=Hash([ps_partkey@1, MIN(partsupp.ps_supplycost)@0], 4), input_partitions=4 ----------------ProjectionExec: expr=[MIN(partsupp.ps_supplycost)@1 as MIN(partsupp.ps_supplycost), ps_partkey@0 as ps_partkey] @@ -173,22 +173,22 @@ GlobalLimitExec: skip=0, fetch=10 --------------------------------------------------HashJoinExec: mode=Partitioned, join_type=Inner, on=[(ps_suppkey@1, s_suppkey@0)] ----------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------------------RepartitionExec: partitioning=Hash([ps_suppkey@1], 4), input_partitions=4 ---------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_supplycost], has_header=false +--------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_supplycost], has_header=false ----------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 --------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false +----------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false ------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 ----------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_regionkey], has_header=false +------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_regionkey], has_header=false --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------RepartitionExec: partitioning=Hash([r_regionkey@0], 4), input_partitions=4 ------------------------------------ProjectionExec: expr=[r_regionkey@0 as r_regionkey] --------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------FilterExec: r_name@1 = EUROPE ------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/region.tbl]]}, projection=[r_regionkey, r_name], has_header=false +--------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/region.tbl]]}, projection=[r_regionkey, r_name], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q20.slt.part b/datafusion/sqllogictest/test_files/tpch/q20.slt.part similarity index 86% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q20.slt.part rename to datafusion/sqllogictest/test_files/tpch/q20.slt.part index 16ef6ce83b7a..e014c6cafd98 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q20.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q20.slt.part @@ -94,14 +94,14 @@ SortPreservingMergeExec: [s_name@0 ASC NULLS LAST] --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------RepartitionExec: partitioning=Hash([s_nationkey@3], 4), input_partitions=4 ------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_name, s_address, s_nationkey], has_header=false +--------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_name, s_address, s_nationkey], has_header=false --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 ------------------------ProjectionExec: expr=[n_nationkey@0 as n_nationkey] --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------FilterExec: n_name@1 = CANADA ------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false +--------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false ----------CoalesceBatchesExec: target_batch_size=8192 ------------RepartitionExec: partitioning=Hash([ps_suppkey@0], 4), input_partitions=4 --------------ProjectionExec: expr=[ps_suppkey@1 as ps_suppkey] @@ -113,14 +113,14 @@ SortPreservingMergeExec: [s_name@0 ASC NULLS LAST] --------------------------HashJoinExec: mode=Partitioned, join_type=LeftSemi, on=[(ps_partkey@0, p_partkey@0)] ----------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------RepartitionExec: partitioning=Hash([ps_partkey@0], 4), input_partitions=4 ---------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_availqty], has_header=false +--------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_availqty], has_header=false ----------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------RepartitionExec: partitioning=Hash([p_partkey@0], 4), input_partitions=4 --------------------------------ProjectionExec: expr=[p_partkey@0 as p_partkey] ----------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------FilterExec: p_name@1 LIKE forest% --------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_name], has_header=false +----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_name], has_header=false --------------------ProjectionExec: expr=[0.5 * CAST(SUM(lineitem.l_quantity)@2 AS Float64) as Float64(0.5) * SUM(lineitem.l_quantity), l_partkey@0 as l_partkey, l_suppkey@1 as l_suppkey] ----------------------AggregateExec: mode=FinalPartitioned, gby=[l_partkey@0 as l_partkey, l_suppkey@1 as l_suppkey], aggr=[SUM(lineitem.l_quantity)] ------------------------CoalesceBatchesExec: target_batch_size=8192 @@ -129,7 +129,7 @@ SortPreservingMergeExec: [s_name@0 ASC NULLS LAST] ------------------------------ProjectionExec: expr=[l_partkey@0 as l_partkey, l_suppkey@1 as l_suppkey, l_quantity@2 as l_quantity] --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------FilterExec: l_shipdate@3 >= 8766 AND l_shipdate@3 < 9131 -------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_suppkey, l_quantity, l_shipdate], has_header=false +------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_partkey, l_suppkey, l_quantity, l_shipdate], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q21.slt.part b/datafusion/sqllogictest/test_files/tpch/q21.slt.part similarity index 83% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q21.slt.part rename to datafusion/sqllogictest/test_files/tpch/q21.slt.part index 24004d187de6..147afc603c2c 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q21.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q21.slt.part @@ -120,35 +120,35 @@ SortPreservingMergeExec: [numwait@1 DESC,s_name@0 ASC NULLS LAST] ------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 ----------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_name, s_nationkey], has_header=false +------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_name, s_nationkey], has_header=false ------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------------RepartitionExec: partitioning=Hash([l_suppkey@1], 4), input_partitions=4 ----------------------------------------------------------ProjectionExec: expr=[l_orderkey@0 as l_orderkey, l_suppkey@1 as l_suppkey] ------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------------------FilterExec: l_receiptdate@3 > l_commitdate@2 -----------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey, l_commitdate, l_receiptdate], has_header=false +----------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey, l_commitdate, l_receiptdate], has_header=false --------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------------RepartitionExec: partitioning=Hash([o_orderkey@0], 4), input_partitions=4 ------------------------------------------------ProjectionExec: expr=[o_orderkey@0 as o_orderkey] --------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------------------FilterExec: o_orderstatus@1 = F -------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_orderstatus], has_header=false +------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_orderstatus], has_header=false ----------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 --------------------------------------ProjectionExec: expr=[n_nationkey@0 as n_nationkey] ----------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------FilterExec: n_name@1 = SAUDI ARABIA --------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false +----------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false ------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------RepartitionExec: partitioning=Hash([l_orderkey@0], 4), input_partitions=4 -----------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey], has_header=false +----------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey], has_header=false --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------RepartitionExec: partitioning=Hash([l_orderkey@0], 4), input_partitions=4 ------------------------ProjectionExec: expr=[l_orderkey@0 as l_orderkey, l_suppkey@1 as l_suppkey] --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------FilterExec: l_receiptdate@3 > l_commitdate@2 -------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey, l_commitdate, l_receiptdate], has_header=false +------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey, l_commitdate, l_receiptdate], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q22.slt.part b/datafusion/sqllogictest/test_files/tpch/q22.slt.part similarity index 90% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q22.slt.part rename to datafusion/sqllogictest/test_files/tpch/q22.slt.part index 7ab66d1783ea..2713d5bf6e18 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q22.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q22.slt.part @@ -91,10 +91,10 @@ SortPreservingMergeExec: [cntrycode@0 ASC NULLS LAST] ----------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------FilterExec: Use substr(c_phone@1, 1, 2) IN (SET) ([Literal { value: Utf8("13") }, Literal { value: Utf8("31") }, Literal { value: Utf8("23") }, Literal { value: Utf8("29") }, Literal { value: Utf8("30") }, Literal { value: Utf8("18") }, Literal { value: Utf8("17") }]) --------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_phone, c_acctbal], has_header=false +----------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_phone, c_acctbal], has_header=false ------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------RepartitionExec: partitioning=Hash([o_custkey@0], 4), input_partitions=4 -----------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_custkey], has_header=false +----------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_custkey], has_header=false ------------------AggregateExec: mode=Final, gby=[], aggr=[AVG(customer.c_acctbal)] --------------------CoalescePartitionsExec ----------------------AggregateExec: mode=Partial, gby=[], aggr=[AVG(customer.c_acctbal)] @@ -102,7 +102,7 @@ SortPreservingMergeExec: [cntrycode@0 ASC NULLS LAST] --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------FilterExec: c_acctbal@1 > Some(0),15,2 AND Use substr(c_phone@0, 1, 2) IN (SET) ([Literal { value: Utf8("13") }, Literal { value: Utf8("31") }, Literal { value: Utf8("23") }, Literal { value: Utf8("29") }, Literal { value: Utf8("30") }, Literal { value: Utf8("18") }, Literal { value: Utf8("17") }]) ------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_phone, c_acctbal], has_header=false +--------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/customer.tbl]]}, projection=[c_phone, c_acctbal], has_header=false query TIR diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q3.slt.part b/datafusion/sqllogictest/test_files/tpch/q3.slt.part similarity index 85% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q3.slt.part rename to datafusion/sqllogictest/test_files/tpch/q3.slt.part index 91af8b77996d..634f06d0bf50 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q3.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q3.slt.part @@ -81,18 +81,18 @@ GlobalLimitExec: skip=0, fetch=10 --------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------FilterExec: c_mktsegment@1 = BUILDING ------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_mktsegment], has_header=false +--------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_mktsegment], has_header=false --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------RepartitionExec: partitioning=Hash([o_custkey@1], 4), input_partitions=4 ------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------FilterExec: o_orderdate@2 < 9204 -----------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_orderdate, o_shippriority], has_header=false +----------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_orderdate, o_shippriority], has_header=false ----------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------RepartitionExec: partitioning=Hash([l_orderkey@0], 4), input_partitions=4 --------------------------ProjectionExec: expr=[l_orderkey@0 as l_orderkey, l_extendedprice@1 as l_extendedprice, l_discount@2 as l_discount] ----------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------FilterExec: l_shipdate@3 > 9204 ---------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_extendedprice, l_discount, l_shipdate], has_header=false +--------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_extendedprice, l_discount, l_shipdate], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q4.slt.part b/datafusion/sqllogictest/test_files/tpch/q4.slt.part similarity index 81% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q4.slt.part rename to datafusion/sqllogictest/test_files/tpch/q4.slt.part index d609b1488e49..690ef64bc28d 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q4.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q4.slt.part @@ -68,13 +68,13 @@ SortPreservingMergeExec: [o_orderpriority@0 ASC NULLS LAST] ------------------------ProjectionExec: expr=[o_orderkey@0 as o_orderkey, o_orderpriority@2 as o_orderpriority] --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------FilterExec: o_orderdate@1 >= 8582 AND o_orderdate@1 < 8674 -------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_orderdate, o_orderpriority], has_header=false +------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_orderdate, o_orderpriority], has_header=false --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------RepartitionExec: partitioning=Hash([l_orderkey@0], 4), input_partitions=4 ------------------------ProjectionExec: expr=[l_orderkey@0 as l_orderkey] --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------FilterExec: l_commitdate@1 < l_receiptdate@2 -------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_commitdate, l_receiptdate], has_header=false +------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_commitdate, l_receiptdate], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q5.slt.part b/datafusion/sqllogictest/test_files/tpch/q5.slt.part similarity index 86% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q5.slt.part rename to datafusion/sqllogictest/test_files/tpch/q5.slt.part index c7e8607e0398..af3a33497026 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q5.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q5.slt.part @@ -100,31 +100,31 @@ SortPreservingMergeExec: [revenue@1 DESC] ------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------------------RepartitionExec: partitioning=Hash([c_custkey@0], 4), input_partitions=4 ----------------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_nationkey], has_header=false +------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_nationkey], has_header=false ------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------------------RepartitionExec: partitioning=Hash([o_custkey@1], 4), input_partitions=4 ----------------------------------------------------------------ProjectionExec: expr=[o_orderkey@0 as o_orderkey, o_custkey@1 as o_custkey] ------------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------------------------FilterExec: o_orderdate@2 >= 8766 AND o_orderdate@2 < 9131 -----------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_orderdate], has_header=false +----------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_orderdate], has_header=false --------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------------------RepartitionExec: partitioning=Hash([l_orderkey@0], 4), input_partitions=4 -------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey, l_extendedprice, l_discount], has_header=false +------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey, l_extendedprice, l_discount], has_header=false ----------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0, s_nationkey@1], 4), input_partitions=4 --------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false +----------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false ------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 ----------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name, n_regionkey], has_header=false +------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name, n_regionkey], has_header=false --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------RepartitionExec: partitioning=Hash([r_regionkey@0], 4), input_partitions=4 ------------------------ProjectionExec: expr=[r_regionkey@0 as r_regionkey] --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------FilterExec: r_name@1 = ASIA ------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/region.tbl]]}, projection=[r_regionkey, r_name], has_header=false +--------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/region.tbl]]}, projection=[r_regionkey, r_name], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q6.slt.part b/datafusion/sqllogictest/test_files/tpch/q6.slt.part similarity index 85% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q6.slt.part rename to datafusion/sqllogictest/test_files/tpch/q6.slt.part index 9acaee2aa61f..8e53be297db0 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q6.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q6.slt.part @@ -41,7 +41,7 @@ ProjectionExec: expr=[SUM(lineitem.l_extendedprice * lineitem.l_discount)@0 as r --------ProjectionExec: expr=[l_extendedprice@1 as l_extendedprice, l_discount@2 as l_discount] ----------CoalesceBatchesExec: target_batch_size=8192 ------------FilterExec: l_shipdate@3 >= 8766 AND l_shipdate@3 < 9131 AND l_discount@2 >= Some(5),15,2 AND l_discount@2 <= Some(7),15,2 AND l_quantity@0 < Some(2400),15,2 ---------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_quantity, l_extendedprice, l_discount, l_shipdate], has_header=false +--------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_quantity, l_extendedprice, l_discount, l_shipdate], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q7.slt.part b/datafusion/sqllogictest/test_files/tpch/q7.slt.part similarity index 88% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q7.slt.part rename to datafusion/sqllogictest/test_files/tpch/q7.slt.part index 991499813c00..5186c46a896f 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q7.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q7.slt.part @@ -117,31 +117,31 @@ SortPreservingMergeExec: [supp_nation@0 ASC NULLS LAST,cust_nation@1 ASC NULLS L ------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 ----------------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false +------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false ------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------------------RepartitionExec: partitioning=Hash([l_suppkey@1], 4), input_partitions=4 ----------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------------------------------FilterExec: l_shipdate@4 >= 9131 AND l_shipdate@4 <= 9861 ---------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey, l_extendedprice, l_discount, l_shipdate], has_header=false +--------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_suppkey, l_extendedprice, l_discount, l_shipdate], has_header=false --------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------------------RepartitionExec: partitioning=Hash([o_orderkey@0], 4), input_partitions=4 -------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey], has_header=false +------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey], has_header=false ----------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------RepartitionExec: partitioning=Hash([c_custkey@0], 4), input_partitions=4 --------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_nationkey], has_header=false +----------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_nationkey], has_header=false ------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 ----------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------FilterExec: n_name@1 = FRANCE OR n_name@1 = GERMANY --------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false +----------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 ------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------FilterExec: n_name@1 = GERMANY OR n_name@1 = FRANCE ----------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false +------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q8.slt.part b/datafusion/sqllogictest/test_files/tpch/q8.slt.part similarity index 89% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q8.slt.part rename to datafusion/sqllogictest/test_files/tpch/q8.slt.part index 96f13b2a341d..760b40ad1ae8 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q8.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q8.slt.part @@ -136,38 +136,38 @@ SortPreservingMergeExec: [o_year@0 ASC NULLS LAST] --------------------------------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------------------------------------------------------FilterExec: p_type@1 = ECONOMY ANODIZED STEEL ------------------------------------------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_type], has_header=false +--------------------------------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_type], has_header=false --------------------------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------------------------------------------------RepartitionExec: partitioning=Hash([l_partkey@1], 4), input_partitions=4 -------------------------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_partkey, l_suppkey, l_extendedprice, l_discount], has_header=false +------------------------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_partkey, l_suppkey, l_extendedprice, l_discount], has_header=false ----------------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 --------------------------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false +----------------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false ------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------------------------RepartitionExec: partitioning=Hash([o_orderkey@0], 4), input_partitions=4 ----------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------------------------------FilterExec: o_orderdate@2 >= 9131 AND o_orderdate@2 <= 9861 ---------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_orderdate], has_header=false +--------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_orderdate], has_header=false --------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------------------RepartitionExec: partitioning=Hash([c_custkey@0], 4), input_partitions=4 ------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_nationkey], has_header=false +--------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey, c_nationkey], has_header=false ----------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 --------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_regionkey], has_header=false +----------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_regionkey], has_header=false ------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 ----------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false +------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false --------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------RepartitionExec: partitioning=Hash([r_regionkey@0], 4), input_partitions=4 ------------------------ProjectionExec: expr=[r_regionkey@0 as r_regionkey] --------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------FilterExec: r_name@1 = AMERICA ------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/region.tbl]]}, projection=[r_regionkey, r_name], has_header=false +--------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/region.tbl]]}, projection=[r_regionkey, r_name], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/q9.slt.part b/datafusion/sqllogictest/test_files/tpch/q9.slt.part similarity index 85% rename from datafusion/core/tests/sqllogictests/test_files/tpch/q9.slt.part rename to datafusion/sqllogictest/test_files/tpch/q9.slt.part index 2feaef32cf4b..fc5f82008dad 100644 --- a/datafusion/core/tests/sqllogictests/test_files/tpch/q9.slt.part +++ b/datafusion/sqllogictest/test_files/tpch/q9.slt.part @@ -113,24 +113,24 @@ GlobalLimitExec: skip=0, fetch=10 --------------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------------------------------------FilterExec: p_name@1 LIKE %green% ------------------------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 ---------------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_name], has_header=false +--------------------------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/part.tbl]]}, projection=[p_partkey, p_name], has_header=false --------------------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------------------------------------RepartitionExec: partitioning=Hash([l_partkey@1], 4), input_partitions=4 -------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_partkey, l_suppkey, l_quantity, l_extendedprice, l_discount], has_header=false +------------------------------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_orderkey, l_partkey, l_suppkey, l_quantity, l_extendedprice, l_discount], has_header=false ----------------------------------------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------------------------------------RepartitionExec: partitioning=Hash([s_suppkey@0], 4), input_partitions=4 --------------------------------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false +----------------------------------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/supplier.tbl]]}, projection=[s_suppkey, s_nationkey], has_header=false ------------------------------------------CoalesceBatchesExec: target_batch_size=8192 --------------------------------------------RepartitionExec: partitioning=Hash([ps_suppkey@1, ps_partkey@0], 4), input_partitions=4 -----------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_supplycost], has_header=false +----------------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:0..2932049], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:2932049..5864098], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:5864098..8796147], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/partsupp.tbl:8796147..11728193]]}, projection=[ps_partkey, ps_suppkey, ps_supplycost], has_header=false --------------------------------CoalesceBatchesExec: target_batch_size=8192 ----------------------------------RepartitionExec: partitioning=Hash([o_orderkey@0], 4), input_partitions=4 -------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_orderdate], has_header=false +------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_orderdate], has_header=false ----------------------CoalesceBatchesExec: target_batch_size=8192 ------------------------RepartitionExec: partitioning=Hash([n_nationkey@0], 4), input_partitions=4 --------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1 -----------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false +----------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/tpch/data/nation.tbl]]}, projection=[n_nationkey, n_name], has_header=false diff --git a/datafusion/core/tests/sqllogictests/test_files/tpch/tpch.slt b/datafusion/sqllogictest/test_files/tpch/tpch.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/tpch/tpch.slt rename to datafusion/sqllogictest/test_files/tpch/tpch.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/type_coercion.slt b/datafusion/sqllogictest/test_files/type_coercion.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/type_coercion.slt rename to datafusion/sqllogictest/test_files/type_coercion.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/union.slt b/datafusion/sqllogictest/test_files/union.slt similarity index 100% rename from datafusion/core/tests/sqllogictests/test_files/union.slt rename to datafusion/sqllogictest/test_files/union.slt diff --git a/datafusion/core/tests/sqllogictests/test_files/wildcard.slt b/datafusion/sqllogictest/test_files/wildcard.slt similarity index 98% rename from datafusion/core/tests/sqllogictests/test_files/wildcard.slt rename to datafusion/sqllogictest/test_files/wildcard.slt index cc43ff4376e6..f83e84804a37 100644 --- a/datafusion/core/tests/sqllogictests/test_files/wildcard.slt +++ b/datafusion/sqllogictest/test_files/wildcard.slt @@ -41,7 +41,7 @@ CREATE EXTERNAL TABLE aggregate_simple ( ) STORED AS CSV WITH HEADER ROW -LOCATION 'tests/data/aggregate_simple.csv' +LOCATION '../core/tests/data/aggregate_simple.csv' ########## diff --git a/datafusion/core/tests/sqllogictests/test_files/window.slt b/datafusion/sqllogictest/test_files/window.slt similarity index 99% rename from datafusion/core/tests/sqllogictests/test_files/window.slt rename to datafusion/sqllogictest/test_files/window.slt index cd257aaa92de..36bb0d4628f7 100644 --- a/datafusion/core/tests/sqllogictests/test_files/window.slt +++ b/datafusion/sqllogictest/test_files/window.slt @@ -43,13 +43,13 @@ CREATE EXTERNAL TABLE null_cases( ) STORED AS CSV WITH HEADER ROW -LOCATION 'tests/data/null_cases.csv'; +LOCATION '../core/tests/data/null_cases.csv'; ### This is the same table as ### execute_with_partition with 4 partitions statement ok CREATE EXTERNAL TABLE test (c1 int, c2 bigint, c3 boolean) -STORED AS CSV LOCATION 'tests/data/partitioned_csv'; +STORED AS CSV LOCATION '../core/tests/data/partitioned_csv'; # for window functions without order by the first, last, and nth function call does not make sense @@ -2486,7 +2486,7 @@ CREATE EXTERNAL TABLE annotated_data_finite ( STORED AS CSV WITH HEADER ROW WITH ORDER (ts ASC) -LOCATION 'tests/data/window_1.csv' +LOCATION '../core/tests/data/window_1.csv' ; # 100 rows. Columns in the table are ts, inc_col, desc_col. @@ -2501,7 +2501,7 @@ CREATE UNBOUNDED EXTERNAL TABLE annotated_data_infinite ( STORED AS CSV WITH HEADER ROW WITH ORDER (ts ASC) -LOCATION 'tests/data/window_1.csv'; +LOCATION '../core/tests/data/window_1.csv'; # test_source_sorted_aggregate @@ -2901,7 +2901,7 @@ CREATE EXTERNAL TABLE annotated_data_finite2 ( STORED AS CSV WITH HEADER ROW WITH ORDER (a ASC, b ASC, c ASC) -LOCATION 'tests/data/window_2.csv'; +LOCATION '../core/tests/data/window_2.csv'; # Columns in the table are a,b,c,d. Source is CsvExec which is ordered by # a,b,c column. Column a has cardinality 2, column b has cardinality 4. @@ -2917,7 +2917,7 @@ CREATE UNBOUNDED EXTERNAL TABLE annotated_data_infinite2 ( STORED AS CSV WITH HEADER ROW WITH ORDER (a ASC, b ASC, c ASC) -LOCATION 'tests/data/window_2.csv'; +LOCATION '../core/tests/data/window_2.csv'; # test_infinite_source_partition_by