Skip to content

Commit cbceee4

Browse files
benbellickbenbellick
committed
feat: uri -> urn grep replace + regen protos from v0.77.0
Note, this is not passing any of the tests, and more work is necessary.
1 parent 711bd96 commit cbceee4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+938
-805
lines changed

‎examples/builder_example.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ def basic_example():
4040
pretty_print_plan(table(registry), use_colors=True)
4141

4242
"""
43-
extension_uris {
44-
extension_uri_anchor: 13
45-
uri: "functions_comparison.yaml"
43+
extension_urns {
44+
extension_urn_anchor: 13
45+
urn: "functions_comparison.yaml"
4646
}
4747
extensions {
4848
extension_function {
49-
extension_uri_reference: 13
49+
extension_urn_reference: 13
5050
function_anchor: 495
5151
name: "lt"
5252
}

‎src/substrait/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
except ImportError:
44
pass
55

6-
__substrait_version__ = "0.74.0"
7-
__substrait_hash__ = "793c64b"
6+
__substrait_version__ = "0.77.0"
7+
__substrait_hash__ = "3c25b1b"
88
__minimum_substrait_version__ = "0.30.0"

‎src/substrait/builders/extended_expression.py‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from substrait.extension_registry import ExtensionRegistry
88
from substrait.utils import (
99
type_num_names,
10-
merge_extension_uris,
10+
merge_extension_urns,
1111
merge_extension_declarations,
1212
)
1313
from substrait.type_inference import infer_extended_expression_schema
@@ -204,7 +204,7 @@ def resolve(
204204

205205

206206
def scalar_function(
207-
uri: str,
207+
urn: str,
208208
function: str,
209209
expressions: Iterable[ExtendedExpressionOrUnbound],
210210
alias: Union[Iterable[str], str] = None,
@@ -224,29 +224,29 @@ def resolve(
224224

225225
signature = [typ for es in expression_schemas for typ in es.types]
226226

227-
func = registry.lookup_function(uri, function, signature)
227+
func = registry.lookup_function(urn, function, signature)
228228

229229
if not func:
230230
raise Exception(f"Unknown function {function} for {signature}")
231231

232-
func_extension_uris = [
233-
ste.SimpleExtensionURI(
234-
extension_uri_anchor=registry.lookup_uri(uri), uri=uri
232+
func_extension_urns = [
233+
ste.SimpleExtensionURN(
234+
extension_urn_anchor=registry.lookup_urn(urn), urn=urn
235235
)
236236
]
237237

238238
func_extensions = [
239239
ste.SimpleExtensionDeclaration(
240240
extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
241-
extension_uri_reference=registry.lookup_uri(uri),
241+
extension_urn_reference=registry.lookup_urn(urn),
242242
function_anchor=func[0].anchor,
243243
name=str(func[0]),
244244
)
245245
)
246246
]
247247

248-
extension_uris = merge_extension_uris(
249-
func_extension_uris, *[b.extension_uris for b in bound_expressions]
248+
extension_urns = merge_extension_urns(
249+
func_extension_urns, *[b.extension_urns for b in bound_expressions]
250250
)
251251

252252
extensions = merge_extension_declarations(
@@ -276,15 +276,15 @@ def resolve(
276276
)
277277
],
278278
base_schema=base_schema,
279-
extension_uris=extension_uris,
279+
extension_urns=extension_urns,
280280
extensions=extensions,
281281
)
282282

283283
return resolve
284284

285285

286286
def aggregate_function(
287-
uri: str,
287+
urn: str,
288288
function: str,
289289
expressions: Iterable[ExtendedExpressionOrUnbound],
290290
alias: Union[Iterable[str], str] = None,
@@ -304,29 +304,29 @@ def resolve(
304304

305305
signature = [typ for es in expression_schemas for typ in es.types]
306306

307-
func = registry.lookup_function(uri, function, signature)
307+
func = registry.lookup_function(urn, function, signature)
308308

309309
if not func:
310310
raise Exception(f"Unknown function {function} for {signature}")
311311

312-
func_extension_uris = [
313-
ste.SimpleExtensionURI(
314-
extension_uri_anchor=registry.lookup_uri(uri), uri=uri
312+
func_extension_urns = [
313+
ste.SimpleExtensionURN(
314+
extension_urn_anchor=registry.lookup_urn(urn), urn=urn
315315
)
316316
]
317317

318318
func_extensions = [
319319
ste.SimpleExtensionDeclaration(
320320
extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
321-
extension_uri_reference=registry.lookup_uri(uri),
321+
extension_urn_reference=registry.lookup_urn(urn),
322322
function_anchor=func[0].anchor,
323323
name=str(func[0]),
324324
)
325325
)
326326
]
327327

328-
extension_uris = merge_extension_uris(
329-
func_extension_uris, *[b.extension_uris for b in bound_expressions]
328+
extension_urns = merge_extension_urns(
329+
func_extension_urns, *[b.extension_urns for b in bound_expressions]
330330
)
331331

332332
extensions = merge_extension_declarations(
@@ -352,7 +352,7 @@ def resolve(
352352
)
353353
],
354354
base_schema=base_schema,
355-
extension_uris=extension_uris,
355+
extension_urns=extension_urns,
356356
extensions=extensions,
357357
)
358358

@@ -361,7 +361,7 @@ def resolve(
361361

362362
# TODO bounds, sorts
363363
def window_function(
364-
uri: str,
364+
urn: str,
365365
function: str,
366366
expressions: Iterable[ExtendedExpressionOrUnbound],
367367
partitions: Iterable[ExtendedExpressionOrUnbound] = [],
@@ -386,31 +386,31 @@ def resolve(
386386

387387
signature = [typ for es in expression_schemas for typ in es.types]
388388

389-
func = registry.lookup_function(uri, function, signature)
389+
func = registry.lookup_function(urn, function, signature)
390390

391391
if not func:
392392
raise Exception(f"Unknown function {function} for {signature}")
393393

394-
func_extension_uris = [
395-
ste.SimpleExtensionURI(
396-
extension_uri_anchor=registry.lookup_uri(uri), uri=uri
394+
func_extension_urns = [
395+
ste.SimpleExtensionURN(
396+
extension_urn_anchor=registry.lookup_urn(urn), urn=urn
397397
)
398398
]
399399

400400
func_extensions = [
401401
ste.SimpleExtensionDeclaration(
402402
extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
403-
extension_uri_reference=registry.lookup_uri(uri),
403+
extension_urn_reference=registry.lookup_urn(urn),
404404
function_anchor=func[0].anchor,
405405
name=str(func[0]),
406406
)
407407
)
408408
]
409409

410-
extension_uris = merge_extension_uris(
411-
func_extension_uris,
412-
*[b.extension_uris for b in bound_expressions],
413-
*[b.extension_uris for b in bound_partitions],
410+
extension_urns = merge_extension_urns(
411+
func_extension_urns,
412+
*[b.extension_urns for b in bound_expressions],
413+
*[b.extension_urns for b in bound_partitions],
414414
)
415415

416416
extensions = merge_extension_declarations(
@@ -445,7 +445,7 @@ def resolve(
445445
)
446446
],
447447
base_schema=base_schema,
448-
extension_uris=extension_uris,
448+
extension_urns=extension_urns,
449449
extensions=extensions,
450450
)
451451

@@ -472,10 +472,10 @@ def resolve(
472472

473473
bound_else = resolve_expression(_else, base_schema, registry)
474474

475-
extension_uris = merge_extension_uris(
476-
*[b[0].extension_uris for b in bound_ifs],
477-
*[b[1].extension_uris for b in bound_ifs],
478-
bound_else.extension_uris,
475+
extension_urns = merge_extension_urns(
476+
*[b[0].extension_urns for b in bound_ifs],
477+
*[b[1].extension_urns for b in bound_ifs],
478+
bound_else.extension_urns,
479479
)
480480

481481
extensions = merge_extension_declarations(
@@ -523,7 +523,7 @@ def resolve(
523523
)
524524
],
525525
base_schema=base_schema,
526-
extension_uris=extension_uris,
526+
extension_urns=extension_urns,
527527
extensions=extensions,
528528
)
529529

@@ -550,10 +550,10 @@ def resolve(
550550
]
551551
bound_else = resolve_expression(_else, base_schema, registry)
552552

553-
extension_uris = merge_extension_uris(
554-
bound_match.extension_uris,
555-
*[b.extension_uris for _, b in bound_ifs],
556-
bound_else.extension_uris,
553+
extension_urns = merge_extension_urns(
554+
bound_match.extension_urns,
555+
*[b.extension_urns for _, b in bound_ifs],
556+
bound_else.extension_urns,
557557
)
558558

559559
extensions = merge_extension_declarations(
@@ -584,7 +584,7 @@ def resolve(
584584
)
585585
],
586586
base_schema=base_schema,
587-
extension_uris=extension_uris,
587+
extension_urns=extension_urns,
588588
extensions=extensions,
589589
)
590590

@@ -602,8 +602,8 @@ def resolve(
602602
bound_value = resolve_expression(value, base_schema, registry)
603603
bound_options = [resolve_expression(o, base_schema, registry) for o in options]
604604

605-
extension_uris = merge_extension_uris(
606-
bound_value.extension_uris, *[b.extension_uris for b in bound_options]
605+
extension_urns = merge_extension_urns(
606+
bound_value.extension_urns, *[b.extension_urns for b in bound_options]
607607
)
608608

609609
extensions = merge_extension_declarations(
@@ -627,7 +627,7 @@ def resolve(
627627
)
628628
],
629629
base_schema=base_schema,
630-
extension_uris=extension_uris,
630+
extension_urns=extension_urns,
631631
extensions=extensions,
632632
)
633633

@@ -648,12 +648,12 @@ def resolve(
648648
[resolve_expression(e, base_schema, registry) for e in o] for o in options
649649
]
650650

651-
extension_uris = merge_extension_uris(
652-
*[b.extension_uris for b in bound_value],
653-
*[e.extension_uris for b in bound_options for e in b],
651+
extension_urns = merge_extension_urns(
652+
*[b.extension_urns for b in bound_value],
653+
*[e.extension_urns for b in bound_options for e in b],
654654
)
655655

656-
extensions = merge_extension_uris(
656+
extensions = merge_extension_urns(
657657
*[b.extensions for b in bound_value],
658658
*[e.extensions for b in bound_options for e in b],
659659
)
@@ -678,7 +678,7 @@ def resolve(
678678
)
679679
],
680680
base_schema=base_schema,
681-
extension_uris=extension_uris,
681+
extension_urns=extension_urns,
682682
extensions=extensions,
683683
)
684684

@@ -707,7 +707,7 @@ def resolve(
707707
)
708708
],
709709
base_schema=base_schema,
710-
extension_uris=bound_input.extension_uris,
710+
extension_urns=bound_input.extension_urns,
711711
extensions=bound_input.extensions,
712712
)
713713

‎src/substrait/builders/plan.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
resolve_expression,
1919
)
2020
from substrait.type_inference import infer_plan_schema
21-
from substrait.utils import merge_extension_declarations, merge_extension_uris
21+
from substrait.utils import merge_extension_declarations, merge_extension_urns
2222

2323
UnboundPlan = Callable[[ExtensionRegistry], stp.Plan]
2424

@@ -27,7 +27,7 @@
2727

2828
def _merge_extensions(*objs):
2929
return {
30-
"extension_uris": merge_extension_uris(*[b.extension_uris for b in objs if b]),
30+
"extension_urns": merge_extension_urns(*[b.extension_urns for b in objs if b]),
3131
"extensions": merge_extension_declarations(*[b.extensions for b in objs if b]),
3232
}
3333

0 commit comments

Comments
 (0)