Avoid allocation on the heap for most type wrappers

actgardner · Oct 11, 2021 · cb870fb · cb870fb
1 parent 1e763a9
commit cb870fb
Show file tree

Hide file tree

Showing 101 changed files with 1,120 additions and 665 deletions.
diff --git a/v9/container/avro/avro_container_block.go b/v9/container/avro/avro_container_block.go
diff --git a/v9/container/avro/avro_container_header.go b/v9/container/avro/avro_container_header.go
diff --git a/v9/container/avro/magic.go b/v9/container/avro/magic.go
diff --git a/v9/container/avro/sync.go b/v9/container/avro/sync.go
diff --git a/v9/example/avro/demo_schema.go b/v9/example/avro/demo_schema.go
diff --git a/v9/generator/flat/templates/array.go b/v9/generator/flat/templates/array.go
@@ -28,32 +28,32 @@ type {{ .WrapperType }} struct {
 	Target *{{ .GoType }}
 }
 
-func (_ *{{ .WrapperType }}) SetBoolean(v bool) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetInt(v int32) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetLong(v int64) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetFloat(v float32) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetDouble(v float64) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetBytes(v []byte) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetString(v string) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetUnionElem(v int64) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) Get(i int) types.Field { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) AppendMap(key string) types.Field { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) Finalize() { }
-func (_ *{{ .WrapperType }}) SetDefault(i int) { panic("Unsupported operation") }
-func (r *{{ .WrapperType }}) HintSize(s int) {
+func (_ {{ .WrapperType }}) SetBoolean(v bool) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetInt(v int32) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetLong(v int64) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetFloat(v float32) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetDouble(v float64) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetBytes(v []byte) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetString(v string) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetUnionElem(v int64) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) Get(i int) types.Field { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) AppendMap(key string) types.Field { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) Finalize() { }
+func (_ {{ .WrapperType }}) SetDefault(i int) { panic("Unsupported operation") }
+func (r {{ .WrapperType }}) HintSize(s int) {
 	if len(*r.Target) == 0 {
 		*r.Target = make({{ .GoType }}, 0, s)
 	}
 }
-func (r *{{ .WrapperType }}) NullField(i int) { 
+func (r {{ .WrapperType }}) NullField(i int) { 
 	{{ if isNullable .ItemType -}}
 		(*r.Target)[len(*r.Target)-1] = nil		
 	{{ else -}}
 		panic("Unsupported operation")
 	{{ end -}}
 }
 
-func (r *{{ .WrapperType }}) AppendArray() types.Field {
+func (r {{ .WrapperType }}) AppendArray() types.Field {
 	var v {{ .ItemType.GoType }}
 	{{ if .ItemConstructable -}}
 	{{ .ItemConstructable }}

diff --git a/v9/generator/flat/templates/enum.go b/v9/generator/flat/templates/enum.go
@@ -63,62 +63,62 @@ type {{ .WrapperType }} struct {
 	Target *{{ .GoType }}
 }
 
-func (b *{{ .WrapperType }}) SetBoolean(v bool) {
+func (b {{ .WrapperType }}) SetBoolean(v bool) {
 	panic("Unable to assign boolean to int field")
 }
 
-func (b *{{ .WrapperType }}) SetInt(v int32) {
+func (b {{ .WrapperType }}) SetInt(v int32) {
 	*(b.Target) = {{ .GoType }}(v)
 }
 
-func (b *{{ .WrapperType }}) SetLong(v int64) {
+func (b {{ .WrapperType }}) SetLong(v int64) {
 	panic("Unable to assign long to int field")
 }
 
-func (b *{{ .WrapperType }}) SetFloat(v float32) {
+func (b {{ .WrapperType }}) SetFloat(v float32) {
 	panic("Unable to assign float to int field")
 }
 
-func (b *{{ .WrapperType }}) SetUnionElem(v int64) {
+func (b {{ .WrapperType }}) SetUnionElem(v int64) {
 	panic("Unable to assign union elem to int field")
 }
 
-func (b *{{ .WrapperType }}) SetDouble(v float64) {
+func (b {{ .WrapperType }}) SetDouble(v float64) {
 	panic("Unable to assign double to int field")
 }
 
-func (b *{{ .WrapperType }}) SetBytes(v []byte) {
+func (b {{ .WrapperType }}) SetBytes(v []byte) {
 	panic("Unable to assign bytes to int field")
 }
 
-func (b *{{ .WrapperType }}) SetString(v string) {
+func (b {{ .WrapperType }}) SetString(v string) {
 	panic("Unable to assign string to int field")
 }
 
-func (b *{{ .WrapperType }}) Get(i int) types.Field {
+func (b {{ .WrapperType }}) Get(i int) types.Field {
 	panic("Unable to get field from int field")
 }
 
-func (b *{{ .WrapperType }}) SetDefault(i int) {
+func (b {{ .WrapperType }}) SetDefault(i int) {
 	panic("Unable to set default on int field")
 }
 
-func (b *{{ .WrapperType }}) AppendMap(key string) types.Field {
+func (b {{ .WrapperType }}) AppendMap(key string) types.Field {
 	panic("Unable to append map key to from int field")
 }
 
-func (b *{{ .WrapperType }}) AppendArray() types.Field {
+func (b {{ .WrapperType }}) AppendArray() types.Field {
 	panic("Unable to append array element to from int field")
 }
 
 
-func (b *{{ .WrapperType }}) NullField(int) {
+func (b {{ .WrapperType }}) NullField(int) {
 	panic("Unable to null field in int field")
 }
 
-func (b *{{ .WrapperType }}) HintSize(int) {
+func (b {{ .WrapperType }}) HintSize(int) {
 	panic("Unable to hint size in int field")
 }
 
-func (b *{{ .WrapperType }}) Finalize() {}
+func (b {{ .WrapperType }}) Finalize() {}
 `
diff --git a/v9/generator/flat/templates/fixed.go b/v9/generator/flat/templates/fixed.go
@@ -34,22 +34,22 @@ func (b {{ .GoType }}) MarshalJSON() ([]byte, error) {
 	return []byte(util.EncodeByteString(b[:])), nil
 }
 
-func (_ *{{ .WrapperType }}) SetBoolean(v bool) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetInt(v int32) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetLong(v int64) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetFloat(v float32) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetDouble(v float64) { panic("Unsupported operation") }
-func (r *{{ .WrapperType }}) SetBytes(v []byte) { 
+func (_ {{ .WrapperType }}) SetBoolean(v bool) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetInt(v int32) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetLong(v int64) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetFloat(v float32) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetDouble(v float64) { panic("Unsupported operation") }
+func (r {{ .WrapperType }}) SetBytes(v []byte) { 
 	copy((*r.Target)[:], v)
 }
-func (_ *{{ .WrapperType }}) SetString(v string) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) SetUnionElem(v int64) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) Get(i int) types.Field { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) AppendMap(key string) types.Field { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) AppendArray() types.Field { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) NullField(int) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) HintSize(int) { panic("Unsupported operation") }
-func (_ *{{ .WrapperType }}) Finalize() { }
-func (_ *{{ .WrapperType }}) SetDefault(i int) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetString(v string) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) SetUnionElem(v int64) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) Get(i int) types.Field { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) AppendMap(key string) types.Field { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) AppendArray() types.Field { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) NullField(int) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) HintSize(int) { panic("Unsupported operation") }
+func (_ {{ .WrapperType }}) Finalize() { }
+func (_ {{ .WrapperType }}) SetDefault(i int) { panic("Unsupported operation") }
 
 `
diff --git a/v9/generator/flat/templates/record.go b/v9/generator/flat/templates/record.go
@@ -103,7 +103,12 @@ func (r *{{ .GoType }}) Get(i int) types.Field {
 			{{ $.ConstructableForField $field }}
 		{{ end -}}
 		{{ if ne $field.Type.WrapperType "" -}}
-			return &{{ $field.Type.WrapperType }}{Target: &r.{{ $field.GoName }}}
+			w := {{ $field.Type.WrapperType }}{Target: &r.{{ $field.GoName }}}
+			{{ if $field.Type.WrapperPointer }}
+			return &w
+			{{ else }}
+			return w
+			{{ end }}
 		{{ else -}}
 			return r.{{ $field.GoName }}
 		{{ end -}}

diff --git a/v9/schema/array.go b/v9/schema/array.go
@@ -82,6 +82,10 @@ func (s *ArrayField) WrapperType() string {
 	return fmt.Sprintf("%vWrapper", s.Name())
 }
 
+func (s *ArrayField) WrapperPointer() bool {
+	return false
+}
+
 func (s *ArrayField) IsReadableBy(f AvroType) bool {
 	if union, ok := f.(*UnionField); ok {
 		for _, t := range union.AvroTypes() {

diff --git a/v9/schema/avro_type.go b/v9/schema/avro_type.go
@@ -17,5 +17,7 @@ type AvroType interface {
 
 	// WrapperType is the VM type to wrap this value in, if applicable
 	WrapperType() string
+	// WrapperPointer is whether the VM wrapper type needs to be a pointer
+	WrapperPointer() bool
 	IsReadableBy(f AvroType) bool
 }
diff --git a/v9/schema/enum.go b/v9/schema/enum.go
@@ -94,6 +94,8 @@ func (s *EnumDefinition) WrapperType() string {
 	return fmt.Sprintf("%vWrapper", s.GoType())
 }
 
+func (s *EnumDefinition) WrapperPointer() bool { return false }
+
 func (s *EnumDefinition) Children() []AvroType {
 	return []AvroType{}
 }
diff --git a/v9/schema/file_root.go b/v9/schema/file_root.go
@@ -49,3 +49,5 @@ func (f *FileRoot) IsReadableBy(_ Definition) bool {
 func (f *FileRoot) WrapperType() string {
 	return ""
 }
+
+func (f *FileRoot) WrapperPointer() bool { return false }
diff --git a/v9/schema/fixed.go b/v9/schema/fixed.go
@@ -81,6 +81,8 @@ func (s *FixedDefinition) WrapperType() string {
 	return fmt.Sprintf("%vWrapper", s.GoType())
 }
 
+func (s *FixedDefinition) WrapperPointer() bool { return false }
+
 func (s *FixedDefinition) Children() []AvroType {
 	return []AvroType{}
 }
diff --git a/v9/schema/map.go b/v9/schema/map.go
@@ -77,6 +77,10 @@ func (s *MapField) WrapperType() string {
 	return fmt.Sprintf("%vWrapper", s.Name())
 }
 
+func (s *MapField) WrapperPointer() bool {
+	return true
+}
+
 func (s *MapField) IsReadableBy(f AvroType) bool {
 	if union, ok := f.(*UnionField); ok {
 		for _, t := range union.AvroTypes() {

diff --git a/v9/schema/primitive.go b/v9/schema/primitive.go
@@ -37,3 +37,5 @@ func (s *PrimitiveField) Children() []AvroType {
 func (s *PrimitiveField) UnionKey() string {
 	return s.unionKey
 }
+
+func (s *PrimitiveField) WrapperPointer() bool { return false }