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

Support files without format extension in Filesystem database #60795

Merged
merged 3 commits into from
Mar 6, 2024
Merged

Support files without format extension in Filesystem database #60795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70acf7a
Support files without format extension in Filesystem database
Avogar Mar 4, 2024
a80b3ad
Fix test
Avogar Mar 5, 2024
d155f26
Fix test reference
Avogar Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 1 addition & 14 deletions src/Databases/DatabaseFilesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,20 +146,7 @@ StoragePtr DatabaseFilesystem::getTableImpl(const String & name, ContextPtr cont
if (!checkTableFilePath(table_path, context_, throw_on_error))
return {};

String format;
if (throw_on_error)
{
format = FormatFactory::instance().getFormatFromFileName(table_path);
}
else
{
auto format_maybe = FormatFactory::instance().tryGetFormatFromFileName(table_path);
if (!format_maybe)
return {};
format = *format_maybe;
}

auto ast_function_ptr = makeASTFunction("file", std::make_shared<ASTLiteral>(table_path), std::make_shared<ASTLiteral>(format));
auto ast_function_ptr = makeASTFunction("file", std::make_shared<ASTLiteral>(table_path));

auto table_function = TableFunctionFactory::instance().get(ast_function_ptr, context_);
if (!table_function)
Expand Down
1 change: 0 additions & 1 deletion tests/queries/0_stateless/02722_database_filesystem.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,3 @@ OK
OK
OK
OK
OK
2 changes: 0 additions & 2 deletions tests/queries/0_stateless/02722_database_filesystem.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ CREATE DATABASE test2 ENGINE = Filesystem('relative_unknown_dir');
# FILE_DOESNT_EXIST: unknown file
${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`tmp2.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "FILE_DOESNT_EXIST" > /dev/null && echo "OK" || echo 'FAIL' ||:

# BAD_ARGUMENTS: Cannot determine the file format by it's extension
${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`${unique_name}/tmp.myext\`;" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
# Clean
${CLICKHOUSE_CLIENT} --query "DROP DATABASE test1;"
rm -rd $tmp_dir
Expand Down
2 changes: 2 additions & 0 deletions tests/queries/0_stateless/03003_database_filesystem_format_detection.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
a Nullable(Int64)
42
15 changes: 15 additions & 0 deletions tests/queries/0_stateless/03003_database_filesystem_format_detection.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env bash

CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh
. "$CURDIR"/../shell_config.sh


DATA_FILE=$CLICKHOUSE_TEST_UNIQUE_NAME.data

echo '{"a" : 42}' > $DATA_FILE
$CLICKHOUSE_LOCAL -q "desc table \`$DATA_FILE\`"
$CLICKHOUSE_LOCAL -q "select * from \`$DATA_FILE\`"

rm $DATA_FILE