From 140e19a21b1505858c1dee6cc7d251daf2ebbe3f Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Thu, 25 Sep 2025 22:05:15 +0200 Subject: [PATCH 1/5] Run also slow tests, and avoid skipping HTTP-connected errors --- .github/workflows/IntegrationTests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/IntegrationTests.yml b/.github/workflows/IntegrationTests.yml index edf1e5f..9e6c5fd 100644 --- a/.github/workflows/IntegrationTests.yml +++ b/.github/workflows/IntegrationTests.yml @@ -85,4 +85,4 @@ jobs: run: | source ./scripts/run_s3_test_server.sh source ./scripts/set_s3_test_server_variables.sh - make test + ./build/release/test/unittest "*" --skip-error-messages "[]" From 6ed3c2fa508a46bad6c332979920d0780af41baf Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Thu, 25 Sep 2025 23:55:49 +0200 Subject: [PATCH 2/5] Fixup from s3 to https for shakespeare.parquet --- .../external_file_cache_httpfs.test | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/test/sql/storage/external_file_cache/external_file_cache_httpfs.test b/test/sql/storage/external_file_cache/external_file_cache_httpfs.test index 2efa361..0b1e70a 100644 --- a/test/sql/storage/external_file_cache/external_file_cache_httpfs.test +++ b/test/sql/storage/external_file_cache/external_file_cache_httpfs.test @@ -8,11 +8,23 @@ require httpfs # first query caches the data statement ok -from 's3://duckdb-blobs/data/shakespeare.parquet'; - +from 'https://blobs.duckdb.org/data/shakespeare.parquet'; # second query should only have a head request, no gets query II -explain analyze from 's3://duckdb-blobs/data/shakespeare.parquet'; +explain analyze from 'https://blobs.duckdb.org/data/shakespeare.parquet'; ---- analyzed_plan :.*GET: 0.* + +statement ok +SET enable_http_metadata_cache = true; + +# first query saves the metadata (and data, but that was already there) +statement ok +from 'https://blobs.duckdb.org/data/shakespeare.parquet'; + +# second query should do no HEAD and no GET +query II +explain analyze from 'https://blobs.duckdb.org/data/shakespeare.parquet'; +---- +analyzed_plan :.*HEAD: 0.* From 0b20ee948249f4ad443db177c6b93b92c9bd4ae2 Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Thu, 25 Sep 2025 23:57:27 +0200 Subject: [PATCH 3/5] test/sql/secrets/create_secret_r2.test: move to generic error failure --- test/sql/secrets/create_secret_r2.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sql/secrets/create_secret_r2.test b/test/sql/secrets/create_secret_r2.test index 972fe21..d66e00c 100644 --- a/test/sql/secrets/create_secret_r2.test +++ b/test/sql/secrets/create_secret_r2.test @@ -30,7 +30,7 @@ __default_r2 r2 config ['r2://'] statement error FROM 's3://test-bucket/test.csv' ---- -:.*HTTP Error.*HTTP GET error on.* +:.*HTTP Error.* # Account ID is only for R2, trying to set this for S3 will fail statement error From 078ef4b125ec738c53ff213492d9f5ace9544508 Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Thu, 25 Sep 2025 23:58:54 +0200 Subject: [PATCH 4/5] More shakespeare to blobs --- .../external_file_cache_read_blob.test_slow | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/sql/storage/external_file_cache/external_file_cache_read_blob.test_slow b/test/sql/storage/external_file_cache/external_file_cache_read_blob.test_slow index 9edf162..f5e02d0 100644 --- a/test/sql/storage/external_file_cache/external_file_cache_read_blob.test_slow +++ b/test/sql/storage/external_file_cache/external_file_cache_read_blob.test_slow @@ -8,18 +8,18 @@ require httpfs # first read_blob should do 1 GET query II -explain analyze from read_blob('s3://duckdb-blobs/data/shakespeare.parquet'); +explain analyze from read_blob('https://blobs.duckdb.org/data/shakespeare.parquet'); ---- analyzed_plan :.*GET: 1.* # second one should do 0 query II -explain analyze from read_blob('s3://duckdb-blobs/data/shakespeare.parquet'); +explain analyze from read_blob('https://blobs.duckdb.org/data/shakespeare.parquet'); ---- analyzed_plan :.*GET: 0.* # although the read was cached using read_blob, the parquet reader can read from cache query II -explain analyze from 's3://duckdb-blobs/data/shakespeare.parquet'; +explain analyze from 'https://blobs.duckdb.org/data/shakespeare.parquet'; ---- analyzed_plan :.*GET: 0.* From 301f6a893f074c817d97f9f04eee7f6d03ed9f31 Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Fri, 26 Sep 2025 00:00:47 +0200 Subject: [PATCH 5/5] Add TODOs --- test/extension/duckdb_extension_settings.test | 3 +++ test/sql/copy/csv/parallel/test_parallel_csv.test | 3 +++ 2 files changed, 6 insertions(+) diff --git a/test/extension/duckdb_extension_settings.test b/test/extension/duckdb_extension_settings.test index 9fa62c6..2ec44ce 100644 --- a/test/extension/duckdb_extension_settings.test +++ b/test/extension/duckdb_extension_settings.test @@ -2,6 +2,9 @@ # description: settings for extensions # group: [extension] +# TODO: move back to duckdb/duckdb +mode skip + require httpfs statement ok diff --git a/test/sql/copy/csv/parallel/test_parallel_csv.test b/test/sql/copy/csv/parallel/test_parallel_csv.test index 48b00fe..439c621 100644 --- a/test/sql/copy/csv/parallel/test_parallel_csv.test +++ b/test/sql/copy/csv/parallel/test_parallel_csv.test @@ -2,6 +2,9 @@ # description: Test parallel read CSV function on ghub bugs # group: [parallel] +# TODO: figure out where that bucket went +mode skip + require httpfs query II