Skip to content

Commit 6fbb2c7

Browse files
committed
Remove columns from iceberg export
1 parent b2cd2d8 commit 6fbb2c7

7 files changed

Lines changed: 6 additions & 43 deletions

File tree

meta/src/meta/grammar.y

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@
116116
%nonterm export_csv_config transactions.ExportCSVConfig
117117
%nonterm export_csv_path String
118118
%nonterm export_csv_source transactions.ExportCSVSource
119-
%nonterm export_iceberg_column transactions.ExportColumn
120-
%nonterm export_iceberg_columns Sequence[transactions.ExportColumn]
121119
%nonterm export_iceberg_config transactions.ExportIcebergConfig
122120
%nonterm export_iceberg_table_def logic.RelationId
123121
%nonterm iceberg_auth_properties Sequence[Tuple[String, String]]
@@ -1222,13 +1220,6 @@ iceberg_catalog_config
12221220
$5: Sequence[Tuple[String, String]] = builtin.dict_to_pairs($$.properties)
12231221
$6: Sequence[Tuple[String, String]] = builtin.dict_to_pairs($$.auth_properties)
12241222

1225-
export_iceberg_column
1226-
: "(" "column" STRING boolean_value ")"
1227-
construct: $$ = transactions.ExportColumn(name=$3, nullable=$4)
1228-
deconstruct:
1229-
$3: String = $$.name
1230-
$4: Boolean = $$.nullable
1231-
12321223
iceberg_to_snapshot
12331224
: "(" "to_snapshot" STRING ")"
12341225
construct: $$ = $3
@@ -1372,26 +1363,20 @@ export_iceberg_table_def
13721363
construct: $$ = $3
13731364
deconstruct: $3: logic.RelationId = $$
13741365

1375-
export_iceberg_columns
1376-
: "(" "columns" export_iceberg_column* ")"
1377-
construct: $$ = $3
1378-
deconstruct: $3: Sequence[transactions.ExportColumn] = $$
1379-
13801366
iceberg_table_properties
13811367
: "(" "table_properties" iceberg_property_entry* ")"
13821368
construct: $$ = $3
13831369
deconstruct: $3: Sequence[Tuple[String, String]] = $$
13841370

13851371
export_iceberg_config
1386-
: "(" "export_iceberg_config" iceberg_locator iceberg_catalog_config export_iceberg_table_def export_iceberg_columns iceberg_table_properties config_dict? ")"
1387-
construct: $$ = construct_export_iceberg_config_full($3, $4, $5, $6, $7, $8)
1372+
: "(" "export_iceberg_config" iceberg_locator iceberg_catalog_config export_iceberg_table_def iceberg_table_properties config_dict? ")"
1373+
construct: $$ = construct_export_iceberg_config_full($3, $4, $5, $6, $7)
13881374
deconstruct:
13891375
$3: logic.IcebergLocator = $$.locator
13901376
$4: logic.IcebergCatalogConfig = $$.config
13911377
$5: logic.RelationId = $$.table_def
1392-
$6: Sequence[transactions.ExportColumn] = $$.columns
1393-
$7: Sequence[Tuple[String, String]] = builtin.dict_to_pairs($$.table_properties)
1394-
$8: Optional[Sequence[Tuple[String, logic.Value]]] = deconstruct_export_iceberg_config_optional($$)
1378+
$6: Sequence[Tuple[String, String]] = builtin.dict_to_pairs($$.table_properties)
1379+
$7: Optional[Sequence[Tuple[String, logic.Value]]] = deconstruct_export_iceberg_config_optional($$)
13951380

13961381

13971382
%%

proto/relationalai/lqp/v1/transactions.proto

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,16 +122,10 @@ message ExportCSVSource {
122122

123123
// Iceberg Export config
124124

125-
message ExportColumn {
126-
string name = 1;
127-
bool nullable = 2;
128-
}
129-
130125
message ExportIcebergConfig {
131126
IcebergLocator locator = 1;
132127
IcebergCatalogConfig config = 2;
133128
RelationId table_def = 3; // Which definition to export as a table.
134-
repeated ExportColumn columns = 4;
135129
optional string prefix = 5; // File name prefix for parquet files that are produced.
136130
optional int64 target_file_size_bytes = 6;
137131
string compression = 7;

sdks/julia/LogicalQueryProtocol.jl/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "LogicalQueryProtocol"
22
uuid = "a92373ee-6cc4-4662-ae66-0c99a03ebae1"
3-
version = "0.5.1"
3+
version = "0.5.2"
44
authors = ["RelationalAI"]
55

66
[deps]

sdks/python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "lqp"
3-
version = "0.5.1"
3+
version = "0.5.2"
44
description = "Validate and translate Logical Query Protocol (LQP) S-expressions into Protobuf"
55
readme = "README.md"
66
authors = [

tests/lqp/iceberg_export.lqp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
(properties)
2222
(auth_properties))
2323
(table_def :sales)
24-
(columns
25-
(column "id" false)
26-
(column "region" false)
27-
(column "amount" false))
2824
(table_properties)))
2925

3026
;; Full export with scope, property maps, and trailing export options
@@ -42,10 +38,6 @@
4238
(prop "credential" "***")
4339
(prop "token" "***")))
4440
(table_def :sales)
45-
(columns
46-
(column "id" false)
47-
(column "region" false)
48-
(column "amount" false))
4941
(table_properties (prop "write.format.default" "parquet"))
5042
{:prefix "part" :target_file_size_bytes 268435456 :compression "SNAPPY"}))
5143

@@ -61,6 +53,4 @@
6153
(properties)
6254
(auth_properties))
6355
(table_def :sales)
64-
(columns
65-
(column "id" false))
6656
(table_properties))))))

tests/pretty/iceberg_export.lqp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
(properties)
2424
(auth_properties))
2525
(table_def :sales)
26-
(columns (column "id" false) (column "region" false) (column "amount" false))
2726
(table_properties)))
2827
(export_iceberg
2928
(export_iceberg_config
@@ -37,7 +36,6 @@
3736
(properties (prop "client.region" "us-east-1"))
3837
(auth_properties (prop "credential" "***") (prop "token" "***")))
3938
(table_def :sales)
40-
(columns (column "id" false) (column "region" false) (column "amount" false))
4139
(table_properties (prop "write.format.default" "parquet"))
4240
{ :compression "SNAPPY" :prefix "part" :target_file_size_bytes 268435456}))
4341
(export_iceberg
@@ -51,5 +49,4 @@
5149
(properties)
5250
(auth_properties))
5351
(table_def :sales)
54-
(columns (column "id" false))
5552
(table_properties))))))

tests/pretty_debug/iceberg_export.lqp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
(properties)
2424
(auth_properties))
2525
(table_def 0x585c5a1121bd88784c1378aa8837195c)
26-
(columns (column "id" false) (column "region" false) (column "amount" false))
2726
(table_properties)))
2827
(export_iceberg
2928
(export_iceberg_config
@@ -37,7 +36,6 @@
3736
(properties (prop "client.region" "us-east-1"))
3837
(auth_properties (prop "credential" "***") (prop "token" "***")))
3938
(table_def 0x585c5a1121bd88784c1378aa8837195c)
40-
(columns (column "id" false) (column "region" false) (column "amount" false))
4139
(table_properties (prop "write.format.default" "parquet"))
4240
{ :compression "SNAPPY" :prefix "part" :target_file_size_bytes 268435456}))
4341
(export_iceberg
@@ -51,7 +49,6 @@
5149
(properties)
5250
(auth_properties))
5351
(table_def 0x585c5a1121bd88784c1378aa8837195c)
54-
(columns (column "id" false))
5552
(table_properties))))))
5653

5754
;; Debug information

0 commit comments

Comments
 (0)