Skip to content

Commit 1b0b13c

Browse files
hbarthelsclaude
andcommitted
Rename CdcTargets proto message to CDCTargets
Use the conventional all-caps CDC acronym for the message name. The oneof field stays `cdc`; only the message type name changes, so there is no wire-format or s-expression syntax change (no .bin/snapshot diffs). Regenerated all three SDKs and updated the hand-written Julia equality + equality tests. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 5b2feed commit 1b0b13c

14 files changed

Lines changed: 61 additions & 61 deletions

File tree

meta/src/meta/grammar.y

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ def construct_cdc_relations(
15411541
) -> logic.TargetRelations:
15421542
return logic.TargetRelations(
15431543
keys=list[logic.NamedColumn](),
1544-
cdc=logic.CdcTargets(inserts=inserts, deletes=deletes),
1544+
cdc=logic.CDCTargets(inserts=inserts, deletes=deletes),
15451545
)
15461546

15471547

proto/relationalai/lqp/v1/logic.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ message PlainTargets {
307307
}
308308

309309
// CDC load: input rows are routed by METADATA$ACTION into insert and delete deltas.
310-
message CdcTargets {
310+
message CDCTargets {
311311
repeated TargetRelation inserts = 1; // INSERT-action rows feed these
312312
repeated TargetRelation deletes = 2; // DELETE-action rows feed these
313313
}
@@ -318,7 +318,7 @@ message TargetRelations {
318318
repeated NamedColumn keys = 1; // Shared key columns (name "METADATA$KEY" => derived hash)
319319
oneof body {
320320
PlainTargets plain = 2;
321-
CdcTargets cdc = 3;
321+
CDCTargets cdc = 3;
322322
}
323323
}
324324

sdks/go/src/lqp/v1/logic.pb.go

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdks/go/src/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ func (p *Parser) construct_non_cdc_relations(targets []*pb.TargetRelation) *pb.T
743743
}
744744

745745
func (p *Parser) construct_cdc_relations(inserts []*pb.TargetRelation, deletes []*pb.TargetRelation) *pb.TargetRelations {
746-
_t2211 := &pb.CdcTargets{Inserts: inserts, Deletes: deletes}
746+
_t2211 := &pb.CDCTargets{Inserts: inserts, Deletes: deletes}
747747
_t2212 := &pb.TargetRelations{Keys: []*pb.NamedColumn{}}
748748
_t2212.Body = &pb.TargetRelations_Cdc{Cdc: _t2211}
749749
return _t2212

sdks/go/src/pretty.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5311,7 +5311,7 @@ func (p *PrettyPrinter) pretty_be_tree_locator(msg *pb.BeTreeLocator) interface{
53115311
return nil
53125312
}
53135313

5314-
func (p *PrettyPrinter) pretty_cdc_targets(msg *pb.CdcTargets) interface{} {
5314+
func (p *PrettyPrinter) pretty_cdc_targets(msg *pb.CDCTargets) interface{} {
53155315
p.write("(cdc_targets")
53165316
p.indentSexp()
53175317
p.newline()
@@ -5706,7 +5706,7 @@ func (p *PrettyPrinter) pprintDispatch(msg interface{}) {
57065706
p.pretty_be_tree_config(m)
57075707
case *pb.BeTreeLocator:
57085708
p.pretty_be_tree_locator(m)
5709-
case *pb.CdcTargets:
5709+
case *pb.CDCTargets:
57105710
p.pretty_cdc_targets(m)
57115711
case *pb.DecimalValue:
57125712
p.pretty_decimal_value(m)

sdks/julia/LogicalQueryProtocol.jl/src/equality.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -591,10 +591,10 @@ Base.:(==)(a::PlainTargets, b::PlainTargets) = a.targets == b.targets
591591
Base.hash(a::PlainTargets, h::UInt) = hash(a.targets, h)
592592
Base.isequal(a::PlainTargets, b::PlainTargets) = isequal(a.targets, b.targets)
593593

594-
# CdcTargets
595-
Base.:(==)(a::CdcTargets, b::CdcTargets) = a.inserts == b.inserts && a.deletes == b.deletes
596-
Base.hash(a::CdcTargets, h::UInt) = hash(a.deletes, hash(a.inserts, h))
597-
Base.isequal(a::CdcTargets, b::CdcTargets) = isequal(a.inserts, b.inserts) && isequal(a.deletes, b.deletes)
594+
# CDCTargets
595+
Base.:(==)(a::CDCTargets, b::CDCTargets) = a.inserts == b.inserts && a.deletes == b.deletes
596+
Base.hash(a::CDCTargets, h::UInt) = hash(a.deletes, hash(a.inserts, h))
597+
Base.isequal(a::CDCTargets, b::CDCTargets) = isequal(a.inserts, b.inserts) && isequal(a.deletes, b.deletes)
598598

599599
# TargetRelations
600600
Base.:(==)(a::TargetRelations, b::TargetRelations) = a.keys == b.keys && _isequal_oneof(a.body, b.body)

sdks/julia/LogicalQueryProtocol.jl/src/gen/relationalai/lqp/v1/logic_pb.jl

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export MissingType, MissingValue, IntType, StringType, Int128Value, UInt128Value
1212
export StorageIntegration, BooleanType, UInt32Type, DecimalValue, BeTreeLocator, CSVConfig
1313
export var"#Type", Value, NamedColumn, GNFColumn, MinMonoid, SumMonoid, MaxMonoid
1414
export BeTreeInfo, Binding, EDB, Attribute, Term, TargetRelation, IcebergData, Monoid
15-
export BeTreeRelation, Cast, Pragma, Atom, RelTerm, CdcTargets, PlainTargets, Primitive
15+
export BeTreeRelation, Cast, Pragma, Atom, RelTerm, CDCTargets, PlainTargets, Primitive
1616
export RelAtom, TargetRelations, CSVData, Data, Abstraction, Algorithm, Assign, Break
1717
export Conjunction, Constraint, Def, Disjunction, Exists, FFI, FunctionalDependency
1818
export MonoidDef, MonusDef, Not, Reduce, Script, Upsert, Construct, Loop, Declaration
@@ -2018,15 +2018,15 @@ function PB._encoded_size(x::RelTerm)
20182018
return encoded_size
20192019
end
20202020

2021-
struct CdcTargets
2021+
struct CDCTargets
20222022
inserts::Vector{TargetRelation}
20232023
deletes::Vector{TargetRelation}
20242024
end
2025-
CdcTargets(;inserts = Vector{TargetRelation}(), deletes = Vector{TargetRelation}()) = CdcTargets(inserts, deletes)
2026-
PB.default_values(::Type{CdcTargets}) = (;inserts = Vector{TargetRelation}(), deletes = Vector{TargetRelation}())
2027-
PB.field_numbers(::Type{CdcTargets}) = (;inserts = 1, deletes = 2)
2025+
CDCTargets(;inserts = Vector{TargetRelation}(), deletes = Vector{TargetRelation}()) = CDCTargets(inserts, deletes)
2026+
PB.default_values(::Type{CDCTargets}) = (;inserts = Vector{TargetRelation}(), deletes = Vector{TargetRelation}())
2027+
PB.field_numbers(::Type{CDCTargets}) = (;inserts = 1, deletes = 2)
20282028

2029-
function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:CdcTargets}, _endpos::Int=0, _group::Bool=false)
2029+
function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:CDCTargets}, _endpos::Int=0, _group::Bool=false)
20302030
inserts = PB.BufferedVector{TargetRelation}()
20312031
deletes = PB.BufferedVector{TargetRelation}()
20322032
while !PB.message_done(d, _endpos, _group)
@@ -2039,16 +2039,16 @@ function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:CdcTargets}, _endpos::In
20392039
Base.skip(d, wire_type)
20402040
end
20412041
end
2042-
return CdcTargets(inserts[], deletes[])
2042+
return CDCTargets(inserts[], deletes[])
20432043
end
20442044

2045-
function PB.encode(e::PB.AbstractProtoEncoder, x::CdcTargets)
2045+
function PB.encode(e::PB.AbstractProtoEncoder, x::CDCTargets)
20462046
initpos = position(e.io)
20472047
!isempty(x.inserts) && PB.encode(e, 1, x.inserts)
20482048
!isempty(x.deletes) && PB.encode(e, 2, x.deletes)
20492049
return position(e.io) - initpos
20502050
end
2051-
function PB._encoded_size(x::CdcTargets)
2051+
function PB._encoded_size(x::CDCTargets)
20522052
encoded_size = 0
20532053
!isempty(x.inserts) && (encoded_size += PB._encoded_size(x.inserts, 1))
20542054
!isempty(x.deletes) && (encoded_size += PB._encoded_size(x.deletes, 2))
@@ -2162,11 +2162,11 @@ end
21622162

21632163
struct TargetRelations
21642164
keys::Vector{NamedColumn}
2165-
body::Union{Nothing,OneOf{<:Union{PlainTargets,CdcTargets}}}
2165+
body::Union{Nothing,OneOf{<:Union{PlainTargets,CDCTargets}}}
21662166
end
21672167
TargetRelations(;keys = Vector{NamedColumn}(), body = nothing) = TargetRelations(keys, body)
21682168
PB.oneof_field_types(::Type{TargetRelations}) = (;
2169-
body = (;plain=PlainTargets, cdc=CdcTargets),
2169+
body = (;plain=PlainTargets, cdc=CDCTargets),
21702170
)
21712171
PB.default_values(::Type{TargetRelations}) = (;keys = Vector{NamedColumn}(), plain = nothing, cdc = nothing)
21722172
PB.field_numbers(::Type{TargetRelations}) = (;keys = 1, plain = 2, cdc = 3)
@@ -2181,7 +2181,7 @@ function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:TargetRelations}, _endpo
21812181
elseif field_number == 2
21822182
body = OneOf(:plain, PB.decode(d, Ref{PlainTargets}))
21832183
elseif field_number == 3
2184-
body = OneOf(:cdc, PB.decode(d, Ref{CdcTargets}))
2184+
body = OneOf(:cdc, PB.decode(d, Ref{CDCTargets}))
21852185
else
21862186
Base.skip(d, wire_type)
21872187
end
@@ -2196,7 +2196,7 @@ function PB.encode(e::PB.AbstractProtoEncoder, x::TargetRelations)
21962196
elseif x.body.name === :plain
21972197
PB.encode(e, 2, x.body[]::PlainTargets)
21982198
elseif x.body.name === :cdc
2199-
PB.encode(e, 3, x.body[]::CdcTargets)
2199+
PB.encode(e, 3, x.body[]::CDCTargets)
22002200
end
22012201
return position(e.io) - initpos
22022202
end
@@ -2207,7 +2207,7 @@ function PB._encoded_size(x::TargetRelations)
22072207
elseif x.body.name === :plain
22082208
encoded_size += PB._encoded_size(x.body[]::PlainTargets, 2)
22092209
elseif x.body.name === :cdc
2210-
encoded_size += PB._encoded_size(x.body[]::CdcTargets, 3)
2210+
encoded_size += PB._encoded_size(x.body[]::CDCTargets, 3)
22112211
end
22122212
return encoded_size
22132213
end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ function construct_non_cdc_relations(parser::ParserState, targets::Vector{Proto.
456456
end
457457

458458
function construct_cdc_relations(parser::ParserState, inserts::Vector{Proto.TargetRelation}, deletes::Vector{Proto.TargetRelation})::Proto.TargetRelations
459-
_t2198 = Proto.CdcTargets(inserts=inserts, deletes=deletes)
459+
_t2198 = Proto.CDCTargets(inserts=inserts, deletes=deletes)
460460
_t2199 = Proto.TargetRelations(body=OneOf(:cdc, _t2198), keys=Proto.NamedColumn[])
461461
return _t2199
462462
end

sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5383,7 +5383,7 @@ function pretty_be_tree_locator(pp::PrettyPrinter, msg::Proto.BeTreeLocator)
53835383
return nothing
53845384
end
53855385

5386-
function pretty_cdc_targets(pp::PrettyPrinter, msg::Proto.CdcTargets)
5386+
function pretty_cdc_targets(pp::PrettyPrinter, msg::Proto.CDCTargets)
53875387
write(pp, "(cdc_targets")
53885388
indent_sexp!(pp)
53895389
newline(pp)
@@ -5664,7 +5664,7 @@ _pprint_dispatch(pp::PrettyPrinter, x::Proto.ExportIcebergConfig) = pretty_expor
56645664
_pprint_dispatch(pp::PrettyPrinter, x::Proto.DebugInfo) = pretty_debug_info(pp, x)
56655665
_pprint_dispatch(pp::PrettyPrinter, x::Proto.BeTreeConfig) = pretty_be_tree_config(pp, x)
56665666
_pprint_dispatch(pp::PrettyPrinter, x::Proto.BeTreeLocator) = pretty_be_tree_locator(pp, x)
5667-
_pprint_dispatch(pp::PrettyPrinter, x::Proto.CdcTargets) = pretty_cdc_targets(pp, x)
5667+
_pprint_dispatch(pp::PrettyPrinter, x::Proto.CDCTargets) = pretty_cdc_targets(pp, x)
56685668
_pprint_dispatch(pp::PrettyPrinter, x::Proto.DecimalValue) = pretty_decimal_value(pp, x)
56695669
_pprint_dispatch(pp::PrettyPrinter, x::Proto.FunctionalDependency) = pretty_functional_dependency(pp, x)
56705670
_pprint_dispatch(pp::PrettyPrinter, x::Proto.Int128Value) = pretty_int128_value(pp, x)

sdks/julia/LogicalQueryProtocol.jl/test/equality_tests.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2237,20 +2237,20 @@ end
22372237
@test p1 == p2 && p2 == p5 && p1 == p5
22382238
end
22392239

2240-
@testitem "Equality for CdcTargets" tags=[:ring1, :unit] begin
2241-
using LogicalQueryProtocol: CdcTargets, TargetRelation, NamedColumn, RelationId, var"#Type", FloatType
2240+
@testitem "Equality for CDCTargets" tags=[:ring1, :unit] begin
2241+
using LogicalQueryProtocol: CDCTargets, TargetRelation, NamedColumn, RelationId, var"#Type", FloatType
22422242
using ProtoBuf: OneOf
22432243

22442244
t1 = var"#Type"(var"#type"=OneOf(:float_type, FloatType()))
22452245
val = NamedColumn(name="weight", var"#type"=t1)
22462246
rel1 = TargetRelation(target_id=RelationId(id_low=1, id_high=0), values=[val])
22472247
rel2 = TargetRelation(target_id=RelationId(id_low=2, id_high=0), values=[val])
22482248

2249-
c1 = CdcTargets(inserts=[rel1], deletes=[rel2])
2250-
c2 = CdcTargets(inserts=[rel1], deletes=[rel2])
2251-
c3 = CdcTargets(inserts=[rel2], deletes=[rel2]) # different inserts
2252-
c4 = CdcTargets(inserts=[rel1], deletes=[rel1]) # different deletes
2253-
c5 = CdcTargets(inserts=[rel1], deletes=[rel2])
2249+
c1 = CDCTargets(inserts=[rel1], deletes=[rel2])
2250+
c2 = CDCTargets(inserts=[rel1], deletes=[rel2])
2251+
c3 = CDCTargets(inserts=[rel2], deletes=[rel2]) # different inserts
2252+
c4 = CDCTargets(inserts=[rel1], deletes=[rel1]) # different deletes
2253+
c5 = CDCTargets(inserts=[rel1], deletes=[rel2])
22542254

22552255
# Equality and inequality
22562256
@test c1 == c2
@@ -2273,7 +2273,7 @@ end
22732273
end
22742274

22752275
@testitem "Equality for TargetRelations" tags=[:ring1, :unit] begin
2276-
using LogicalQueryProtocol: TargetRelations, PlainTargets, CdcTargets, TargetRelation, NamedColumn, RelationId, var"#Type", IntType, FloatType
2276+
using LogicalQueryProtocol: TargetRelations, PlainTargets, CDCTargets, TargetRelation, NamedColumn, RelationId, var"#Type", IntType, FloatType
22772277
using ProtoBuf: OneOf
22782278

22792279
tint = var"#Type"(var"#type"=OneOf(:int_type, IntType()))
@@ -2286,7 +2286,7 @@ end
22862286
rel2 = TargetRelation(target_id=r2, values=[val])
22872287

22882288
plain(rs) = OneOf(:plain, PlainTargets(targets=rs))
2289-
cdc(ins, dels) = OneOf(:cdc, CdcTargets(inserts=ins, deletes=dels))
2289+
cdc(ins, dels) = OneOf(:cdc, CDCTargets(inserts=ins, deletes=dels))
22902290

22912291
# Plain (non-CDC) body.
22922292
g1 = TargetRelations(keys=[key], body=plain([rel1]))

0 commit comments

Comments
 (0)