From 662902a0498a578f2f526715559877a54999f272 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 23 Jan 2023 06:43:38 -0500 Subject: [PATCH 1/2] Remove python based posgres comparsion function --- .github/workflows/rust.yml | 64 ---------- integration-tests/README.md | 49 -------- integration-tests/__init__.py | 15 --- integration-tests/create_test_table.sql | 34 ------ .../create_test_table_postgres.sql | 15 --- integration-tests/requirements.in | 18 --- integration-tests/requirements.txt | 114 ------------------ integration-tests/sqls/character_length.sql | 17 --- .../partitioned_window_built_in_functions.sql | 29 ----- .../sqls/self_join_with_alias.sql | 22 ---- integration-tests/sqls/simple_aggregation.sql | 24 ---- integration-tests/sqls/simple_except.sql | 25 ---- integration-tests/sqls/simple_except_all.sql | 25 ---- integration-tests/sqls/simple_group_by.sql | 27 ----- integration-tests/sqls/simple_intersect.sql | 25 ---- .../sqls/simple_intersect_all.sql | 25 ---- .../sqls/simple_math_expressions.sql | 22 ---- integration-tests/sqls/simple_ordered_row.sql | 26 ---- .../sqls/simple_row_past_future.sql | 24 ---- integration-tests/sqls/simple_select.sql | 17 --- integration-tests/sqls/simple_sort.sql | 22 ---- .../sqls/simple_sort_nulls_order.sql | 22 ---- integration-tests/sqls/simple_union_all.sql | 17 --- .../sqls/simple_window_built_in_functions.sql | 29 ----- .../sqls/simple_window_full_aggregation.sql | 25 ---- .../sqls/simple_window_groups.sql | 71 ----------- .../simple_window_lead_built_in_functions.sql | 27 ----- .../simple_window_ordered_aggregation.sql | 26 ---- .../simple_window_partition_aggregation.sql | 26 ---- ...ple_window_partition_order_aggregation.sql | 26 ---- .../sqls/simple_window_range.sql | 29 ----- ...imple_window_ranked_built_in_functions.sql | 24 ---- integration-tests/sqls/values_list.sql | 19 --- integration-tests/test_psql_parity.py | 91 -------------- 34 files changed, 1071 deletions(-) delete mode 100644 integration-tests/README.md delete mode 100644 integration-tests/__init__.py delete mode 100644 integration-tests/create_test_table.sql delete mode 100644 integration-tests/create_test_table_postgres.sql delete mode 100644 integration-tests/requirements.in delete mode 100644 integration-tests/requirements.txt delete mode 100644 integration-tests/sqls/character_length.sql delete mode 100644 integration-tests/sqls/partitioned_window_built_in_functions.sql delete mode 100644 integration-tests/sqls/self_join_with_alias.sql delete mode 100644 integration-tests/sqls/simple_aggregation.sql delete mode 100644 integration-tests/sqls/simple_except.sql delete mode 100644 integration-tests/sqls/simple_except_all.sql delete mode 100644 integration-tests/sqls/simple_group_by.sql delete mode 100644 integration-tests/sqls/simple_intersect.sql delete mode 100644 integration-tests/sqls/simple_intersect_all.sql delete mode 100644 integration-tests/sqls/simple_math_expressions.sql delete mode 100644 integration-tests/sqls/simple_ordered_row.sql delete mode 100644 integration-tests/sqls/simple_row_past_future.sql delete mode 100644 integration-tests/sqls/simple_select.sql delete mode 100644 integration-tests/sqls/simple_sort.sql delete mode 100644 integration-tests/sqls/simple_sort_nulls_order.sql delete mode 100644 integration-tests/sqls/simple_union_all.sql delete mode 100644 integration-tests/sqls/simple_window_built_in_functions.sql delete mode 100644 integration-tests/sqls/simple_window_full_aggregation.sql delete mode 100644 integration-tests/sqls/simple_window_groups.sql delete mode 100644 integration-tests/sqls/simple_window_lead_built_in_functions.sql delete mode 100644 integration-tests/sqls/simple_window_ordered_aggregation.sql delete mode 100644 integration-tests/sqls/simple_window_partition_aggregation.sql delete mode 100644 integration-tests/sqls/simple_window_partition_order_aggregation.sql delete mode 100644 integration-tests/sqls/simple_window_range.sql delete mode 100644 integration-tests/sqls/simple_window_ranked_built_in_functions.sql delete mode 100644 integration-tests/sqls/values_list.sql delete mode 100644 integration-tests/test_psql_parity.py diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3f466ae0795c..4e4decc5e16e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -164,70 +164,6 @@ jobs: - name: Verify Working Directory Clean run: git diff --exit-code - integration-test: - name: "Compare to postgres" - needs: [linux-build-lib] - runs-on: ubuntu-latest - services: - postgres: - image: postgres:15 - env: - POSTGRES_PASSWORD: postgres - POSTGRES_DB: db_test - POSTGRES_INITDB_ARGS: --encoding=UTF-8 --lc-collate=C --lc-ctype=C - ports: - - 5432/tcp - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - steps: - - uses: actions/checkout@v3 - with: - submodules: true - - name: Setup toolchain - run: | - rustup toolchain install stable - rustup default stable - - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Install Python dependencies - run: | - python -m pip install --upgrade pip wheel - # setuptools is normally only intended to serve as a build-time dependency - # but since numpy uses it internally and currently accessing methods that - # are removed from newer versions of setuptools we have a pin on it as well. - # - # TODO: this should be removed as soon as https://github.com/numpy/numpy/issues/22623 - # is resolved and numpy version in integration-tests/requirements.txt is updated. - python -m pip install --upgrade "setuptools<=65.5.1" - python -m pip install -r integration-tests/requirements.txt - - name: Allow access of psql - run: | - # make sure psql can access the server - echo "$POSTGRES_HOST:$POSTGRES_PORT:$POSTGRES_DB:$POSTGRES_USER:$POSTGRES_PASSWORD" | tee ~/.pgpass - chmod 0600 ~/.pgpass - psql -d "$POSTGRES_DB" -h "$POSTGRES_HOST" -p "$POSTGRES_PORT" -U "$POSTGRES_USER" -f integration-tests/create_test_table_postgres.sql - psql -d "$POSTGRES_DB" -h "$POSTGRES_HOST" -p "$POSTGRES_PORT" -U "$POSTGRES_USER" -c "\copy test FROM '$(pwd)/testing/data/csv/aggregate_test_100.csv' WITH (FORMAT csv, HEADER true);" - env: - POSTGRES_HOST: localhost - POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }} - POSTGRES_DB: db_test - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - - name: Build datafusion-cli - run: (cd datafusion-cli && cargo build) - - name: Test Psql Parity - run: python -m pytest -v integration-tests/test_psql_parity.py - env: - POSTGRES_HOST: localhost - POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }} - POSTGRES_DB: db_test - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - sqllogictest-postgres: name: "Run sqllogictest with Postgres runner" needs: [linux-build-lib] diff --git a/integration-tests/README.md b/integration-tests/README.md deleted file mode 100644 index b97c9ac61500..000000000000 --- a/integration-tests/README.md +++ /dev/null @@ -1,49 +0,0 @@ - - -# DataFusion Integration Tests - -These test run SQL queries against both DataFusion and Postgres and compare the results for parity. - -## Setup - -Set the following environment variables as appropriate for your environment. They are all optional. - -- `POSTGRES_DB` -- `POSTGRES_USER` -- `POSTGRES_HOST` -- `POSTGRES_PORT` - -Create a Postgres database and then create the test table by running this script: - -```bash -psql -d "$POSTGRES_DB" -h "$POSTGRES_HOST" -p "$POSTGRES_PORT" -U "$POSTGRES_USER" \ - -f create_test_table_postgres.sql -``` - -Populate the table by running this command: - -```bash -psql -d "$POSTGRES_DB" -h "$POSTGRES_HOST" -p "$POSTGRES_PORT" -U "$POSTGRES_USER" \ - -c "\copy test FROM '$(pwd)/testing/data/csv/aggregate_test_100.csv' WITH (FORMAT csv, HEADER true);" -``` - -## Run Tests - -Run `pytest` from the root of the repository. diff --git a/integration-tests/__init__.py b/integration-tests/__init__.py deleted file mode 100644 index 8516388ee621..000000000000 --- a/integration-tests/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/integration-tests/create_test_table.sql b/integration-tests/create_test_table.sql deleted file mode 100644 index 580ca0a2af4f..000000000000 --- a/integration-tests/create_test_table.sql +++ /dev/null @@ -1,34 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -CREATE EXTERNAL TABLE test ( - c1 VARCHAR NOT NULL, - c2 INT NOT NULL, - c3 SMALLINT NOT NULL, - c4 SMALLINT, - c5 INT, - c6 BIGINT NOT NULL, - c7 SMALLINT NOT NULL, - c8 INT NOT NULL, - c9 BIGINT NOT NULL, - c10 VARCHAR NOT NULL, - c11 FLOAT NOT NULL, - c12 DOUBLE NOT NULL, - c13 VARCHAR NOT NULL -) -STORED AS CSV -WITH HEADER ROW -LOCATION 'testing/data/csv/aggregate_test_100.csv'; diff --git a/integration-tests/create_test_table_postgres.sql b/integration-tests/create_test_table_postgres.sql deleted file mode 100644 index 0d2b2fa8c8d3..000000000000 --- a/integration-tests/create_test_table_postgres.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE IF NOT EXISTS test ( -c1 character varying NOT NULL, -c2 integer NOT NULL, -c3 smallint NOT NULL, -c4 smallint, -c5 integer, -c6 bigint NOT NULL, -c7 smallint NOT NULL, -c8 integer NOT NULL, -c9 bigint NOT NULL, -c10 character varying NOT NULL, -c11 double precision NOT NULL, -c12 double precision NOT NULL, -c13 character varying NOT NULL -); \ No newline at end of file diff --git a/integration-tests/requirements.in b/integration-tests/requirements.in deleted file mode 100644 index 782329d05e36..000000000000 --- a/integration-tests/requirements.in +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -pytest -numpy -pandas diff --git a/integration-tests/requirements.txt b/integration-tests/requirements.txt deleted file mode 100644 index a2388c1c9dbc..000000000000 --- a/integration-tests/requirements.txt +++ /dev/null @@ -1,114 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: -# -# pip-compile --generate-hashes -# -attrs==21.2.0 \ - --hash=sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1 \ - --hash=sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb - # via pytest -iniconfig==1.1.1 \ - --hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \ - --hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32 - # via pytest -numpy==1.22.0 \ - --hash=sha256:0cfe07133fd00b27edee5e6385e333e9eeb010607e8a46e1cd673f05f8596595 \ - --hash=sha256:11a1f3816ea82eed4178102c56281782690ab5993251fdfd75039aad4d20385f \ - --hash=sha256:2762331de395739c91f1abb88041f94a080cb1143aeec791b3b223976228af3f \ - --hash=sha256:283d9de87c0133ef98f93dfc09fad3fb382f2a15580de75c02b5bb36a5a159a5 \ - --hash=sha256:3d22662b4b10112c545c91a0741f2436f8ca979ab3d69d03d19322aa970f9695 \ - --hash=sha256:41388e32e40b41dd56eb37fcaa7488b2b47b0adf77c66154d6b89622c110dfe9 \ - --hash=sha256:42c16cec1c8cf2728f1d539bd55aaa9d6bb48a7de2f41eb944697293ef65a559 \ - --hash=sha256:47ee7a839f5885bc0c63a74aabb91f6f40d7d7b639253768c4199b37aede7982 \ - --hash=sha256:5a311ee4d983c487a0ab546708edbdd759393a3dc9cd30305170149fedd23c88 \ - --hash=sha256:5dc65644f75a4c2970f21394ad8bea1a844104f0fe01f278631be1c7eae27226 \ - --hash=sha256:6ed0d073a9c54ac40c41a9c2d53fcc3d4d4ed607670b9e7b0de1ba13b4cbfe6f \ - --hash=sha256:76ba7c40e80f9dc815c5e896330700fd6e20814e69da9c1267d65a4d051080f1 \ - --hash=sha256:818b9be7900e8dc23e013a92779135623476f44a0de58b40c32a15368c01d471 \ - --hash=sha256:a024181d7aef0004d76fb3bce2a4c9f2e67a609a9e2a6ff2571d30e9976aa383 \ - --hash=sha256:a955e4128ac36797aaffd49ab44ec74a71c11d6938df83b1285492d277db5397 \ - --hash=sha256:a97a954a8c2f046d3817c2bce16e3c7e9a9c2afffaf0400f5c16df5172a67c9c \ - --hash=sha256:a97e82c39d9856fe7d4f9b86d8a1e66eff99cf3a8b7ba48202f659703d27c46f \ - --hash=sha256:b55b953a1bdb465f4dc181758570d321db4ac23005f90ffd2b434cc6609a63dd \ - --hash=sha256:bb02929b0d6bfab4c48a79bd805bd7419114606947ec8284476167415171f55b \ - --hash=sha256:bece0a4a49e60e472a6d1f70ac6cdea00f9ab80ff01132f96bd970cdd8a9e5a9 \ - --hash=sha256:e41e8951749c4b5c9a2dc5fdbc1a4eec6ab2a140fdae9b460b0f557eed870f4d \ - --hash=sha256:f71d57cc8645f14816ae249407d309be250ad8de93ef61d9709b45a0ddf4050c - # via - # -r requirements.in - # pandas -packaging==21.0 \ - --hash=sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7 \ - --hash=sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14 - # via pytest -pandas==1.3.4 \ - --hash=sha256:003ba92db58b71a5f8add604a17a059f3068ef4e8c0c365b088468d0d64935fd \ - --hash=sha256:10e10a2527db79af6e830c3d5842a4d60383b162885270f8cffc15abca4ba4a9 \ - --hash=sha256:22808afb8f96e2269dcc5b846decacb2f526dd0b47baebc63d913bf847317c8f \ - --hash=sha256:2d1dc09c0013d8faa7474574d61b575f9af6257ab95c93dcf33a14fd8d2c1bab \ - --hash=sha256:35c77609acd2e4d517da41bae0c11c70d31c87aae8dd1aabd2670906c6d2c143 \ - --hash=sha256:372d72a3d8a5f2dbaf566a5fa5fa7f230842ac80f29a931fb4b071502cf86b9a \ - --hash=sha256:42493f8ae67918bf129869abea8204df899902287a7f5eaf596c8e54e0ac7ff4 \ - --hash=sha256:5298a733e5bfbb761181fd4672c36d0c627320eb999c59c65156c6a90c7e1b4f \ - --hash=sha256:5ba0aac1397e1d7b654fccf263a4798a9e84ef749866060d19e577e927d66e1b \ - --hash=sha256:a2aa18d3f0b7d538e21932f637fbfe8518d085238b429e4790a35e1e44a96ffc \ - --hash=sha256:a388960f979665b447f0847626e40f99af8cf191bce9dc571d716433130cb3a7 \ - --hash=sha256:a51528192755f7429c5bcc9e80832c517340317c861318fea9cea081b57c9afd \ - --hash=sha256:b528e126c13816a4374e56b7b18bfe91f7a7f6576d1aadba5dee6a87a7f479ae \ - --hash=sha256:c1aa4de4919358c5ef119f6377bc5964b3a7023c23e845d9db7d9016fa0c5b1c \ - --hash=sha256:c2646458e1dce44df9f71a01dc65f7e8fa4307f29e5c0f2f92c97f47a5bf22f5 \ - --hash=sha256:d47750cf07dee6b55d8423471be70d627314277976ff2edd1381f02d52dbadf9 \ - --hash=sha256:d99d2350adb7b6c3f7f8f0e5dfb7d34ff8dd4bc0a53e62c445b7e43e163fce63 \ - --hash=sha256:dd324f8ee05925ee85de0ea3f0d66e1362e8c80799eb4eb04927d32335a3e44a \ - --hash=sha256:eaca36a80acaacb8183930e2e5ad7f71539a66805d6204ea88736570b2876a7b \ - --hash=sha256:f567e972dce3bbc3a8076e0b675273b4a9e8576ac629149cf8286ee13c259ae5 \ - --hash=sha256:fe48e4925455c964db914b958f6e7032d285848b7538a5e1b19aeb26ffaea3ec - # via -r requirements.in -pluggy==1.0.0 \ - --hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \ - --hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3 - # via pytest -py==1.10.0 \ - --hash=sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3 \ - --hash=sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a - # via pytest -pyparsing==3.0.3 \ - --hash=sha256:9e3511118010f112a4b4b435ae50e1eaa610cda191acb9e421d60cf5fde83455 \ - --hash=sha256:f8d3fe9fc404576c5164f0f0c4e382c96b85265e023c409c43d48f65da9d60d0 - # via packaging -pytest==6.2.5 \ - --hash=sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89 \ - --hash=sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134 - # via -r requirements.in -python-dateutil==2.8.2 \ - --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ - --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 - # via pandas -pytz==2021.3 \ - --hash=sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c \ - --hash=sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 - # via pandas -six==1.16.0 \ - --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ - --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 - # via python-dateutil -toml==0.10.2 \ - --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \ - --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f - # via pytest diff --git a/integration-tests/sqls/character_length.sql b/integration-tests/sqls/character_length.sql deleted file mode 100644 index 18ef487f171a..000000000000 --- a/integration-tests/sqls/character_length.sql +++ /dev/null @@ -1,17 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -select length('ä'); diff --git a/integration-tests/sqls/partitioned_window_built_in_functions.sql b/integration-tests/sqls/partitioned_window_built_in_functions.sql deleted file mode 100644 index f27b085f5033..000000000000 --- a/integration-tests/sqls/partitioned_window_built_in_functions.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - c9, - row_number() OVER (PARTITION BY c2 ORDER BY c9) row_num, - lead(c9) OVER (PARTITION BY c2 ORDER BY c9) lead_c9, - lag(c9) OVER (PARTITION BY c2 ORDER BY c9) lag_c9, - first_value(c9) OVER (PARTITION BY c2 ORDER BY c9) first_c9, - first_value(c9) OVER (PARTITION BY c2 ORDER BY c9 DESC) first_c9_desc, - last_value(c9) OVER (PARTITION BY c2 ORDER BY c9) last_c9, - last_value(c9) OVER (PARTITION BY c2 ORDER BY c9 DESC) last_c9_desc, - nth_value(c9, 2) OVER (PARTITION BY c2 ORDER BY c9) second_c9, - nth_value(c9, 2) OVER (PARTITION BY c2 ORDER BY c9 DESC) second_c9_desc -FROM test -ORDER BY c9; diff --git a/integration-tests/sqls/self_join_with_alias.sql b/integration-tests/sqls/self_join_with_alias.sql deleted file mode 100644 index 54c39888dffe..000000000000 --- a/integration-tests/sqls/self_join_with_alias.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - t1.c9 result -FROM test t1 -INNER JOIN test t2 -ON t1.c9 = t2.c9 -ORDER BY result; diff --git a/integration-tests/sqls/simple_aggregation.sql b/integration-tests/sqls/simple_aggregation.sql deleted file mode 100644 index cbe37ed4ba31..000000000000 --- a/integration-tests/sqls/simple_aggregation.sql +++ /dev/null @@ -1,24 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - count(*) AS count_all, - count(c3) AS count_c3, - avg(c3) AS avg, - sum(c3) AS sum, - max(c3) AS max, - min(c3) AS min -FROM test; diff --git a/integration-tests/sqls/simple_except.sql b/integration-tests/sqls/simple_except.sql deleted file mode 100644 index fc29dd82e32e..000000000000 --- a/integration-tests/sqls/simple_except.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT * FROM ( - SELECT c2 - FROM test t1 - EXCEPT - SELECT c2 - FROM test t2 - WHERE c2 IN (3, 4) -) s -ORDER BY c2 diff --git a/integration-tests/sqls/simple_except_all.sql b/integration-tests/sqls/simple_except_all.sql deleted file mode 100644 index 3989edd880a2..000000000000 --- a/integration-tests/sqls/simple_except_all.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT * FROM ( - SELECT c2 - FROM test t1 - EXCEPT ALL - SELECT c2 - FROM test t2 - WHERE c2 IN (3, 4) -) s -ORDER BY c2 diff --git a/integration-tests/sqls/simple_group_by.sql b/integration-tests/sqls/simple_group_by.sql deleted file mode 100644 index 11fe1cce406f..000000000000 --- a/integration-tests/sqls/simple_group_by.sql +++ /dev/null @@ -1,27 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - - -select - c2, - sum(c3) sum_c3, - avg(c3) avg_c3, - max(c3) max_c3, - min(c3) min_c3, - count(c3) count_c3 -from test -group by c2 -order by c2; diff --git a/integration-tests/sqls/simple_intersect.sql b/integration-tests/sqls/simple_intersect.sql deleted file mode 100644 index a0c10bb23996..000000000000 --- a/integration-tests/sqls/simple_intersect.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT * FROM ( - SELECT c2 - FROM test t1 - INTERSECT - SELECT c2 - FROM test t2 - WHERE c2 IN (3, 4) -) s -ORDER BY c2 diff --git a/integration-tests/sqls/simple_intersect_all.sql b/integration-tests/sqls/simple_intersect_all.sql deleted file mode 100644 index 4f8fa2c59e3b..000000000000 --- a/integration-tests/sqls/simple_intersect_all.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT * FROM ( - SELECT c2 - FROM test t1 - INTERSECT ALL - SELECT c2 - FROM test t2 - WHERE c2 IN (3, 4) -) s -ORDER BY c2 diff --git a/integration-tests/sqls/simple_math_expressions.sql b/integration-tests/sqls/simple_math_expressions.sql deleted file mode 100644 index 504689d51130..000000000000 --- a/integration-tests/sqls/simple_math_expressions.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - abs(-1.1) as abs, - exp(2.0) as exp, - sin(3.0) as sin, - cos(4.0) as cos, - tan(5.0) as tan; diff --git a/integration-tests/sqls/simple_ordered_row.sql b/integration-tests/sqls/simple_ordered_row.sql deleted file mode 100644 index d91dc428eab9..000000000000 --- a/integration-tests/sqls/simple_ordered_row.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT -SUM(c5) OVER(ORDER BY c13 ROWS BETWEEN 3 PRECEDING AND 1 FOLLOWING) as summation2, -SUM(c2) OVER(PARTITION BY c5 ORDER BY c13 ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation10, -SUM(c2) OVER(PARTITION BY c1 ORDER BY c13 ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation14, -SUM(c5) OVER(ORDER BY c5 ROWS BETWEEN 3 PRECEDING AND UNBOUNDED FOLLOWING) as summation5, -SUM(c5) OVER(ORDER BY c5 ROWS BETWEEN UNBOUNDED PRECEDING AND 2 FOLLOWING) as summation6, -SUM(c2) OVER(PARTITION BY c5, c7, c9 ORDER BY c13, c5 ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation20, -SUM(c2) OVER(PARTITION BY c5 ORDER BY c13, c5 ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation21 -FROM test -ORDER BY c9; diff --git a/integration-tests/sqls/simple_row_past_future.sql b/integration-tests/sqls/simple_row_past_future.sql deleted file mode 100644 index 1a8580a714d7..000000000000 --- a/integration-tests/sqls/simple_row_past_future.sql +++ /dev/null @@ -1,24 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - SUM(c2) OVER(ORDER BY c5 ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) as summation1, - SUM(c2) OVER(ORDER BY c5 ROWS BETWEEN 2 FOLLOWING AND 3 FOLLOWING) as summation2, - SUM(c2) OVER(ORDER BY c5 ROWS BETWEEN 2 FOLLOWING AND UNBOUNDED FOLLOWING) as summation3, - SUM(c2) OVER(ORDER BY c5 RANGE BETWEEN 2 FOLLOWING AND UNBOUNDED FOLLOWING) as summation4, - SUM(c2) OVER(ORDER BY c5 RANGE BETWEEN 1 PRECEDING AND 1 PRECEDING) as summation5 -FROM test -ORDER BY c9; diff --git a/integration-tests/sqls/simple_select.sql b/integration-tests/sqls/simple_select.sql deleted file mode 100644 index 78f54bdd8ece..000000000000 --- a/integration-tests/sqls/simple_select.sql +++ /dev/null @@ -1,17 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT 1 as num; diff --git a/integration-tests/sqls/simple_sort.sql b/integration-tests/sqls/simple_sort.sql deleted file mode 100644 index 50fb12dfdc70..000000000000 --- a/integration-tests/sqls/simple_sort.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - c2, - c3, - c10 -FROM test -ORDER BY c2 ASC, c3 DESC, c10; diff --git a/integration-tests/sqls/simple_sort_nulls_order.sql b/integration-tests/sqls/simple_sort_nulls_order.sql deleted file mode 100644 index f5c61aab430f..000000000000 --- a/integration-tests/sqls/simple_sort_nulls_order.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - c5, - c4, - c10 -FROM test -ORDER BY c5 ASC, c4 DESC, c10; \ No newline at end of file diff --git a/integration-tests/sqls/simple_union_all.sql b/integration-tests/sqls/simple_union_all.sql deleted file mode 100644 index 65557b8d263f..000000000000 --- a/integration-tests/sqls/simple_union_all.sql +++ /dev/null @@ -1,17 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT 1 num UNION ALL SELECT 2 num ORDER BY num; diff --git a/integration-tests/sqls/simple_window_built_in_functions.sql b/integration-tests/sqls/simple_window_built_in_functions.sql deleted file mode 100644 index 05c34dd12fca..000000000000 --- a/integration-tests/sqls/simple_window_built_in_functions.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - c9, - row_number() OVER (ORDER BY c9) row_num, - lead(c9) OVER (ORDER BY c9) lead_c9, - lag(c9) OVER (ORDER BY c9) lag_c9, - first_value(c9) OVER (ORDER BY c9) first_c9, - first_value(c9) OVER (ORDER BY c9 DESC) first_c9_desc, - last_value(c9) OVER (ORDER BY c9) last_c9, - last_value(c9) OVER (ORDER BY c9 DESC) last_c9_desc, - nth_value(c9, 2) OVER (ORDER BY c9) second_c9, - nth_value(c9, 2) OVER (ORDER BY c9 DESC) second_c9_desc -FROM test -ORDER BY c9; diff --git a/integration-tests/sqls/simple_window_full_aggregation.sql b/integration-tests/sqls/simple_window_full_aggregation.sql deleted file mode 100644 index 7346f67fa4ba..000000000000 --- a/integration-tests/sqls/simple_window_full_aggregation.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - row_number() OVER () AS row_number, - count(c3) OVER () AS count_c3, - avg(c3) OVER () AS avg, - sum(c3) OVER () AS sum, - max(c3) OVER () AS max, - min(c3) OVER () AS min -FROM test -ORDER BY row_number; diff --git a/integration-tests/sqls/simple_window_groups.sql b/integration-tests/sqls/simple_window_groups.sql deleted file mode 100644 index dd369c28ca4d..000000000000 --- a/integration-tests/sqls/simple_window_groups.sql +++ /dev/null @@ -1,71 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - SUM(c4) OVER(ORDER BY c3 DESC GROUPS BETWEEN 3 PRECEDING AND 1 FOLLOWING) as summation1, - SUM(c4) OVER(ORDER BY c3 DESC GROUPS BETWEEN 3 PRECEDING AND 2 PRECEDING) as summation2, - SUM(c5) OVER(ORDER BY c4 DESC GROUPS BETWEEN 2 PRECEDING AND 2 PRECEDING) as summation3, - SUM(c4) OVER(ORDER BY c3 DESC GROUPS BETWEEN 1 FOLLOWING AND 3 FOLLOWING) as summation4, - SUM(c3) OVER(ORDER BY c4 DESC GROUPS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) as summation5, - SUM(c5) OVER(ORDER BY c3 DESC GROUPS 2 PRECEDING) as summation6, - SUM(c5) OVER(ORDER BY c3 DESC GROUPS BETWEEN CURRENT ROW AND 3 FOLLOWING) as summation7, - SUM(c5) OVER(ORDER BY c4 DESC GROUPS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation8, - SUM(c4) OVER(ORDER BY c4 DESC GROUPS UNBOUNDED PRECEDING) as summation9, - SUM(c5) OVER(ORDER BY c4 DESC GROUPS CURRENT ROW) as summation10, - SUM(c5) OVER(ORDER BY c4 DESC GROUPS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as summation11, - SUM(c5) OVER(ORDER BY c4 DESC GROUPS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) as summation12, - SUM(c5) OVER(ORDER BY c4 DESC GROUPS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) as summation13, - SUM(c4) OVER(PARTITION BY c4 ORDER BY c3 GROUPS BETWEEN 3 PRECEDING AND 1 FOLLOWING) as summation21, - SUM(c4) OVER(PARTITION BY c4 ORDER BY c3 GROUPS BETWEEN 3 PRECEDING AND 2 PRECEDING) as summation22, - SUM(c5) OVER(PARTITION BY c4 ORDER BY c4 GROUPS BETWEEN 2 PRECEDING AND 2 PRECEDING) as summation23, - SUM(c4) OVER(PARTITION BY c4 ORDER BY c3 GROUPS BETWEEN 1 FOLLOWING AND 3 FOLLOWING) as summation24, - SUM(c3) OVER(PARTITION BY c4 ORDER BY c4 GROUPS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) as summation25, - SUM(c5) OVER(PARTITION BY c4 ORDER BY c3 GROUPS 2 PRECEDING) as summation26, - SUM(c5) OVER(PARTITION BY c4 ORDER BY c3 GROUPS BETWEEN CURRENT ROW AND 3 FOLLOWING) as summation27, - SUM(c5) OVER(PARTITION BY c4 ORDER BY c4 GROUPS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation28, - SUM(c4) OVER(PARTITION BY c4 ORDER BY c4 GROUPS UNBOUNDED PRECEDING) as summation29, - SUM(c5) OVER(PARTITION BY c4 ORDER BY c4 GROUPS CURRENT ROW) as summation30, - SUM(c5) OVER(PARTITION BY c4 ORDER BY c4 GROUPS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as summation31, - SUM(c5) OVER(PARTITION BY c4 ORDER BY c4 GROUPS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) as summation32, - SUM(c5) OVER(PARTITION BY c4 ORDER BY c4 GROUPS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) as summation33, - SUM(c4) OVER(ORDER BY c5, c3 GROUPS BETWEEN 3 PRECEDING AND 1 FOLLOWING) as summation41, - SUM(c4) OVER(ORDER BY c5, c3 GROUPS BETWEEN 3 PRECEDING AND 2 PRECEDING) as summation42, - SUM(c5) OVER(ORDER BY c5, c4 GROUPS BETWEEN 2 PRECEDING AND 2 PRECEDING) as summation43, - SUM(c4) OVER(ORDER BY c5, c3 GROUPS BETWEEN 1 FOLLOWING AND 3 FOLLOWING) as summation44, - SUM(c3) OVER(ORDER BY c5, c4 GROUPS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) as summation45, - SUM(c5) OVER(ORDER BY c5, c3 GROUPS 2 PRECEDING) as summation46, - SUM(c5) OVER(ORDER BY c5, c3 GROUPS BETWEEN CURRENT ROW AND 3 FOLLOWING) as summation47, - SUM(c5) OVER(ORDER BY c5, c4 GROUPS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation48, - SUM(c4) OVER(ORDER BY c5, c4 GROUPS UNBOUNDED PRECEDING) as summation49, - SUM(c5) OVER(ORDER BY c5, c4 GROUPS CURRENT ROW) as summation50, - SUM(c5) OVER(ORDER BY c5, c4 GROUPS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as summation51, - SUM(c5) OVER(ORDER BY c5, c4 GROUPS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) as summation52, - SUM(c5) OVER(ORDER BY c5, c4 GROUPS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) as summation53, - SUM(c4) OVER(ORDER BY c3 GROUPS BETWEEN 3 PRECEDING AND 1 FOLLOWING) as summation61, - SUM(c4) OVER(ORDER BY c3 GROUPS BETWEEN 3 PRECEDING AND 2 PRECEDING) as summation62, - SUM(c5) OVER(ORDER BY c4 GROUPS BETWEEN 2 PRECEDING AND 2 PRECEDING) as summation63, - SUM(c4) OVER(ORDER BY c3 GROUPS BETWEEN 1 FOLLOWING AND 3 FOLLOWING) as summation64, - SUM(c3) OVER(ORDER BY c4 GROUPS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) as summation65, - SUM(c5) OVER(ORDER BY c3 GROUPS 2 PRECEDING) as summation66, - SUM(c5) OVER(ORDER BY c3 GROUPS BETWEEN CURRENT ROW AND 3 FOLLOWING) as summation67, - SUM(c5) OVER(ORDER BY c4 GROUPS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation68, - SUM(c4) OVER(ORDER BY c4 GROUPS UNBOUNDED PRECEDING) as summation69, - SUM(c5) OVER(ORDER BY c4 GROUPS CURRENT ROW) as summation70, - SUM(c5) OVER(ORDER BY c4 GROUPS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as summation71, - SUM(c5) OVER(ORDER BY c4 GROUPS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) as summation72, - SUM(c5) OVER(ORDER BY c4 GROUPS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) as summation73 -FROM test -ORDER BY c9; diff --git a/integration-tests/sqls/simple_window_lead_built_in_functions.sql b/integration-tests/sqls/simple_window_lead_built_in_functions.sql deleted file mode 100644 index 67df05b68c1a..000000000000 --- a/integration-tests/sqls/simple_window_lead_built_in_functions.sql +++ /dev/null @@ -1,27 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - c8, - LEAD(c8) OVER () next_c8, - LEAD(c8, 10, 10) OVER() next_10_c8, - LEAD(c8, 100, 10) OVER() next_out_of_bounds_c8, - LAG(c8) OVER() prev_c8, - LAG(c8, -2, 0) OVER() AS prev_2_c8, - LAG(c8, -200, 10) OVER() AS prev_out_of_bounds_c8 - -FROM test -ORDER BY c8; diff --git a/integration-tests/sqls/simple_window_ordered_aggregation.sql b/integration-tests/sqls/simple_window_ordered_aggregation.sql deleted file mode 100644 index 567c1881a3db..000000000000 --- a/integration-tests/sqls/simple_window_ordered_aggregation.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - c9, - row_number() OVER (ORDER BY c2, c9) AS row_number, - count(c3) OVER (ORDER BY c9) AS count_c3, - avg(c3) OVER (ORDER BY c2) AS avg_c3_by_c2, - sum(c3) OVER (ORDER BY c2) AS sum_c3_by_c2, - max(c3) OVER (ORDER BY c2) AS max_c3_by_c2, - min(c3) OVER (ORDER BY c2) AS min_c3_by_c2 -FROM test -ORDER BY row_number; diff --git a/integration-tests/sqls/simple_window_partition_aggregation.sql b/integration-tests/sqls/simple_window_partition_aggregation.sql deleted file mode 100644 index bac4e465f626..000000000000 --- a/integration-tests/sqls/simple_window_partition_aggregation.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - c9, - row_number() OVER (PARTITION BY c2, c9) AS row_number, - count(c3) OVER (PARTITION BY c2) AS count_c3, - avg(c3) OVER (PARTITION BY c2) AS avg_c3_by_c2, - sum(c3) OVER (PARTITION BY c2) AS sum_c3_by_c2, - max(c3) OVER (PARTITION BY c2) AS max_c3_by_c2, - min(c3) OVER (PARTITION BY c2) AS min_c3_by_c2 -FROM test -ORDER BY c9; diff --git a/integration-tests/sqls/simple_window_partition_order_aggregation.sql b/integration-tests/sqls/simple_window_partition_order_aggregation.sql deleted file mode 100644 index 2702c0e2e032..000000000000 --- a/integration-tests/sqls/simple_window_partition_order_aggregation.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - c9, - row_number() OVER (PARTITION BY c2 ORDER BY c9) AS row_number, - count(c3) OVER (PARTITION BY c2 ORDER BY c9) AS count_c3, - avg(c3) OVER (PARTITION BY c2 ORDER BY c9) AS avg_c3_by_c2, - sum(c3) OVER (PARTITION BY c2 ORDER BY c9) AS sum_c3_by_c2, - max(c3) OVER (PARTITION BY c2 ORDER BY c9) AS max_c3_by_c2, - min(c3) OVER (PARTITION BY c2 ORDER BY c9) AS min_c3_by_c2 -FROM test -ORDER BY c9; diff --git a/integration-tests/sqls/simple_window_range.sql b/integration-tests/sqls/simple_window_range.sql deleted file mode 100644 index 98b5b18a5c13..000000000000 --- a/integration-tests/sqls/simple_window_range.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT - SUM(c5) OVER(ORDER BY c4 RANGE BETWEEN 3 PRECEDING AND 1 FOLLOWING) as summation2, - SUM(c4) OVER(ORDER BY c3 RANGE 3 PRECEDING) as summation3, - SUM(c4) OVER(ORDER BY c5 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation6, - SUM(c4) OVER(ORDER BY c5 RANGE UNBOUNDED PRECEDING) as summation7, - SUM(c2) OVER(PARTITION BY c5 ORDER BY c5 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation10, - SUM(c4) OVER(PARTITION BY c1 ORDER BY c5 RANGE UNBOUNDED PRECEDING) as summation11, - SUM(c2) OVER(PARTITION BY c1 ORDER BY c5 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation14, - SUM(c4) OVER(PARTITION BY c5 ORDER BY c5 RANGE UNBOUNDED PRECEDING) as summation15, - SUM(c2) OVER(PARTITION BY c5, c7, c9 ORDER BY c5 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation20, - SUM(c2) OVER(PARTITION BY c5 ORDER BY c5 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as summation21 -FROM test -ORDER BY c9; diff --git a/integration-tests/sqls/simple_window_ranked_built_in_functions.sql b/integration-tests/sqls/simple_window_ranked_built_in_functions.sql deleted file mode 100644 index 868d48357ef0..000000000000 --- a/integration-tests/sqls/simple_window_ranked_built_in_functions.sql +++ /dev/null @@ -1,24 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -select - c9, - cume_dist() OVER (PARTITION BY c2 ORDER BY c3) cume_dist_by_c3, - rank() OVER (PARTITION BY c2 ORDER BY c3) rank_by_c3, - dense_rank() OVER (PARTITION BY c2 ORDER BY c3) dense_rank_by_c3, - percent_rank() OVER (PARTITION BY c2 ORDER BY c3) percent_rank_by_c3 -FROM test -ORDER BY c9; diff --git a/integration-tests/sqls/values_list.sql b/integration-tests/sqls/values_list.sql deleted file mode 100644 index b94e59a4ce2b..000000000000 --- a/integration-tests/sqls/values_list.sql +++ /dev/null @@ -1,19 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at - --- http://www.apache.org/licenses/LICENSE-2.0 - --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -SELECT * FROM -(VALUES (1,2.0,-3,1+1),(10,20.0,-30,2+2)) -AS tbl(int_col, float_col, negative_col, summation); diff --git a/integration-tests/test_psql_parity.py b/integration-tests/test_psql_parity.py deleted file mode 100644 index e4c2bb17edb6..000000000000 --- a/integration-tests/test_psql_parity.py +++ /dev/null @@ -1,91 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import io -import os -import subprocess -from pathlib import Path - -import numpy as np -import pandas as pd -import pytest - -pg_db, pg_user, pg_host, pg_port = [ - os.environ.get(i) - for i in ( - "POSTGRES_DB", - "POSTGRES_USER", - "POSTGRES_HOST", - "POSTGRES_PORT", - ) -] - -CREATE_TABLE_SQL_FILE = "integration-tests/create_test_table.sql" - - -def generate_csv_from_datafusion(fname: str): - return subprocess.check_output( - [ - "./datafusion-cli/target/debug/datafusion-cli", - "-f", - CREATE_TABLE_SQL_FILE, - "-f", - fname, - "--format", - "csv", - "-q", - ], - ) - - -def generate_csv_from_psql(fname: str): - - cmd = ["psql"] - - if pg_db is not None: - cmd.extend(["-d", pg_db]) - - if pg_user is not None: - cmd.extend(["-U", pg_user]) - - if pg_host is not None: - cmd.extend(["-h", pg_host]) - - if pg_port is not None: - cmd.extend(["-p", pg_port]) - - cmd.extend([ - "-X", - "--csv", - "-f", - fname, - ]) - - return subprocess.check_output(cmd) - -root = Path(os.path.dirname(__file__)) / "sqls" -test_files = set(root.glob("*.sql")) - - -class TestPsqlParity: - def test_tests_count(self): - assert len(test_files) == 26, "tests are missed" - - @pytest.mark.parametrize("fname", test_files, ids=str) - def test_sql_file(self, fname): - datafusion_output = pd.read_csv(io.BytesIO(generate_csv_from_datafusion(fname))) - psql_output = pd.read_csv(io.BytesIO(generate_csv_from_psql(fname))) - np.testing.assert_allclose(datafusion_output, psql_output, equal_nan=True, verbose=True) From 64401da7533ecf9e796fb9ce5db83e8590422a5d Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 23 Jan 2023 06:45:18 -0500 Subject: [PATCH 2/2] Remove old docs --- docs/source/contributor-guide/index.md | 49 -------------------------- 1 file changed, 49 deletions(-) diff --git a/docs/source/contributor-guide/index.md b/docs/source/contributor-guide/index.md index 38fcd70a9e7e..d7172329c251 100644 --- a/docs/source/contributor-guide/index.md +++ b/docs/source/contributor-guide/index.md @@ -141,55 +141,6 @@ The [sqllogictests](../../../datafusion/core/tests/sqllogictests) also validate Data Driven tests have many benefits including being easier to write and maintain. We are in the process of [migrating sql_integration tests](https://github.com/apache/arrow-datafusion/issues/4460) and encourage you to add new tests using sqllogictests if possible. -### SQL / Postgres Integration Tests - -The [integration-tests](../../../integration-tests) directory contains a harness that runs certain queries against both postgres and datafusion and compares results - -#### setup environment - -```shell -export POSTGRES_DB=postgres -export POSTGRES_USER=postgres -export POSTGRES_HOST=localhost -export POSTGRES_PORT=5432 -``` - -#### Install dependencies - -```shell -# Install dependencies -python -m pip install --upgrade pip setuptools wheel -python -m pip install -r integration-tests/requirements.txt - -# setup environment -POSTGRES_DB=postgres POSTGRES_USER=postgres POSTGRES_HOST=localhost POSTGRES_PORT=5432 python -m pytest -v integration-tests/test_psql_parity.py - -# Create -psql -d "$POSTGRES_DB" -h "$POSTGRES_HOST" -p "$POSTGRES_PORT" -U "$POSTGRES_USER" -c 'CREATE TABLE IF NOT EXISTS test ( - c1 character varying NOT NULL, - c2 integer NOT NULL, - c3 smallint NOT NULL, - c4 smallint NOT NULL, - c5 integer NOT NULL, - c6 bigint NOT NULL, - c7 smallint NOT NULL, - c8 integer NOT NULL, - c9 bigint NOT NULL, - c10 character varying NOT NULL, - c11 double precision NOT NULL, - c12 double precision NOT NULL, - c13 character varying NOT NULL -);' - -psql -d "$POSTGRES_DB" -h "$POSTGRES_HOST" -p "$POSTGRES_PORT" -U "$POSTGRES_USER" -c "\copy test FROM '$(pwd)/testing/data/csv/aggregate_test_100.csv' WITH (FORMAT csv, HEADER true);" -``` - -#### Invoke the test runner - -```shell -python -m pytest -v integration-tests/test_psql_parity.py -``` - ## Benchmarks ### Criterion Benchmarks