Skip to content

fix for YQ-3632 #8762

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

Merged
merged 3 commits into from
Sep 9, 2024
Merged

fix for YQ-3632 #8762

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
aa3cf3e
fix for YQ-3632
evanevanevanevannnn Sep 4, 2024
a90ed2d
fixed issues
evanevanevanevannnn Sep 5, 2024
4f32c48
Merge branch 'main' into inference_timestamp_formats
evanevanevanevannnn Sep 7, 2024
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
15 changes: 15 additions & 0 deletions ydb/core/external_sources/object_storage/inference/infer_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,21 @@ std::shared_ptr<FormatConfig> MakeJsonListConfig(const THashMap<TString, TString
}

std::shared_ptr<FormatConfig> MakeFormatConfig(const THashMap<TString, TString>& params) {
static THashSet<TString> supportedParams {
"format",
"compression",
"filepattern",
"partitionedby",
"projection",
"csvdelimiter",
};

for (const auto& [param, value] : params) {
if (!supportedParams.contains(param)) {
throw yexception() << "parameter is not supported with type inference: " << param;
}
}

EFileFormat format;
if (auto formatPtr = params.FindPtr("format"); formatPtr) {
format = ConvertFileFormat(*formatPtr);
Expand Down
12 changes: 12 additions & 0 deletions ydb/tests/fq/s3/test_s3_0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,18 @@ def test_inference_timestamp(self, kikimr, s3, client, unique_prefix):
assert result_set.columns[2].name == "c"
assert result_set.columns[2].type.type_id == ydb.Type.UTF8

sql = f'''
SELECT *
FROM `{storage_connection_name}`.`timestamp.csv`
WITH (format=csv_with_names, with_infer='true', `data.timestamp.formatname`='ISO');
'''

query_id = client.create_query("simple", sql, type=fq.QueryContent.QueryType.ANALYTICS).result.query_id
client.wait_query_status(query_id, fq.QueryMeta.FAILED)
assert "parameter is not supported with type inference" in str(
client.describe_query(query_id).result
)

@yq_v2
@pytest.mark.parametrize("client", [{"folder_id": "my_folder"}], indirect=True)
def test_inference_projection(self, kikimr, s3, client, unique_prefix):
Expand Down