Skip to content

Commit df12dcd

Browse files
authored
fix(query): don't check file format in proto-conv (#17793)
* fix(query): don't check file format in proto-conv * fix(query): don't check file format in proto-conv
1 parent 88b5875 commit df12dcd

File tree

5 files changed

+48
-21
lines changed

5 files changed

+48
-21
lines changed

src/meta/app/src/principal/file_format.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -782,14 +782,6 @@ impl ParquetFileFormatParams {
782782
missing_field_as: Option<&str>,
783783
null_if: Vec<String>,
784784
) -> Result<Self> {
785-
if !matches!(
786-
compression,
787-
StageFileCompression::Zstd | StageFileCompression::Snappy
788-
) {
789-
return Err(ErrorCode::InvalidArgument(format!(
790-
"compression algorithm {compression} not supported, only support Zstd and Snappy."
791-
)));
792-
}
793785
let missing_field_as = NullAs::parse(missing_field_as, MISSING_FIELD_AS, NullAs::Error)?;
794786
Ok(Self {
795787
compression,

src/query/storages/stage/src/append/parquet_file/writer_processor.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ impl ParquetFileWriter {
132132
let compression = match &compression {
133133
StageFileCompression::Zstd => Compression::ZSTD(ZstdLevel::default()),
134134
StageFileCompression::Snappy => Compression::SNAPPY,
135+
StageFileCompression::None => Compression::UNCOMPRESSED,
135136
_ => {
136137
return Err(ErrorCode::Internal(format!(
137138
"unexpected compression {compression}"

src/query/storages/stage/src/compression.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ pub fn get_compression_alg_copy(
3131
StageFileCompression::Xz => Some(CompressAlgorithm::Xz),
3232
StageFileCompression::Lzo => {
3333
return Err(ErrorCode::Unimplemented(
34-
"compress type lzo is unimplemented",
34+
"compress type lzo is unimplemented for copy into",
3535
));
3636
}
3737
StageFileCompression::Snappy => {
3838
return Err(ErrorCode::Unimplemented(
39-
"compress type snappy is unimplemented",
39+
"compress type snappy is unimplemented for copy into",
4040
));
4141
}
4242
StageFileCompression::None => None,

tests/sqllogictests/suites/stage/formats/parquet/options/parquet_compression.test

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
statement ok
22
create or replace file format parquet_snappy type=parquet compression=snappy
33

4+
statement ok
5+
create or replace file format parquet_none type=parquet compression=none
6+
47
statement ok
58
remove @data/unload/parquet_compression/snappy.parquet
69

710
statement ok
811
copy into @data/unload/parquet_compression/snappy.parquet from (select * from numbers(3)) file_format=(format_name='parquet_snappy')
912

13+
statement ok
14+
copy into @data/unload/parquet_compression/none.parquet from (select * from numbers(3)) file_format=(format_name='parquet_none')
15+
1016
statement ok
1117
copy into @data/unload/parquet_compression/zstd.parquet from (select * from numbers(3))
1218

@@ -21,4 +27,7 @@ statement ok
2127
remove @data/unload/parquet_compression/snappy.parquet
2228

2329
statement ok
24-
remove @data/unload/parquet_compression/zstd.parquet
30+
remove @data/unload/parquet_compression/zstd.parquet
31+
32+
statement ok
33+
remove @data/unload/parquet_compression/none.parquet

tests/sqllogictests/suites/stage/unload.test

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# need to run with '-p 0'
22

3+
control sortmode rowsort
4+
35
statement ok
46
drop stage if exists unload;
57

@@ -21,19 +23,26 @@ insert into ii values (1, 2), (3, 4), (5, 6);
2123
statement ok
2224
create file format if not exists csv_gzip type=csv compression=gzip;
2325

26+
statement ok
27+
create file format if not exists csv_snappy type=csv compression=snappy;
28+
29+
statement ok
30+
create file format if not exists csv_none type=csv compression=none;
31+
32+
2433
# test csv
25-
query
34+
query
2635
copy into @unload from ii file_format=(type=csv);
2736
-----
2837
----
2938
3 12 12
3039

31-
query
40+
query
3241
select right(name, 4), size from list_stage(location=>'@unload');
3342
----
3443
.csv 12
3544

36-
query
45+
query
3746
select $1, $2 from @unload(file_format=>'csv');
3847
----
3948
1 2
@@ -44,18 +53,34 @@ select $1, $2 from @unload(file_format=>'csv');
4453
statement ok
4554
remove @unload;
4655

47-
query
56+
query
4857
copy into @unload from ii file_format=(format_name='csv_gzip');
4958
----
5059
3 12 32
5160

52-
query
61+
statement error
62+
copy into @unload from ii file_format=(format_name='csv_snappy');
63+
64+
query
65+
copy into @unload from ii file_format=(format_name='csv_none');
66+
----
67+
3 12 12
68+
69+
query
5370
select right(name, 7), size from list_stage(location=>'@unload');
5471
----
5572
.csv.gz 32
73+
000.csv 12
5674

57-
query
58-
select $1, $2 from @unload(file_format => 'csv_gzip');
75+
query
76+
select $1, $2 from @unload(file_format => 'csv_gzip' pattern => '.*.gz');
77+
----
78+
1 2
79+
3 4
80+
5 6
81+
82+
query
83+
select $1, $2 from @unload(file_format => 'csv_none' pattern => '.*.csv');
5984
----
6085
1 2
6186
3 4
@@ -65,17 +90,17 @@ select $1, $2 from @unload(file_format => 'csv_gzip');
6590
statement ok
6691
remove @unload;
6792

68-
query
93+
query
6994
copy into @unload from ii file_format=(format_name='tsv');
7095
----
7196
3 12 12
7297

73-
query
98+
query
7499
select right(name, 4), size from list_stage(location=>'@unload');
75100
----
76101
.tsv 12
77102

78-
query
103+
query
79104
select $1, $2 from @unload(file_format => 'tsv');
80105
----
81106
1 2

0 commit comments

Comments
 (0)