diff --git a/meta/src/meta/grammar.y b/meta/src/meta/grammar.y index b05e53fd..7df7da9b 100644 --- a/meta/src/meta/grammar.y +++ b/meta/src/meta/grammar.y @@ -1488,7 +1488,7 @@ def construct_csv_config( missing_strings: Sequence[String] = _extract_value_string_list(builtin.dict_get(config, "csv_missing_strings"), list[str]()) decimal_separator: str = _extract_value_string(builtin.dict_get(config, "csv_decimal_separator"), ".") encoding: str = _extract_value_string(builtin.dict_get(config, "csv_encoding"), "utf-8") - compression: str = _extract_value_string(builtin.dict_get(config, "csv_compression"), "auto") + compression: str = _extract_value_string(builtin.dict_get(config, "csv_compression"), "") partition_size_mb: int = _extract_value_int64(builtin.dict_get(config, "csv_partition_size_mb"), 0) storage_integration: Optional[logic.StorageIntegration] = construct_csv_storage_integration(storage_integration_opt) return logic.CSVConfig( diff --git a/sdks/go/src/parser.go b/sdks/go/src/parser.go index f4ea04be..a5962189 100644 --- a/sdks/go/src/parser.go +++ b/sdks/go/src/parser.go @@ -757,7 +757,7 @@ func (p *Parser) construct_csv_config(config_dict [][]interface{}, storage_integ decimal_separator := _t2118 _t2119 := p._extract_value_string(dictGetValue(config, "csv_encoding"), "utf-8") encoding := _t2119 - _t2120 := p._extract_value_string(dictGetValue(config, "csv_compression"), "auto") + _t2120 := p._extract_value_string(dictGetValue(config, "csv_compression"), "") compression := _t2120 _t2121 := p._extract_value_int64(dictGetValue(config, "csv_partition_size_mb"), 0) partition_size_mb := _t2121 diff --git a/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl b/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl index 72328c10..3a05e7c1 100644 --- a/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl +++ b/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl @@ -471,7 +471,7 @@ function construct_csv_config(parser::ParserState, config_dict::Vector{Tuple{Str decimal_separator = _t2105 _t2106 = _extract_value_string(parser, get(config, "csv_encoding", nothing), "utf-8") encoding = _t2106 - _t2107 = _extract_value_string(parser, get(config, "csv_compression", nothing), "auto") + _t2107 = _extract_value_string(parser, get(config, "csv_compression", nothing), "") compression = _t2107 _t2108 = _extract_value_int64(parser, get(config, "csv_partition_size_mb", nothing), 0) partition_size_mb = _t2108 diff --git a/sdks/python/src/lqp/gen/parser.py b/sdks/python/src/lqp/gen/parser.py index 283ca032..3aa748e1 100644 --- a/sdks/python/src/lqp/gen/parser.py +++ b/sdks/python/src/lqp/gen/parser.py @@ -560,7 +560,7 @@ def construct_csv_config(self, config_dict: Sequence[tuple[str, logic_pb2.Value] decimal_separator = _t2114 _t2115 = self._extract_value_string(config.get("csv_encoding"), "utf-8") encoding = _t2115 - _t2116 = self._extract_value_string(config.get("csv_compression"), "auto") + _t2116 = self._extract_value_string(config.get("csv_compression"), "") compression = _t2116 _t2117 = self._extract_value_int64(config.get("csv_partition_size_mb"), 0) partition_size_mb = _t2117 diff --git a/tests/bin/cdc.bin b/tests/bin/cdc.bin index fa8a1d36..8e31c902 100644 Binary files a/tests/bin/cdc.bin and b/tests/bin/cdc.bin differ diff --git a/tests/bin/csv.bin b/tests/bin/csv.bin index a82727d2..5e1f580f 100644 Binary files a/tests/bin/csv.bin and b/tests/bin/csv.bin differ diff --git a/tests/bin/csv_export_v2.bin b/tests/bin/csv_export_v2.bin index b7c7fd12..4e800615 100644 Binary files a/tests/bin/csv_export_v2.bin and b/tests/bin/csv_export_v2.bin differ diff --git a/tests/bin/csv_storage_integration.bin b/tests/bin/csv_storage_integration.bin index fd1eff87..a8a17faa 100644 Binary files a/tests/bin/csv_storage_integration.bin and b/tests/bin/csv_storage_integration.bin differ diff --git a/tests/bin/snapshot.bin b/tests/bin/snapshot.bin index 4e4ef09f..481176bd 100644 Binary files a/tests/bin/snapshot.bin and b/tests/bin/snapshot.bin differ diff --git a/tests/bin/unicode.bin b/tests/bin/unicode.bin index 908af046..960fe7b6 100644 Binary files a/tests/bin/unicode.bin and b/tests/bin/unicode.bin differ diff --git a/tests/pretty/cdc.lqp b/tests/pretty/cdc.lqp index 0a01d9cf..5b9a4b68 100644 --- a/tests/pretty/cdc.lqp +++ b/tests/pretty/cdc.lqp @@ -9,7 +9,7 @@ (csv_locator (paths "s3://bucket/cdc/batch_001.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty/csv.lqp b/tests/pretty/csv.lqp index 4f0dd093..0589057e 100644 --- a/tests/pretty/csv.lqp +++ b/tests/pretty/csv.lqp @@ -9,7 +9,7 @@ (csv_locator (paths "s3://bucket/data/file1.csv" "s3://bucket/data/file2.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -44,7 +44,7 @@ (csv_locator (inline_data "user_id,name,score\n1,Alice,95.5\n2,Bob,87.3")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -61,7 +61,7 @@ (csv_locator (paths "/local/path/data.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "\t" :csv_encoding "utf-8" @@ -77,7 +77,7 @@ (csv_locator (paths "data/infer.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty/csv_export_v2.lqp b/tests/pretty/csv_export_v2.lqp index e244102e..93b01006 100644 --- a/tests/pretty/csv_export_v2.lqp +++ b/tests/pretty/csv_export_v2.lqp @@ -71,7 +71,7 @@ (table_def :users) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -85,7 +85,7 @@ (table_def :users) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "|" :csv_encoding "utf-8" @@ -114,7 +114,7 @@ (table_def :products) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -128,7 +128,7 @@ (table_def :events) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -142,7 +142,7 @@ (table_def :users) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "\t" :csv_encoding "utf-8" @@ -156,7 +156,7 @@ (table_def :simple) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -170,7 +170,7 @@ (table_def :names) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -188,7 +188,7 @@ (column "active" :col_active)) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -202,7 +202,7 @@ (gnf_columns (column "user_id" :col_id) (column "user_name" :col_name)) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -216,7 +216,7 @@ (gnf_columns (column "id" :col_id) (column "score" :col_score)) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -230,7 +230,7 @@ (gnf_columns (column "score" :col_score)) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty/csv_storage_integration.lqp b/tests/pretty/csv_storage_integration.lqp index 7a308bc7..97748b05 100644 --- a/tests/pretty/csv_storage_integration.lqp +++ b/tests/pretty/csv_storage_integration.lqp @@ -9,7 +9,7 @@ (csv_locator (paths "s3://private-bucket/data.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -24,7 +24,7 @@ (csv_locator (paths "https://account.blob.core.windows.net/container/data.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "|" :csv_encoding "utf-8" @@ -50,7 +50,7 @@ (table_def :exported) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty/snapshot.lqp b/tests/pretty/snapshot.lqp index 0624a9a5..cb0f241d 100644 --- a/tests/pretty/snapshot.lqp +++ b/tests/pretty/snapshot.lqp @@ -18,7 +18,7 @@ "id,big_signed,big_unsigned\n1,170141183460469231731687303715884105727,340282366920938463463374607431768211455\n2,-170141183460469231731687303715884105728,0\n3,0,1")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty/unicode.lqp b/tests/pretty/unicode.lqp index ffee332c..fe22eb67 100644 --- a/tests/pretty/unicode.lqp +++ b/tests/pretty/unicode.lqp @@ -11,7 +11,7 @@ "id,name,city,greeting\n1,François,Paris,Bonjour\n2,田中,東京,こんにちは\n3,Müller,München,Grüß Gott\n4,Иван,Москва,Привет")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty_debug/cdc.lqp b/tests/pretty_debug/cdc.lqp index 80978d91..39a6c7b3 100644 --- a/tests/pretty_debug/cdc.lqp +++ b/tests/pretty_debug/cdc.lqp @@ -9,7 +9,7 @@ (csv_locator (paths "s3://bucket/cdc/batch_001.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty_debug/csv.lqp b/tests/pretty_debug/csv.lqp index b16a9370..cd80a07f 100644 --- a/tests/pretty_debug/csv.lqp +++ b/tests/pretty_debug/csv.lqp @@ -9,7 +9,7 @@ (csv_locator (paths "s3://bucket/data/file1.csv" "s3://bucket/data/file2.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -44,7 +44,7 @@ (csv_locator (inline_data "user_id,name,score\n1,Alice,95.5\n2,Bob,87.3")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -61,7 +61,7 @@ (csv_locator (paths "/local/path/data.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "\t" :csv_encoding "utf-8" @@ -77,7 +77,7 @@ (csv_locator (paths "data/infer.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty_debug/csv_export_v2.lqp b/tests/pretty_debug/csv_export_v2.lqp index 156b810b..073d6db4 100644 --- a/tests/pretty_debug/csv_export_v2.lqp +++ b/tests/pretty_debug/csv_export_v2.lqp @@ -71,7 +71,7 @@ (table_def 0xfcec892cae7f6ee39b75f34e659d672c) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -85,7 +85,7 @@ (table_def 0xfcec892cae7f6ee39b75f34e659d672c) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "|" :csv_encoding "utf-8" @@ -114,7 +114,7 @@ (table_def 0xe6d1c919204e329c580fbc9429ab4f9) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -128,7 +128,7 @@ (table_def 0x2d787823b6f9a0f453e42824c5a4d4b6) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -142,7 +142,7 @@ (table_def 0xfcec892cae7f6ee39b75f34e659d672c) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "\t" :csv_encoding "utf-8" @@ -156,7 +156,7 @@ (table_def 0x7057b7a1c77d1fe321a1afcff041d4e1) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -170,7 +170,7 @@ (table_def 0x8556eb0fb49a215ae5eb1b970cad0315) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -188,7 +188,7 @@ (column "active" 0xa97bc5091457148653c6a521ac05bfc1)) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -204,7 +204,7 @@ (column "user_name" 0xb87a660519d4c6d737802ad8ccc0cbbb)) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -220,7 +220,7 @@ (column "score" 0x1cc0df3ea1ebf5a81b22377b3d414fad)) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -234,7 +234,7 @@ (gnf_columns (column "score" 0x1cc0df3ea1ebf5a81b22377b3d414fad)) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty_debug/csv_storage_integration.lqp b/tests/pretty_debug/csv_storage_integration.lqp index 5d8e705c..edbd0706 100644 --- a/tests/pretty_debug/csv_storage_integration.lqp +++ b/tests/pretty_debug/csv_storage_integration.lqp @@ -9,7 +9,7 @@ (csv_locator (paths "s3://private-bucket/data.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" @@ -26,7 +26,7 @@ (csv_locator (paths "https://account.blob.core.windows.net/container/data.csv")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "|" :csv_encoding "utf-8" @@ -54,7 +54,7 @@ (table_def 0xe239456d024bc2c38b99cd9d5fabadab) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty_debug/snapshot.lqp b/tests/pretty_debug/snapshot.lqp index 18c7db4f..54d73ea7 100644 --- a/tests/pretty_debug/snapshot.lqp +++ b/tests/pretty_debug/snapshot.lqp @@ -20,7 +20,7 @@ "id,big_signed,big_unsigned\n1,170141183460469231731687303715884105727,340282366920938463463374607431768211455\n2,-170141183460469231731687303715884105728,0\n3,0,1")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8" diff --git a/tests/pretty_debug/unicode.lqp b/tests/pretty_debug/unicode.lqp index ff97b3a6..162afba4 100644 --- a/tests/pretty_debug/unicode.lqp +++ b/tests/pretty_debug/unicode.lqp @@ -11,7 +11,7 @@ "id,name,city,greeting\n1,François,Paris,Bonjour\n2,田中,東京,こんにちは\n3,Müller,München,Grüß Gott\n4,Иван,Москва,Привет")) (csv_config { - :csv_compression "auto" + :csv_compression "" :csv_decimal_separator "." :csv_delimiter "," :csv_encoding "utf-8"