Skip to content

Commit 16f03ed

Browse files
[release-21.0] sizegen: do not ignore type aliases (#17556) (#17557)
Signed-off-by: Vicent Marti <vmg@strn.cat> Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
1 parent dedc2d5 commit 16f03ed

File tree

6 files changed

+56
-2
lines changed

6 files changed

+56
-2
lines changed

go/mysql/collations/colldata/cached_size.go

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

go/sqltypes/cached_size.go

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

go/tools/sizegen/sizegen.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ func (sizegen *sizegen) generateTyp(tt types.Type) {
163163
sizegen.generateKnownType(tt)
164164
case *types.Alias:
165165
sizegen.generateTyp(types.Unalias(tt))
166+
default:
167+
panic(fmt.Sprintf("unhandled type: %v (%T)", tt, tt))
166168
}
167169
}
168170

@@ -490,9 +492,11 @@ func (sizegen *sizegen) sizeStmtForType(fieldName *jen.Statement, field types.Ty
490492
// assume that function pointers do not allocate (although they might, if they're closures)
491493
return nil, 0
492494

495+
case *types.Alias:
496+
return sizegen.sizeStmtForType(fieldName, types.Unalias(node), alloc)
497+
493498
default:
494-
log.Printf("unhandled type: %T", node)
495-
return nil, 0
499+
panic(fmt.Sprintf("unhandled type: %v (%T)", node, node))
496500
}
497501
}
498502

go/vt/proto/query/cached_size.go

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

go/vt/proto/topodata/cached_size.go

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

go/vt/proto/vttime/cached_size.go

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

0 commit comments

Comments
 (0)