Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resubmit "Fix a crash in s3 and s3Cluster functions" #51241

Closed
wants to merge 2 commits into from
Closed

Resubmit "Fix a crash in s3 and s3Cluster functions" #51241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc649fa
Revert "Revert "Fix a crash in s3 and s3Cluster functions""
evillique Jun 21, 2023
df2fa0d
Update broken_tests.txt
evillique Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/TableFunctions/TableFunctionS3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
}
else
{
if (args.empty() || args.size() > 6)
throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "The signature of table function {} shall be the following:\n{}", getName(), getSignature());

auto * header_it = StorageURL::collectHeaders(args, configuration.headers_from_ast, context);
if (header_it != args.end())
args.erase(header_it);

if (args.empty() || args.size() > 6)
throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "The signature of table function {} shall be the following:\n{}", getName(), getSignature());

for (auto & arg : args)
arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);

Expand Down
1 change: 1 addition & 0 deletions tests/broken_tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,4 @@
02764_parallel_replicas_plain_merge_tree
02765_parallel_replicas_final_modifier
02784_parallel_replicas_automatic_disabling
02772_s3_crash
Empty file added tests/queries/0_stateless/02772_s3_crash.reference
View file
Open in desktop
Empty file.
5 changes: 5 additions & 0 deletions tests/queries/0_stateless/02772_s3_crash.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Tags: no-fasttest
-- Tag no-fasttest: Depends on AWS

SELECT * FROM s3(headers('random_header' = 'value')); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
SELECT * FROM s3Cluster('test_cluster_two_shards_localhost', headers('random_header' = 'value')); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
Loading