Merge branch 'main' into feat/clone-pool

planetscale · Sep 20, 2023 · d8cddbe · d8cddbe
2 parents c86038c + b133c9c
commit d8cddbe
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 25 deletions.
diff --git a/features/pool/pool.go b/features/pool/pool.go
@@ -50,6 +50,7 @@ func (p *pool) message(message *protogen.Message) {
 	p.P(`}`)
 
 	p.P(`func (m *`, ccTypeName, `) ResetVT() {`)
+	p.P(`if m != nil {`)
 	var saved []*protogen.Field
 	for _, field := range message.Fields {
 		fieldName := field.GoName
@@ -89,6 +90,7 @@ func (p *pool) message(message *protogen.Message) {
 		p.P(`m.`, field.GoName, ` = `, fmt.Sprintf("f%d", i))
 	}
 	p.P(`}`)
+	p.P(`}`)
 
 	p.P(`func (m *`, ccTypeName, `) ReturnToVTPool() {`)
 	p.P(`if m != nil {`)

diff --git a/testproto/pool/pool_vtproto.pb.go b/testproto/pool/pool_vtproto.pb.go
diff --git a/testproto/pool/pool_with_oneof_vtproto.pb.go b/testproto/pool/pool_with_oneof_vtproto.pb.go
diff --git a/testproto/pool/pool_with_slice_reuse_vtproto.pb.go b/testproto/pool/pool_with_slice_reuse_vtproto.pb.go