Skip to content

Commit 39c9be5

Browse files
vustefvustef
committed
rename to iceberg_catalog_config in the grammar
1 parent 65d373a commit 39c9be5

13 files changed

Lines changed: 95 additions & 95 deletions

File tree

‎meta/src/meta/grammar.y‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@
117117
%nonterm export_csv_path String
118118
%nonterm export_csv_source transactions.ExportCSVSource
119119
%nonterm export_iceberg_config transactions.ExportIcebergConfig
120-
%nonterm iceberg_config logic.IcebergCatalogConfig
121-
%nonterm iceberg_config_scope String
120+
%nonterm iceberg_catalog_config logic.IcebergCatalogConfig
121+
%nonterm iceberg_catalog_config_scope String
122122
%nonterm iceberg_data logic.IcebergData
123123
%nonterm iceberg_export_column transactions.ExportIcebergColumn
124124
%nonterm iceberg_locator logic.IcebergLocator
@@ -1153,17 +1153,17 @@ iceberg_locator
11531153
$9: Sequence[String] = $$.namespace
11541154
$13: String = $$.warehouse
11551155

1156-
iceberg_config_scope
1156+
iceberg_catalog_config_scope
11571157
: "(" "scope" STRING ")"
11581158
construct: $$ = $3
11591159
deconstruct: $3: String = $$
11601160

1161-
iceberg_config
1162-
: "(" "iceberg_config" "(" "catalog_uri" STRING ")" iceberg_config_scope? "(" "properties" iceberg_property_entry* ")" "(" "auth_properties" iceberg_property_entry* ")" ")"
1163-
construct: $$ = construct_iceberg_config($5, $7, $10, $14)
1161+
iceberg_catalog_config
1162+
: "(" "iceberg_catalog_config" "(" "catalog_uri" STRING ")" iceberg_catalog_config_scope? "(" "properties" iceberg_property_entry* ")" "(" "auth_properties" iceberg_property_entry* ")" ")"
1163+
construct: $$ = construct_iceberg_catalog_config($5, $7, $10, $14)
11641164
deconstruct:
11651165
$5: String = $$.catalog_uri
1166-
$7: Optional[String] = deconstruct_iceberg_config_scope_optional($$)
1166+
$7: Optional[String] = deconstruct_iceberg_catalog_config_scope_optional($$)
11671167
$10: Sequence[Tuple[String, String]] = builtin.dict_to_pairs($$.properties)
11681168
$14: Sequence[Tuple[String, String]] = builtin.dict_to_pairs($$.auth_properties)
11691169

@@ -1182,7 +1182,7 @@ iceberg_to_snapshot
11821182
deconstruct: $3: String = $$
11831183

11841184
iceberg_data
1185-
: "(" "iceberg_data" iceberg_locator iceberg_config gnf_columns iceberg_to_snapshot? ")"
1185+
: "(" "iceberg_data" iceberg_locator iceberg_catalog_config gnf_columns iceberg_to_snapshot? ")"
11861186
construct: $$ = logic.IcebergData(locator=$3, config=$4, columns=$5, to_snapshot=builtin.some(builtin.unwrap_option_or($6, "")))
11871187
deconstruct:
11881188
$3: logic.IcebergLocator = $$.locator
@@ -1311,7 +1311,7 @@ export_csv_source
13111311
$3: logic.RelationId = $$.table_def
13121312

13131313
export_iceberg_config
1314-
: "(" "export_iceberg_config" iceberg_locator iceberg_config "(" "columns" iceberg_export_column* ")" "(" "create_table_properties" iceberg_property_entry* ")" config_dict? ")"
1314+
: "(" "export_iceberg_config" iceberg_locator iceberg_catalog_config "(" "columns" iceberg_export_column* ")" "(" "create_table_properties" iceberg_property_entry* ")" config_dict? ")"
13151315
construct: $$ = construct_export_iceberg_config_full($3, $4, $7, $11, $13)
13161316
deconstruct:
13171317
$3: logic.IcebergLocator = $$.locator
@@ -1637,7 +1637,7 @@ def deconstruct_export_csv_config(msg: transactions.ExportCSVConfig) -> List[Tup
16371637
return builtin.list_sort(result)
16381638

16391639

1640-
def construct_iceberg_config(
1640+
def construct_iceberg_catalog_config(
16411641
catalog_uri: String,
16421642
scope_opt: Optional[String],
16431643
property_pairs: Sequence[Tuple[String, String]],
@@ -1653,7 +1653,7 @@ def construct_iceberg_config(
16531653
)
16541654

16551655

1656-
def deconstruct_iceberg_config_scope_optional(msg: logic.IcebergCatalogConfig) -> Optional[String]:
1656+
def deconstruct_iceberg_catalog_config_scope_optional(msg: logic.IcebergCatalogConfig) -> Optional[String]:
16571657
if builtin.unwrap_option(msg.scope) != "":
16581658
return builtin.some(builtin.unwrap_option(msg.scope))
16591659
return builtin.none()

‎sdks/go/src/parser.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ func (p *Parser) construct_export_csv_config_with_source(path string, csv_source
855855
return _t2108
856856
}
857857

858-
func (p *Parser) construct_iceberg_config(catalog_uri string, scope_opt *string, property_pairs [][]interface{}, auth_property_pairs [][]interface{}) *pb.IcebergCatalogConfig {
858+
func (p *Parser) construct_iceberg_catalog_config(catalog_uri string, scope_opt *string, property_pairs [][]interface{}, auth_property_pairs [][]interface{}) *pb.IcebergCatalogConfig {
859859
props := stringMapFromPairs(property_pairs)
860860
auth_props := stringMapFromPairs(auth_property_pairs)
861861
_t2109 := &pb.IcebergCatalogConfig{CatalogUri: catalog_uri, Scope: ptr(deref(scope_opt, "")), Properties: props, AuthProperties: auth_props}
@@ -4368,8 +4368,8 @@ func (p *Parser) parse_iceberg_data() *pb.IcebergData {
43684368
p.consumeLiteral("iceberg_data")
43694369
_t1960 := p.parse_iceberg_locator()
43704370
iceberg_locator1186 := _t1960
4371-
_t1961 := p.parse_iceberg_config()
4372-
iceberg_config1187 := _t1961
4371+
_t1961 := p.parse_iceberg_catalog_config()
4372+
iceberg_catalog_config1187 := _t1961
43734373
_t1962 := p.parse_gnf_columns()
43744374
gnf_columns1188 := _t1962
43754375
var _t1963 *string
@@ -4379,7 +4379,7 @@ func (p *Parser) parse_iceberg_data() *pb.IcebergData {
43794379
}
43804380
iceberg_to_snapshot1189 := _t1963
43814381
p.consumeLiteral(")")
4382-
_t1965 := &pb.IcebergData{Locator: iceberg_locator1186, Config: iceberg_config1187, Columns: gnf_columns1188, ToSnapshot: ptr(deref(iceberg_to_snapshot1189, ""))}
4382+
_t1965 := &pb.IcebergData{Locator: iceberg_locator1186, Config: iceberg_catalog_config1187, Columns: gnf_columns1188, ToSnapshot: ptr(deref(iceberg_to_snapshot1189, ""))}
43834383
result1191 := _t1965
43844384
p.recordSpan(int(span_start1190), "IcebergData")
43854385
return result1191
@@ -4415,20 +4415,20 @@ func (p *Parser) parse_iceberg_locator() *pb.IcebergLocator {
44154415
return result1199
44164416
}
44174417

4418-
func (p *Parser) parse_iceberg_config() *pb.IcebergCatalogConfig {
4418+
func (p *Parser) parse_iceberg_catalog_config() *pb.IcebergCatalogConfig {
44194419
span_start1210 := int64(p.spanStart())
44204420
p.consumeLiteral("(")
4421-
p.consumeLiteral("iceberg_config")
4421+
p.consumeLiteral("iceberg_catalog_config")
44224422
p.consumeLiteral("(")
44234423
p.consumeLiteral("catalog_uri")
44244424
string1200 := p.consumeTerminal("STRING").Value.str
44254425
p.consumeLiteral(")")
44264426
var _t1967 *string
44274427
if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("scope", 1)) {
4428-
_t1968 := p.parse_iceberg_config_scope()
4428+
_t1968 := p.parse_iceberg_catalog_config_scope()
44294429
_t1967 = ptr(_t1968)
44304430
}
4431-
iceberg_config_scope1201 := _t1967
4431+
iceberg_catalog_config_scope1201 := _t1967
44324432
p.consumeLiteral("(")
44334433
p.consumeLiteral("properties")
44344434
xs1202 := [][]interface{}{}
@@ -4454,13 +4454,13 @@ func (p *Parser) parse_iceberg_config() *pb.IcebergCatalogConfig {
44544454
iceberg_property_entrys_131209 := xs1206
44554455
p.consumeLiteral(")")
44564456
p.consumeLiteral(")")
4457-
_t1971 := p.construct_iceberg_config(string1200, iceberg_config_scope1201, iceberg_property_entrys1205, iceberg_property_entrys_131209)
4457+
_t1971 := p.construct_iceberg_catalog_config(string1200, iceberg_catalog_config_scope1201, iceberg_property_entrys1205, iceberg_property_entrys_131209)
44584458
result1211 := _t1971
44594459
p.recordSpan(int(span_start1210), "IcebergCatalogConfig")
44604460
return result1211
44614461
}
44624462

4463-
func (p *Parser) parse_iceberg_config_scope() string {
4463+
func (p *Parser) parse_iceberg_catalog_config_scope() string {
44644464
p.consumeLiteral("(")
44654465
p.consumeLiteral("scope")
44664466
string1212 := p.consumeTerminal("STRING").Value.str
@@ -4942,8 +4942,8 @@ func (p *Parser) parse_export_iceberg_config() *pb.ExportIcebergConfig {
49424942
p.consumeLiteral("export_iceberg_config")
49434943
_t2051 := p.parse_iceberg_locator()
49444944
iceberg_locator1293 := _t2051
4945-
_t2052 := p.parse_iceberg_config()
4946-
iceberg_config1294 := _t2052
4945+
_t2052 := p.parse_iceberg_catalog_config()
4946+
iceberg_catalog_config1294 := _t2052
49474947
p.consumeLiteral("(")
49484948
p.consumeLiteral("columns")
49494949
xs1295 := []*pb.ExportIcebergColumn{}
@@ -4975,7 +4975,7 @@ func (p *Parser) parse_export_iceberg_config() *pb.ExportIcebergConfig {
49754975
}
49764976
config_dict1303 := _t2055
49774977
p.consumeLiteral(")")
4978-
_t2057 := p.construct_export_iceberg_config_full(iceberg_locator1293, iceberg_config1294, iceberg_export_columns1298, iceberg_property_entrys1302, config_dict1303)
4978+
_t2057 := p.construct_export_iceberg_config_full(iceberg_locator1293, iceberg_catalog_config1294, iceberg_export_columns1298, iceberg_property_entrys1302, config_dict1303)
49794979
result1305 := _t2057
49804980
p.recordSpan(int(span_start1304), "ExportIcebergConfig")
49814981
return result1305

‎sdks/go/src/pretty.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ func (p *PrettyPrinter) deconstruct_export_csv_config(msg *pb.ExportCSVConfig) [
495495
return listSort(result)
496496
}
497497

498-
func (p *PrettyPrinter) deconstruct_iceberg_config_scope_optional(msg *pb.IcebergCatalogConfig) *string {
498+
func (p *PrettyPrinter) deconstruct_iceberg_catalog_config_scope_optional(msg *pb.IcebergCatalogConfig) *string {
499499
var _t1718 interface{}
500500
if *msg.Scope != "" {
501501
return ptr(*msg.Scope)
@@ -4003,7 +4003,7 @@ func (p *PrettyPrinter) pretty_iceberg_data(msg *pb.IcebergData) interface{} {
40034003
p.pretty_iceberg_locator(field1401)
40044004
p.newline()
40054005
field1402 := unwrapped_fields1400[1].(*pb.IcebergCatalogConfig)
4006-
p.pretty_iceberg_config(field1402)
4006+
p.pretty_iceberg_catalog_config(field1402)
40074007
p.newline()
40084008
field1403 := unwrapped_fields1400[2].([]*pb.GNFColumn)
40094009
p.pretty_gnf_columns(field1403)
@@ -4071,18 +4071,18 @@ func (p *PrettyPrinter) pretty_iceberg_locator(msg *pb.IcebergLocator) interface
40714071
return nil
40724072
}
40734073

4074-
func (p *PrettyPrinter) pretty_iceberg_config(msg *pb.IcebergCatalogConfig) interface{} {
4075-
flat1426 := p.tryFlat(msg, func() { p.pretty_iceberg_config(msg) })
4074+
func (p *PrettyPrinter) pretty_iceberg_catalog_config(msg *pb.IcebergCatalogConfig) interface{} {
4075+
flat1426 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config(msg) })
40764076
if flat1426 != nil {
40774077
p.write(*flat1426)
40784078
return nil
40794079
} else {
40804080
_dollar_dollar := msg
4081-
_t1666 := p.deconstruct_iceberg_config_scope_optional(_dollar_dollar)
4081+
_t1666 := p.deconstruct_iceberg_catalog_config_scope_optional(_dollar_dollar)
40824082
fields1415 := []interface{}{_dollar_dollar.GetCatalogUri(), _t1666, dictToPairs(_dollar_dollar.GetProperties()), dictToPairs(_dollar_dollar.GetAuthProperties())}
40834083
unwrapped_fields1416 := fields1415
40844084
p.write("(")
4085-
p.write("iceberg_config")
4085+
p.write("iceberg_catalog_config")
40864086
p.indentSexp()
40874087
p.newline()
40884088
p.write("(")
@@ -4097,7 +4097,7 @@ func (p *PrettyPrinter) pretty_iceberg_config(msg *pb.IcebergCatalogConfig) inte
40974097
if field1418 != nil {
40984098
p.newline()
40994099
opt_val1419 := *field1418
4100-
p.pretty_iceberg_config_scope(opt_val1419)
4100+
p.pretty_iceberg_catalog_config_scope(opt_val1419)
41014101
}
41024102
p.newline()
41034103
p.write("(")
@@ -4137,8 +4137,8 @@ func (p *PrettyPrinter) pretty_iceberg_config(msg *pb.IcebergCatalogConfig) inte
41374137
return nil
41384138
}
41394139

4140-
func (p *PrettyPrinter) pretty_iceberg_config_scope(msg string) interface{} {
4141-
flat1428 := p.tryFlat(msg, func() { p.pretty_iceberg_config_scope(msg) })
4140+
func (p *PrettyPrinter) pretty_iceberg_catalog_config_scope(msg string) interface{} {
4141+
flat1428 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config_scope(msg) })
41424142
if flat1428 != nil {
41434143
p.write(*flat1428)
41444144
return nil
@@ -4721,7 +4721,7 @@ func (p *PrettyPrinter) pretty_export_iceberg_config(msg *pb.ExportIcebergConfig
47214721
p.pretty_iceberg_locator(field1524)
47224722
p.newline()
47234723
field1525 := unwrapped_fields1523[1].(*pb.IcebergCatalogConfig)
4724-
p.pretty_iceberg_config(field1525)
4724+
p.pretty_iceberg_catalog_config(field1525)
47254725
p.newline()
47264726
p.write("(")
47274727
p.newline()
@@ -5142,7 +5142,7 @@ func (p *PrettyPrinter) pprintDispatch(msg interface{}) {
51425142
case *pb.IcebergLocator:
51435143
p.pretty_iceberg_locator(m)
51445144
case *pb.IcebergCatalogConfig:
5145-
p.pretty_iceberg_config(m)
5145+
p.pretty_iceberg_catalog_config(m)
51465146
case *pb.Undefine:
51475147
p.pretty_undefine(m)
51485148
case *pb.Context:

‎sdks/julia/LogicalQueryProtocol.jl/src/parser.jl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ function construct_export_csv_config_with_source(parser::ParserState, path::Stri
564564
return _t2097
565565
end
566566

567-
function construct_iceberg_config(parser::ParserState, catalog_uri::String, scope_opt::Union{Nothing, String}, property_pairs::Vector{Tuple{String, String}}, auth_property_pairs::Vector{Tuple{String, String}})::Proto.IcebergCatalogConfig
567+
function construct_iceberg_catalog_config(parser::ParserState, catalog_uri::String, scope_opt::Union{Nothing, String}, property_pairs::Vector{Tuple{String, String}}, auth_property_pairs::Vector{Tuple{String, String}})::Proto.IcebergCatalogConfig
568568
props = Dict(property_pairs)
569569
auth_props = Dict(auth_property_pairs)
570570
_t2098 = Proto.IcebergCatalogConfig(catalog_uri=catalog_uri, scope=(!isnothing(scope_opt) ? scope_opt : ""), properties=props, auth_properties=auth_props)
@@ -3695,8 +3695,8 @@ function parse_iceberg_data(parser::ParserState)::Proto.IcebergData
36953695
consume_literal!(parser, "iceberg_data")
36963696
_t1949 = parse_iceberg_locator(parser)
36973697
iceberg_locator1186 = _t1949
3698-
_t1950 = parse_iceberg_config(parser)
3699-
iceberg_config1187 = _t1950
3698+
_t1950 = parse_iceberg_catalog_config(parser)
3699+
iceberg_catalog_config1187 = _t1950
37003700
_t1951 = parse_gnf_columns(parser)
37013701
gnf_columns1188 = _t1951
37023702
if match_lookahead_literal(parser, "(", 0)
@@ -3707,7 +3707,7 @@ function parse_iceberg_data(parser::ParserState)::Proto.IcebergData
37073707
end
37083708
iceberg_to_snapshot1189 = _t1952
37093709
consume_literal!(parser, ")")
3710-
_t1954 = Proto.IcebergData(locator=iceberg_locator1186, config=iceberg_config1187, columns=gnf_columns1188, to_snapshot=(!isnothing(iceberg_to_snapshot1189) ? iceberg_to_snapshot1189 : ""))
3710+
_t1954 = Proto.IcebergData(locator=iceberg_locator1186, config=iceberg_catalog_config1187, columns=gnf_columns1188, to_snapshot=(!isnothing(iceberg_to_snapshot1189) ? iceberg_to_snapshot1189 : ""))
37113711
result1191 = _t1954
37123712
record_span!(parser, span_start1190, "IcebergData")
37133713
return result1191
@@ -3743,21 +3743,21 @@ function parse_iceberg_locator(parser::ParserState)::Proto.IcebergLocator
37433743
return result1199
37443744
end
37453745

3746-
function parse_iceberg_config(parser::ParserState)::Proto.IcebergCatalogConfig
3746+
function parse_iceberg_catalog_config(parser::ParserState)::Proto.IcebergCatalogConfig
37473747
span_start1210 = span_start(parser)
37483748
consume_literal!(parser, "(")
3749-
consume_literal!(parser, "iceberg_config")
3749+
consume_literal!(parser, "iceberg_catalog_config")
37503750
consume_literal!(parser, "(")
37513751
consume_literal!(parser, "catalog_uri")
37523752
string1200 = consume_terminal!(parser, "STRING")
37533753
consume_literal!(parser, ")")
37543754
if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "scope", 1))
3755-
_t1957 = parse_iceberg_config_scope(parser)
3755+
_t1957 = parse_iceberg_catalog_config_scope(parser)
37563756
_t1956 = _t1957
37573757
else
37583758
_t1956 = nothing
37593759
end
3760-
iceberg_config_scope1201 = _t1956
3760+
iceberg_catalog_config_scope1201 = _t1956
37613761
consume_literal!(parser, "(")
37623762
consume_literal!(parser, "properties")
37633763
xs1202 = Tuple{String, String}[]
@@ -3783,13 +3783,13 @@ function parse_iceberg_config(parser::ParserState)::Proto.IcebergCatalogConfig
37833783
iceberg_property_entrys_131209 = xs1206
37843784
consume_literal!(parser, ")")
37853785
consume_literal!(parser, ")")
3786-
_t1960 = construct_iceberg_config(parser, string1200, iceberg_config_scope1201, iceberg_property_entrys1205, iceberg_property_entrys_131209)
3786+
_t1960 = construct_iceberg_catalog_config(parser, string1200, iceberg_catalog_config_scope1201, iceberg_property_entrys1205, iceberg_property_entrys_131209)
37873787
result1211 = _t1960
37883788
record_span!(parser, span_start1210, "IcebergCatalogConfig")
37893789
return result1211
37903790
end
37913791

3792-
function parse_iceberg_config_scope(parser::ParserState)::String
3792+
function parse_iceberg_catalog_config_scope(parser::ParserState)::String
37933793
consume_literal!(parser, "(")
37943794
consume_literal!(parser, "scope")
37953795
string1212 = consume_terminal!(parser, "STRING")
@@ -4236,8 +4236,8 @@ function parse_export_iceberg_config(parser::ParserState)::Proto.ExportIcebergCo
42364236
consume_literal!(parser, "export_iceberg_config")
42374237
_t2040 = parse_iceberg_locator(parser)
42384238
iceberg_locator1293 = _t2040
4239-
_t2041 = parse_iceberg_config(parser)
4240-
iceberg_config1294 = _t2041
4239+
_t2041 = parse_iceberg_catalog_config(parser)
4240+
iceberg_catalog_config1294 = _t2041
42414241
consume_literal!(parser, "(")
42424242
consume_literal!(parser, "columns")
42434243
xs1295 = Proto.ExportIcebergColumn[]
@@ -4270,7 +4270,7 @@ function parse_export_iceberg_config(parser::ParserState)::Proto.ExportIcebergCo
42704270
end
42714271
config_dict1303 = _t2044
42724272
consume_literal!(parser, ")")
4273-
_t2046 = construct_export_iceberg_config_full(parser, iceberg_locator1293, iceberg_config1294, iceberg_export_columns1298, iceberg_property_entrys1302, config_dict1303)
4273+
_t2046 = construct_export_iceberg_config_full(parser, iceberg_locator1293, iceberg_catalog_config1294, iceberg_export_columns1298, iceberg_property_entrys1302, config_dict1303)
42744274
result1305 = _t2046
42754275
record_span!(parser, span_start1304, "ExportIcebergConfig")
42764276
return result1305

0 commit comments

Comments
 (0)