From f62c2c3221d6d6ff54eac3d3d77a444f7ebc458b Mon Sep 17 00:00:00 2001 From: kgurjev Date: Mon, 22 Aug 2022 18:33:43 +0300 Subject: [PATCH] Fix bug in settings input_format_tsv_skip_first_lines of format TSV --- src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp | 2 +- tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp index 5a20d527710..d983e5371b8 100644 --- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp +++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp @@ -240,7 +240,7 @@ void TabSeparatedFormatReader::checkNullValueForNonNullable(DataTypePtr type) void TabSeparatedFormatReader::skipPrefixBeforeHeader() { - for (size_t i = 0; i != format_settings.csv.skip_first_lines; ++i) + for (size_t i = 0; i != format_settings.tsv.skip_first_lines; ++i) readRow(); } diff --git a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql index ff913a2a3ca..4a0cef35310 100644 --- a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql +++ b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql @@ -7,6 +7,6 @@ select * from file(data_02314.csv) settings input_format_csv_skip_first_lines=5; insert into function file(data_02314.tsv) select number, number + 1 from numbers(5) settings engine_file_truncate_on_insert=1; insert into function file(data_02314.tsv) select number, number + 1, number + 2 from numbers(5); -desc file(data_02314.tsv) settings input_format_csv_skip_first_lines=5; -select * from file(data_02314.tsv) settings input_format_csv_skip_first_lines=5; +desc file(data_02314.tsv) settings input_format_tsv_skip_first_lines=5; +select * from file(data_02314.tsv) settings input_format_tsv_skip_first_lines=5;