From d561eb5bdf104a34ae674f946bc3a89c1427f4be Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Tue, 12 Dec 2023 18:02:39 -0800 Subject: [PATCH] proto/third_party/flatbuffers,go/gen/fb/serial: Bump flatc to pick up the version that only has Try accessors. --- go/gen/fb/serial/addressmap.go | 24 +- go/gen/fb/serial/blob.go | 24 +- go/gen/fb/serial/branchcontrol.go | 376 ++++------------------------- go/gen/fb/serial/commit.go | 24 +- go/gen/fb/serial/commitclosure.go | 24 +- go/gen/fb/serial/foreign_key.go | 60 +---- go/gen/fb/serial/mergeartifacts.go | 24 +- go/gen/fb/serial/prolly.go | 24 +- go/gen/fb/serial/rootvalue.go | 24 +- go/gen/fb/serial/schema.go | 182 +++----------- go/gen/fb/serial/stash.go | 24 +- go/gen/fb/serial/stashlist.go | 24 +- go/gen/fb/serial/storeroot.go | 24 +- go/gen/fb/serial/table.go | 61 +---- go/gen/fb/serial/tag.go | 24 +- go/gen/fb/serial/workingset.go | 61 +---- proto/third_party/flatbuffers | 2 +- 17 files changed, 181 insertions(+), 825 deletions(-) diff --git a/go/gen/fb/serial/addressmap.go b/go/gen/fb/serial/addressmap.go index 423a0bcaa2..34acfbf852 100644 --- a/go/gen/fb/serial/addressmap.go +++ b/go/gen/fb/serial/addressmap.go @@ -26,11 +26,7 @@ type AddressMap struct { func InitAddressMapRoot(o *AddressMap, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if AddressMapNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsAddressMap(buf []byte, offset flatbuffers.UOffsetT) (*AddressMap, error) { @@ -38,26 +34,18 @@ func TryGetRootAsAddressMap(buf []byte, offset flatbuffers.UOffsetT) (*AddressMa return x, InitAddressMapRoot(x, buf, offset) } -func GetRootAsAddressMap(buf []byte, offset flatbuffers.UOffsetT) *AddressMap { - x := &AddressMap{} - InitAddressMapRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsAddressMap(buf []byte, offset flatbuffers.UOffsetT) (*AddressMap, error) { x := &AddressMap{} return x, InitAddressMapRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsAddressMap(buf []byte, offset flatbuffers.UOffsetT) *AddressMap { - x := &AddressMap{} - InitAddressMapRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *AddressMap) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *AddressMap) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if AddressMapNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *AddressMap) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/blob.go b/go/gen/fb/serial/blob.go index 16a26b1e44..a0ecaf81e7 100644 --- a/go/gen/fb/serial/blob.go +++ b/go/gen/fb/serial/blob.go @@ -26,11 +26,7 @@ type Blob struct { func InitBlobRoot(o *Blob, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if BlobNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsBlob(buf []byte, offset flatbuffers.UOffsetT) (*Blob, error) { @@ -38,26 +34,18 @@ func TryGetRootAsBlob(buf []byte, offset flatbuffers.UOffsetT) (*Blob, error) { return x, InitBlobRoot(x, buf, offset) } -func GetRootAsBlob(buf []byte, offset flatbuffers.UOffsetT) *Blob { - x := &Blob{} - InitBlobRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsBlob(buf []byte, offset flatbuffers.UOffsetT) (*Blob, error) { x := &Blob{} return x, InitBlobRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsBlob(buf []byte, offset flatbuffers.UOffsetT) *Blob { - x := &Blob{} - InitBlobRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *Blob) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *Blob) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if BlobNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *Blob) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/branchcontrol.go b/go/gen/fb/serial/branchcontrol.go index b17311c20d..898e7bb8a0 100644 --- a/go/gen/fb/serial/branchcontrol.go +++ b/go/gen/fb/serial/branchcontrol.go @@ -26,11 +26,7 @@ type BranchControl struct { func InitBranchControlRoot(o *BranchControl, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if BranchControlNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsBranchControl(buf []byte, offset flatbuffers.UOffsetT) (*BranchControl, error) { @@ -38,45 +34,24 @@ func TryGetRootAsBranchControl(buf []byte, offset flatbuffers.UOffsetT) (*Branch return x, InitBranchControlRoot(x, buf, offset) } -func GetRootAsBranchControl(buf []byte, offset flatbuffers.UOffsetT) *BranchControl { - x := &BranchControl{} - InitBranchControlRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsBranchControl(buf []byte, offset flatbuffers.UOffsetT) (*BranchControl, error) { x := &BranchControl{} return x, InitBranchControlRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsBranchControl(buf []byte, offset flatbuffers.UOffsetT) *BranchControl { - x := &BranchControl{} - InitBranchControlRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *BranchControl) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *BranchControl) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if BranchControlNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *BranchControl) Table() flatbuffers.Table { return rcv._tab } -func (rcv *BranchControl) AccessTbl(obj *BranchControlAccess) *BranchControlAccess { - o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) - if o != 0 { - x := rcv._tab.Indirect(o + rcv._tab.Pos) - if obj == nil { - obj = new(BranchControlAccess) - } - obj.Init(rcv._tab.Bytes, x) - return obj - } - return nil -} - func (rcv *BranchControl) TryAccessTbl(obj *BranchControlAccess) (*BranchControlAccess, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) if o != 0 { @@ -93,19 +68,6 @@ func (rcv *BranchControl) TryAccessTbl(obj *BranchControlAccess) (*BranchControl return nil, nil } -func (rcv *BranchControl) NamespaceTbl(obj *BranchControlNamespace) *BranchControlNamespace { - o := flatbuffers.UOffsetT(rcv._tab.Offset(6)) - if o != 0 { - x := rcv._tab.Indirect(o + rcv._tab.Pos) - if obj == nil { - obj = new(BranchControlNamespace) - } - obj.Init(rcv._tab.Bytes, x) - return obj - } - return nil -} - func (rcv *BranchControl) TryNamespaceTbl(obj *BranchControlNamespace) (*BranchControlNamespace, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(6)) if o != 0 { @@ -143,11 +105,7 @@ type BranchControlAccess struct { func InitBranchControlAccessRoot(o *BranchControlAccess, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if BranchControlAccessNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsBranchControlAccess(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlAccess, error) { @@ -155,45 +113,24 @@ func TryGetRootAsBranchControlAccess(buf []byte, offset flatbuffers.UOffsetT) (* return x, InitBranchControlAccessRoot(x, buf, offset) } -func GetRootAsBranchControlAccess(buf []byte, offset flatbuffers.UOffsetT) *BranchControlAccess { - x := &BranchControlAccess{} - InitBranchControlAccessRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsBranchControlAccess(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlAccess, error) { x := &BranchControlAccess{} return x, InitBranchControlAccessRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsBranchControlAccess(buf []byte, offset flatbuffers.UOffsetT) *BranchControlAccess { - x := &BranchControlAccess{} - InitBranchControlAccessRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *BranchControlAccess) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *BranchControlAccess) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if BranchControlAccessNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *BranchControlAccess) Table() flatbuffers.Table { return rcv._tab } -func (rcv *BranchControlAccess) Binlog(obj *BranchControlBinlog) *BranchControlBinlog { - o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) - if o != 0 { - x := rcv._tab.Indirect(o + rcv._tab.Pos) - if obj == nil { - obj = new(BranchControlBinlog) - } - obj.Init(rcv._tab.Bytes, x) - return obj - } - return nil -} - func (rcv *BranchControlAccess) TryBinlog(obj *BranchControlBinlog) (*BranchControlBinlog, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) if o != 0 { @@ -210,18 +147,6 @@ func (rcv *BranchControlAccess) TryBinlog(obj *BranchControlBinlog) (*BranchCont return nil, nil } -func (rcv *BranchControlAccess) Databases(obj *BranchControlMatchExpression, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(6)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlAccess) TryDatabases(obj *BranchControlMatchExpression, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(6)) if o != 0 { @@ -245,18 +170,6 @@ func (rcv *BranchControlAccess) DatabasesLength() int { return 0 } -func (rcv *BranchControlAccess) Branches(obj *BranchControlMatchExpression, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(8)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlAccess) TryBranches(obj *BranchControlMatchExpression, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(8)) if o != 0 { @@ -280,18 +193,6 @@ func (rcv *BranchControlAccess) BranchesLength() int { return 0 } -func (rcv *BranchControlAccess) Users(obj *BranchControlMatchExpression, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(10)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlAccess) TryUsers(obj *BranchControlMatchExpression, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(10)) if o != 0 { @@ -315,18 +216,6 @@ func (rcv *BranchControlAccess) UsersLength() int { return 0 } -func (rcv *BranchControlAccess) Hosts(obj *BranchControlMatchExpression, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(12)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlAccess) TryHosts(obj *BranchControlMatchExpression, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(12)) if o != 0 { @@ -350,18 +239,6 @@ func (rcv *BranchControlAccess) HostsLength() int { return 0 } -func (rcv *BranchControlAccess) Values(obj *BranchControlAccessValue, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(14)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlAccess) TryValues(obj *BranchControlAccessValue, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(14)) if o != 0 { @@ -433,11 +310,7 @@ type BranchControlAccessValue struct { func InitBranchControlAccessValueRoot(o *BranchControlAccessValue, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if BranchControlAccessValueNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsBranchControlAccessValue(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlAccessValue, error) { @@ -445,26 +318,18 @@ func TryGetRootAsBranchControlAccessValue(buf []byte, offset flatbuffers.UOffset return x, InitBranchControlAccessValueRoot(x, buf, offset) } -func GetRootAsBranchControlAccessValue(buf []byte, offset flatbuffers.UOffsetT) *BranchControlAccessValue { - x := &BranchControlAccessValue{} - InitBranchControlAccessValueRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsBranchControlAccessValue(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlAccessValue, error) { x := &BranchControlAccessValue{} return x, InitBranchControlAccessValueRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsBranchControlAccessValue(buf []byte, offset flatbuffers.UOffsetT) *BranchControlAccessValue { - x := &BranchControlAccessValue{} - InitBranchControlAccessValueRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *BranchControlAccessValue) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *BranchControlAccessValue) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if BranchControlAccessValueNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *BranchControlAccessValue) Table() flatbuffers.Table { @@ -545,11 +410,7 @@ type BranchControlNamespace struct { func InitBranchControlNamespaceRoot(o *BranchControlNamespace, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if BranchControlNamespaceNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsBranchControlNamespace(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlNamespace, error) { @@ -557,45 +418,24 @@ func TryGetRootAsBranchControlNamespace(buf []byte, offset flatbuffers.UOffsetT) return x, InitBranchControlNamespaceRoot(x, buf, offset) } -func GetRootAsBranchControlNamespace(buf []byte, offset flatbuffers.UOffsetT) *BranchControlNamespace { - x := &BranchControlNamespace{} - InitBranchControlNamespaceRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsBranchControlNamespace(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlNamespace, error) { x := &BranchControlNamespace{} return x, InitBranchControlNamespaceRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsBranchControlNamespace(buf []byte, offset flatbuffers.UOffsetT) *BranchControlNamespace { - x := &BranchControlNamespace{} - InitBranchControlNamespaceRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *BranchControlNamespace) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *BranchControlNamespace) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if BranchControlNamespaceNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *BranchControlNamespace) Table() flatbuffers.Table { return rcv._tab } -func (rcv *BranchControlNamespace) Binlog(obj *BranchControlBinlog) *BranchControlBinlog { - o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) - if o != 0 { - x := rcv._tab.Indirect(o + rcv._tab.Pos) - if obj == nil { - obj = new(BranchControlBinlog) - } - obj.Init(rcv._tab.Bytes, x) - return obj - } - return nil -} - func (rcv *BranchControlNamespace) TryBinlog(obj *BranchControlBinlog) (*BranchControlBinlog, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) if o != 0 { @@ -612,18 +452,6 @@ func (rcv *BranchControlNamespace) TryBinlog(obj *BranchControlBinlog) (*BranchC return nil, nil } -func (rcv *BranchControlNamespace) Databases(obj *BranchControlMatchExpression, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(6)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlNamespace) TryDatabases(obj *BranchControlMatchExpression, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(6)) if o != 0 { @@ -647,18 +475,6 @@ func (rcv *BranchControlNamespace) DatabasesLength() int { return 0 } -func (rcv *BranchControlNamespace) Branches(obj *BranchControlMatchExpression, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(8)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlNamespace) TryBranches(obj *BranchControlMatchExpression, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(8)) if o != 0 { @@ -682,18 +498,6 @@ func (rcv *BranchControlNamespace) BranchesLength() int { return 0 } -func (rcv *BranchControlNamespace) Users(obj *BranchControlMatchExpression, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(10)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlNamespace) TryUsers(obj *BranchControlMatchExpression, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(10)) if o != 0 { @@ -717,18 +521,6 @@ func (rcv *BranchControlNamespace) UsersLength() int { return 0 } -func (rcv *BranchControlNamespace) Hosts(obj *BranchControlMatchExpression, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(12)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlNamespace) TryHosts(obj *BranchControlMatchExpression, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(12)) if o != 0 { @@ -752,18 +544,6 @@ func (rcv *BranchControlNamespace) HostsLength() int { return 0 } -func (rcv *BranchControlNamespace) Values(obj *BranchControlNamespaceValue, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(14)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlNamespace) TryValues(obj *BranchControlNamespaceValue, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(14)) if o != 0 { @@ -835,11 +615,7 @@ type BranchControlNamespaceValue struct { func InitBranchControlNamespaceValueRoot(o *BranchControlNamespaceValue, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if BranchControlNamespaceValueNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsBranchControlNamespaceValue(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlNamespaceValue, error) { @@ -847,26 +623,18 @@ func TryGetRootAsBranchControlNamespaceValue(buf []byte, offset flatbuffers.UOff return x, InitBranchControlNamespaceValueRoot(x, buf, offset) } -func GetRootAsBranchControlNamespaceValue(buf []byte, offset flatbuffers.UOffsetT) *BranchControlNamespaceValue { - x := &BranchControlNamespaceValue{} - InitBranchControlNamespaceValueRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsBranchControlNamespaceValue(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlNamespaceValue, error) { x := &BranchControlNamespaceValue{} return x, InitBranchControlNamespaceValueRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsBranchControlNamespaceValue(buf []byte, offset flatbuffers.UOffsetT) *BranchControlNamespaceValue { - x := &BranchControlNamespaceValue{} - InitBranchControlNamespaceValueRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *BranchControlNamespaceValue) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *BranchControlNamespaceValue) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if BranchControlNamespaceValueNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *BranchControlNamespaceValue) Table() flatbuffers.Table { @@ -932,11 +700,7 @@ type BranchControlBinlog struct { func InitBranchControlBinlogRoot(o *BranchControlBinlog, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if BranchControlBinlogNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsBranchControlBinlog(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlBinlog, error) { @@ -944,44 +708,24 @@ func TryGetRootAsBranchControlBinlog(buf []byte, offset flatbuffers.UOffsetT) (* return x, InitBranchControlBinlogRoot(x, buf, offset) } -func GetRootAsBranchControlBinlog(buf []byte, offset flatbuffers.UOffsetT) *BranchControlBinlog { - x := &BranchControlBinlog{} - InitBranchControlBinlogRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsBranchControlBinlog(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlBinlog, error) { x := &BranchControlBinlog{} return x, InitBranchControlBinlogRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsBranchControlBinlog(buf []byte, offset flatbuffers.UOffsetT) *BranchControlBinlog { - x := &BranchControlBinlog{} - InitBranchControlBinlogRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *BranchControlBinlog) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *BranchControlBinlog) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if BranchControlBinlogNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *BranchControlBinlog) Table() flatbuffers.Table { return rcv._tab } -func (rcv *BranchControlBinlog) Rows(obj *BranchControlBinlogRow, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *BranchControlBinlog) TryRows(obj *BranchControlBinlogRow, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) if o != 0 { @@ -1026,11 +770,7 @@ type BranchControlBinlogRow struct { func InitBranchControlBinlogRowRoot(o *BranchControlBinlogRow, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if BranchControlBinlogRowNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsBranchControlBinlogRow(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlBinlogRow, error) { @@ -1038,26 +778,18 @@ func TryGetRootAsBranchControlBinlogRow(buf []byte, offset flatbuffers.UOffsetT) return x, InitBranchControlBinlogRowRoot(x, buf, offset) } -func GetRootAsBranchControlBinlogRow(buf []byte, offset flatbuffers.UOffsetT) *BranchControlBinlogRow { - x := &BranchControlBinlogRow{} - InitBranchControlBinlogRowRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsBranchControlBinlogRow(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlBinlogRow, error) { x := &BranchControlBinlogRow{} return x, InitBranchControlBinlogRowRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsBranchControlBinlogRow(buf []byte, offset flatbuffers.UOffsetT) *BranchControlBinlogRow { - x := &BranchControlBinlogRow{} - InitBranchControlBinlogRowRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *BranchControlBinlogRow) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *BranchControlBinlogRow) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if BranchControlBinlogRowNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *BranchControlBinlogRow) Table() flatbuffers.Table { @@ -1153,11 +885,7 @@ type BranchControlMatchExpression struct { func InitBranchControlMatchExpressionRoot(o *BranchControlMatchExpression, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if BranchControlMatchExpressionNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsBranchControlMatchExpression(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlMatchExpression, error) { @@ -1165,26 +893,18 @@ func TryGetRootAsBranchControlMatchExpression(buf []byte, offset flatbuffers.UOf return x, InitBranchControlMatchExpressionRoot(x, buf, offset) } -func GetRootAsBranchControlMatchExpression(buf []byte, offset flatbuffers.UOffsetT) *BranchControlMatchExpression { - x := &BranchControlMatchExpression{} - InitBranchControlMatchExpressionRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsBranchControlMatchExpression(buf []byte, offset flatbuffers.UOffsetT) (*BranchControlMatchExpression, error) { x := &BranchControlMatchExpression{} return x, InitBranchControlMatchExpressionRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsBranchControlMatchExpression(buf []byte, offset flatbuffers.UOffsetT) *BranchControlMatchExpression { - x := &BranchControlMatchExpression{} - InitBranchControlMatchExpressionRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *BranchControlMatchExpression) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *BranchControlMatchExpression) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if BranchControlMatchExpressionNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *BranchControlMatchExpression) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/commit.go b/go/gen/fb/serial/commit.go index ee6a96f178..195afa77d6 100644 --- a/go/gen/fb/serial/commit.go +++ b/go/gen/fb/serial/commit.go @@ -26,11 +26,7 @@ type Commit struct { func InitCommitRoot(o *Commit, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if CommitNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsCommit(buf []byte, offset flatbuffers.UOffsetT) (*Commit, error) { @@ -38,26 +34,18 @@ func TryGetRootAsCommit(buf []byte, offset flatbuffers.UOffsetT) (*Commit, error return x, InitCommitRoot(x, buf, offset) } -func GetRootAsCommit(buf []byte, offset flatbuffers.UOffsetT) *Commit { - x := &Commit{} - InitCommitRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsCommit(buf []byte, offset flatbuffers.UOffsetT) (*Commit, error) { x := &Commit{} return x, InitCommitRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsCommit(buf []byte, offset flatbuffers.UOffsetT) *Commit { - x := &Commit{} - InitCommitRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *Commit) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *Commit) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if CommitNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *Commit) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/commitclosure.go b/go/gen/fb/serial/commitclosure.go index 84ce1787b8..14508ac451 100644 --- a/go/gen/fb/serial/commitclosure.go +++ b/go/gen/fb/serial/commitclosure.go @@ -26,11 +26,7 @@ type CommitClosure struct { func InitCommitClosureRoot(o *CommitClosure, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if CommitClosureNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsCommitClosure(buf []byte, offset flatbuffers.UOffsetT) (*CommitClosure, error) { @@ -38,26 +34,18 @@ func TryGetRootAsCommitClosure(buf []byte, offset flatbuffers.UOffsetT) (*Commit return x, InitCommitClosureRoot(x, buf, offset) } -func GetRootAsCommitClosure(buf []byte, offset flatbuffers.UOffsetT) *CommitClosure { - x := &CommitClosure{} - InitCommitClosureRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsCommitClosure(buf []byte, offset flatbuffers.UOffsetT) (*CommitClosure, error) { x := &CommitClosure{} return x, InitCommitClosureRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsCommitClosure(buf []byte, offset flatbuffers.UOffsetT) *CommitClosure { - x := &CommitClosure{} - InitCommitClosureRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *CommitClosure) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *CommitClosure) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if CommitClosureNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *CommitClosure) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/foreign_key.go b/go/gen/fb/serial/foreign_key.go index 273fbf1ca4..c1186944ad 100644 --- a/go/gen/fb/serial/foreign_key.go +++ b/go/gen/fb/serial/foreign_key.go @@ -61,11 +61,7 @@ type ForeignKeyCollection struct { func InitForeignKeyCollectionRoot(o *ForeignKeyCollection, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if ForeignKeyCollectionNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsForeignKeyCollection(buf []byte, offset flatbuffers.UOffsetT) (*ForeignKeyCollection, error) { @@ -73,44 +69,24 @@ func TryGetRootAsForeignKeyCollection(buf []byte, offset flatbuffers.UOffsetT) ( return x, InitForeignKeyCollectionRoot(x, buf, offset) } -func GetRootAsForeignKeyCollection(buf []byte, offset flatbuffers.UOffsetT) *ForeignKeyCollection { - x := &ForeignKeyCollection{} - InitForeignKeyCollectionRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsForeignKeyCollection(buf []byte, offset flatbuffers.UOffsetT) (*ForeignKeyCollection, error) { x := &ForeignKeyCollection{} return x, InitForeignKeyCollectionRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsForeignKeyCollection(buf []byte, offset flatbuffers.UOffsetT) *ForeignKeyCollection { - x := &ForeignKeyCollection{} - InitForeignKeyCollectionRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *ForeignKeyCollection) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *ForeignKeyCollection) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if ForeignKeyCollectionNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *ForeignKeyCollection) Table() flatbuffers.Table { return rcv._tab } -func (rcv *ForeignKeyCollection) ForeignKeys(obj *ForeignKey, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *ForeignKeyCollection) TryForeignKeys(obj *ForeignKey, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) if o != 0 { @@ -155,11 +131,7 @@ type ForeignKey struct { func InitForeignKeyRoot(o *ForeignKey, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if ForeignKeyNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsForeignKey(buf []byte, offset flatbuffers.UOffsetT) (*ForeignKey, error) { @@ -167,26 +139,18 @@ func TryGetRootAsForeignKey(buf []byte, offset flatbuffers.UOffsetT) (*ForeignKe return x, InitForeignKeyRoot(x, buf, offset) } -func GetRootAsForeignKey(buf []byte, offset flatbuffers.UOffsetT) *ForeignKey { - x := &ForeignKey{} - InitForeignKeyRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsForeignKey(buf []byte, offset flatbuffers.UOffsetT) (*ForeignKey, error) { x := &ForeignKey{} return x, InitForeignKeyRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsForeignKey(buf []byte, offset flatbuffers.UOffsetT) *ForeignKey { - x := &ForeignKey{} - InitForeignKeyRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *ForeignKey) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *ForeignKey) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if ForeignKeyNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *ForeignKey) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/mergeartifacts.go b/go/gen/fb/serial/mergeartifacts.go index af921aa8cc..edadd5f0bc 100644 --- a/go/gen/fb/serial/mergeartifacts.go +++ b/go/gen/fb/serial/mergeartifacts.go @@ -26,11 +26,7 @@ type MergeArtifacts struct { func InitMergeArtifactsRoot(o *MergeArtifacts, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if MergeArtifactsNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsMergeArtifacts(buf []byte, offset flatbuffers.UOffsetT) (*MergeArtifacts, error) { @@ -38,26 +34,18 @@ func TryGetRootAsMergeArtifacts(buf []byte, offset flatbuffers.UOffsetT) (*Merge return x, InitMergeArtifactsRoot(x, buf, offset) } -func GetRootAsMergeArtifacts(buf []byte, offset flatbuffers.UOffsetT) *MergeArtifacts { - x := &MergeArtifacts{} - InitMergeArtifactsRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsMergeArtifacts(buf []byte, offset flatbuffers.UOffsetT) (*MergeArtifacts, error) { x := &MergeArtifacts{} return x, InitMergeArtifactsRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsMergeArtifacts(buf []byte, offset flatbuffers.UOffsetT) *MergeArtifacts { - x := &MergeArtifacts{} - InitMergeArtifactsRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *MergeArtifacts) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *MergeArtifacts) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if MergeArtifactsNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *MergeArtifacts) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/prolly.go b/go/gen/fb/serial/prolly.go index 4da6bd547c..176101413d 100644 --- a/go/gen/fb/serial/prolly.go +++ b/go/gen/fb/serial/prolly.go @@ -52,11 +52,7 @@ type ProllyTreeNode struct { func InitProllyTreeNodeRoot(o *ProllyTreeNode, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if ProllyTreeNodeNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsProllyTreeNode(buf []byte, offset flatbuffers.UOffsetT) (*ProllyTreeNode, error) { @@ -64,26 +60,18 @@ func TryGetRootAsProllyTreeNode(buf []byte, offset flatbuffers.UOffsetT) (*Proll return x, InitProllyTreeNodeRoot(x, buf, offset) } -func GetRootAsProllyTreeNode(buf []byte, offset flatbuffers.UOffsetT) *ProllyTreeNode { - x := &ProllyTreeNode{} - InitProllyTreeNodeRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsProllyTreeNode(buf []byte, offset flatbuffers.UOffsetT) (*ProllyTreeNode, error) { x := &ProllyTreeNode{} return x, InitProllyTreeNodeRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsProllyTreeNode(buf []byte, offset flatbuffers.UOffsetT) *ProllyTreeNode { - x := &ProllyTreeNode{} - InitProllyTreeNodeRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *ProllyTreeNode) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *ProllyTreeNode) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if ProllyTreeNodeNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *ProllyTreeNode) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/rootvalue.go b/go/gen/fb/serial/rootvalue.go index d7f5a2cc8a..2a35af87ef 100644 --- a/go/gen/fb/serial/rootvalue.go +++ b/go/gen/fb/serial/rootvalue.go @@ -26,11 +26,7 @@ type RootValue struct { func InitRootValueRoot(o *RootValue, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if RootValueNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsRootValue(buf []byte, offset flatbuffers.UOffsetT) (*RootValue, error) { @@ -38,26 +34,18 @@ func TryGetRootAsRootValue(buf []byte, offset flatbuffers.UOffsetT) (*RootValue, return x, InitRootValueRoot(x, buf, offset) } -func GetRootAsRootValue(buf []byte, offset flatbuffers.UOffsetT) *RootValue { - x := &RootValue{} - InitRootValueRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsRootValue(buf []byte, offset flatbuffers.UOffsetT) (*RootValue, error) { x := &RootValue{} return x, InitRootValueRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsRootValue(buf []byte, offset flatbuffers.UOffsetT) *RootValue { - x := &RootValue{} - InitRootValueRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *RootValue) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *RootValue) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if RootValueNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *RootValue) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/schema.go b/go/gen/fb/serial/schema.go index 8fa1a390a5..fc60fc7289 100644 --- a/go/gen/fb/serial/schema.go +++ b/go/gen/fb/serial/schema.go @@ -26,11 +26,7 @@ type TableSchema struct { func InitTableSchemaRoot(o *TableSchema, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if TableSchemaNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsTableSchema(buf []byte, offset flatbuffers.UOffsetT) (*TableSchema, error) { @@ -38,44 +34,24 @@ func TryGetRootAsTableSchema(buf []byte, offset flatbuffers.UOffsetT) (*TableSch return x, InitTableSchemaRoot(x, buf, offset) } -func GetRootAsTableSchema(buf []byte, offset flatbuffers.UOffsetT) *TableSchema { - x := &TableSchema{} - InitTableSchemaRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsTableSchema(buf []byte, offset flatbuffers.UOffsetT) (*TableSchema, error) { x := &TableSchema{} return x, InitTableSchemaRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsTableSchema(buf []byte, offset flatbuffers.UOffsetT) *TableSchema { - x := &TableSchema{} - InitTableSchemaRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *TableSchema) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *TableSchema) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if TableSchemaNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *TableSchema) Table() flatbuffers.Table { return rcv._tab } -func (rcv *TableSchema) Columns(obj *Column, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *TableSchema) TryColumns(obj *Column, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(4)) if o != 0 { @@ -99,19 +75,6 @@ func (rcv *TableSchema) ColumnsLength() int { return 0 } -func (rcv *TableSchema) ClusteredIndex(obj *Index) *Index { - o := flatbuffers.UOffsetT(rcv._tab.Offset(6)) - if o != 0 { - x := rcv._tab.Indirect(o + rcv._tab.Pos) - if obj == nil { - obj = new(Index) - } - obj.Init(rcv._tab.Bytes, x) - return obj - } - return nil -} - func (rcv *TableSchema) TryClusteredIndex(obj *Index) (*Index, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(6)) if o != 0 { @@ -128,18 +91,6 @@ func (rcv *TableSchema) TryClusteredIndex(obj *Index) (*Index, error) { return nil, nil } -func (rcv *TableSchema) SecondaryIndexes(obj *Index, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(8)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *TableSchema) TrySecondaryIndexes(obj *Index, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(8)) if o != 0 { @@ -163,18 +114,6 @@ func (rcv *TableSchema) SecondaryIndexesLength() int { return 0 } -func (rcv *TableSchema) Checks(obj *CheckConstraint, j int) bool { - o := flatbuffers.UOffsetT(rcv._tab.Offset(10)) - if o != 0 { - x := rcv._tab.Vector(o) - x += flatbuffers.UOffsetT(j) * 4 - x = rcv._tab.Indirect(x) - obj.Init(rcv._tab.Bytes, x) - return true - } - return false -} - func (rcv *TableSchema) TryChecks(obj *CheckConstraint, j int) (bool, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(10)) if o != 0 { @@ -249,11 +188,7 @@ type Column struct { func InitColumnRoot(o *Column, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if ColumnNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsColumn(buf []byte, offset flatbuffers.UOffsetT) (*Column, error) { @@ -261,26 +196,18 @@ func TryGetRootAsColumn(buf []byte, offset flatbuffers.UOffsetT) (*Column, error return x, InitColumnRoot(x, buf, offset) } -func GetRootAsColumn(buf []byte, offset flatbuffers.UOffsetT) *Column { - x := &Column{} - InitColumnRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsColumn(buf []byte, offset flatbuffers.UOffsetT) (*Column, error) { x := &Column{} return x, InitColumnRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsColumn(buf []byte, offset flatbuffers.UOffsetT) *Column { - x := &Column{} - InitColumnRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *Column) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *Column) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if ColumnNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *Column) Table() flatbuffers.Table { @@ -481,11 +408,7 @@ type Index struct { func InitIndexRoot(o *Index, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if IndexNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsIndex(buf []byte, offset flatbuffers.UOffsetT) (*Index, error) { @@ -493,26 +416,18 @@ func TryGetRootAsIndex(buf []byte, offset flatbuffers.UOffsetT) (*Index, error) return x, InitIndexRoot(x, buf, offset) } -func GetRootAsIndex(buf []byte, offset flatbuffers.UOffsetT) *Index { - x := &Index{} - InitIndexRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsIndex(buf []byte, offset flatbuffers.UOffsetT) (*Index, error) { x := &Index{} return x, InitIndexRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsIndex(buf []byte, offset flatbuffers.UOffsetT) *Index { - x := &Index{} - InitIndexRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *Index) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *Index) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if IndexNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *Index) Table() flatbuffers.Table { @@ -699,19 +614,6 @@ func (rcv *Index) MutateFulltextKey(n bool) bool { return rcv._tab.MutateBoolSlot(24, n) } -func (rcv *Index) FulltextInfo(obj *FulltextInfo) *FulltextInfo { - o := flatbuffers.UOffsetT(rcv._tab.Offset(26)) - if o != 0 { - x := rcv._tab.Indirect(o + rcv._tab.Pos) - if obj == nil { - obj = new(FulltextInfo) - } - obj.Init(rcv._tab.Bytes, x) - return obj - } - return nil -} - func (rcv *Index) TryFulltextInfo(obj *FulltextInfo) (*FulltextInfo, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(26)) if o != 0 { @@ -791,11 +693,7 @@ type FulltextInfo struct { func InitFulltextInfoRoot(o *FulltextInfo, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if FulltextInfoNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsFulltextInfo(buf []byte, offset flatbuffers.UOffsetT) (*FulltextInfo, error) { @@ -803,26 +701,18 @@ func TryGetRootAsFulltextInfo(buf []byte, offset flatbuffers.UOffsetT) (*Fulltex return x, InitFulltextInfoRoot(x, buf, offset) } -func GetRootAsFulltextInfo(buf []byte, offset flatbuffers.UOffsetT) *FulltextInfo { - x := &FulltextInfo{} - InitFulltextInfoRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsFulltextInfo(buf []byte, offset flatbuffers.UOffsetT) (*FulltextInfo, error) { x := &FulltextInfo{} return x, InitFulltextInfoRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsFulltextInfo(buf []byte, offset flatbuffers.UOffsetT) *FulltextInfo { - x := &FulltextInfo{} - InitFulltextInfoRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *FulltextInfo) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *FulltextInfo) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if FulltextInfoNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *FulltextInfo) Table() flatbuffers.Table { @@ -957,11 +847,7 @@ type CheckConstraint struct { func InitCheckConstraintRoot(o *CheckConstraint, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if CheckConstraintNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsCheckConstraint(buf []byte, offset flatbuffers.UOffsetT) (*CheckConstraint, error) { @@ -969,26 +855,18 @@ func TryGetRootAsCheckConstraint(buf []byte, offset flatbuffers.UOffsetT) (*Chec return x, InitCheckConstraintRoot(x, buf, offset) } -func GetRootAsCheckConstraint(buf []byte, offset flatbuffers.UOffsetT) *CheckConstraint { - x := &CheckConstraint{} - InitCheckConstraintRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsCheckConstraint(buf []byte, offset flatbuffers.UOffsetT) (*CheckConstraint, error) { x := &CheckConstraint{} return x, InitCheckConstraintRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsCheckConstraint(buf []byte, offset flatbuffers.UOffsetT) *CheckConstraint { - x := &CheckConstraint{} - InitCheckConstraintRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *CheckConstraint) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *CheckConstraint) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if CheckConstraintNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *CheckConstraint) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/stash.go b/go/gen/fb/serial/stash.go index 3979cfb6f4..14091c4e6d 100644 --- a/go/gen/fb/serial/stash.go +++ b/go/gen/fb/serial/stash.go @@ -26,11 +26,7 @@ type Stash struct { func InitStashRoot(o *Stash, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if StashNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsStash(buf []byte, offset flatbuffers.UOffsetT) (*Stash, error) { @@ -38,26 +34,18 @@ func TryGetRootAsStash(buf []byte, offset flatbuffers.UOffsetT) (*Stash, error) return x, InitStashRoot(x, buf, offset) } -func GetRootAsStash(buf []byte, offset flatbuffers.UOffsetT) *Stash { - x := &Stash{} - InitStashRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsStash(buf []byte, offset flatbuffers.UOffsetT) (*Stash, error) { x := &Stash{} return x, InitStashRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsStash(buf []byte, offset flatbuffers.UOffsetT) *Stash { - x := &Stash{} - InitStashRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *Stash) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *Stash) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if StashNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *Stash) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/stashlist.go b/go/gen/fb/serial/stashlist.go index 54fcffc89e..f896df622c 100644 --- a/go/gen/fb/serial/stashlist.go +++ b/go/gen/fb/serial/stashlist.go @@ -26,11 +26,7 @@ type StashList struct { func InitStashListRoot(o *StashList, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if StashListNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsStashList(buf []byte, offset flatbuffers.UOffsetT) (*StashList, error) { @@ -38,26 +34,18 @@ func TryGetRootAsStashList(buf []byte, offset flatbuffers.UOffsetT) (*StashList, return x, InitStashListRoot(x, buf, offset) } -func GetRootAsStashList(buf []byte, offset flatbuffers.UOffsetT) *StashList { - x := &StashList{} - InitStashListRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsStashList(buf []byte, offset flatbuffers.UOffsetT) (*StashList, error) { x := &StashList{} return x, InitStashListRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsStashList(buf []byte, offset flatbuffers.UOffsetT) *StashList { - x := &StashList{} - InitStashListRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *StashList) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *StashList) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if StashListNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *StashList) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/storeroot.go b/go/gen/fb/serial/storeroot.go index 032edae406..a3ed119454 100644 --- a/go/gen/fb/serial/storeroot.go +++ b/go/gen/fb/serial/storeroot.go @@ -26,11 +26,7 @@ type StoreRoot struct { func InitStoreRootRoot(o *StoreRoot, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if StoreRootNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsStoreRoot(buf []byte, offset flatbuffers.UOffsetT) (*StoreRoot, error) { @@ -38,26 +34,18 @@ func TryGetRootAsStoreRoot(buf []byte, offset flatbuffers.UOffsetT) (*StoreRoot, return x, InitStoreRootRoot(x, buf, offset) } -func GetRootAsStoreRoot(buf []byte, offset flatbuffers.UOffsetT) *StoreRoot { - x := &StoreRoot{} - InitStoreRootRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsStoreRoot(buf []byte, offset flatbuffers.UOffsetT) (*StoreRoot, error) { x := &StoreRoot{} return x, InitStoreRootRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsStoreRoot(buf []byte, offset flatbuffers.UOffsetT) *StoreRoot { - x := &StoreRoot{} - InitStoreRootRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *StoreRoot) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *StoreRoot) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if StoreRootNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *StoreRoot) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/table.go b/go/gen/fb/serial/table.go index 5a471b8f04..1af733592d 100644 --- a/go/gen/fb/serial/table.go +++ b/go/gen/fb/serial/table.go @@ -26,11 +26,7 @@ type Table struct { func InitTableRoot(o *Table, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if TableNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsTable(buf []byte, offset flatbuffers.UOffsetT) (*Table, error) { @@ -38,26 +34,18 @@ func TryGetRootAsTable(buf []byte, offset flatbuffers.UOffsetT) (*Table, error) return x, InitTableRoot(x, buf, offset) } -func GetRootAsTable(buf []byte, offset flatbuffers.UOffsetT) *Table { - x := &Table{} - InitTableRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsTable(buf []byte, offset flatbuffers.UOffsetT) (*Table, error) { x := &Table{} return x, InitTableRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsTable(buf []byte, offset flatbuffers.UOffsetT) *Table { - x := &Table{} - InitTableRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *Table) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *Table) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if TableNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *Table) Table() flatbuffers.Table { @@ -178,19 +166,6 @@ func (rcv *Table) MutateAutoIncrementValue(n uint64) bool { return rcv._tab.MutateUint64Slot(10, n) } -func (rcv *Table) Conflicts(obj *Conflicts) *Conflicts { - o := flatbuffers.UOffsetT(rcv._tab.Offset(12)) - if o != 0 { - x := rcv._tab.Indirect(o + rcv._tab.Pos) - if obj == nil { - obj = new(Conflicts) - } - obj.Init(rcv._tab.Bytes, x) - return obj - } - return nil -} - func (rcv *Table) TryConflicts(obj *Conflicts) (*Conflicts, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(12)) if o != 0 { @@ -326,11 +301,7 @@ type Conflicts struct { func InitConflictsRoot(o *Conflicts, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if ConflictsNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsConflicts(buf []byte, offset flatbuffers.UOffsetT) (*Conflicts, error) { @@ -338,26 +309,18 @@ func TryGetRootAsConflicts(buf []byte, offset flatbuffers.UOffsetT) (*Conflicts, return x, InitConflictsRoot(x, buf, offset) } -func GetRootAsConflicts(buf []byte, offset flatbuffers.UOffsetT) *Conflicts { - x := &Conflicts{} - InitConflictsRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsConflicts(buf []byte, offset flatbuffers.UOffsetT) (*Conflicts, error) { x := &Conflicts{} return x, InitConflictsRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsConflicts(buf []byte, offset flatbuffers.UOffsetT) *Conflicts { - x := &Conflicts{} - InitConflictsRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *Conflicts) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *Conflicts) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if ConflictsNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *Conflicts) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/tag.go b/go/gen/fb/serial/tag.go index b2c1deb389..b1b6a499ff 100644 --- a/go/gen/fb/serial/tag.go +++ b/go/gen/fb/serial/tag.go @@ -26,11 +26,7 @@ type Tag struct { func InitTagRoot(o *Tag, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if TagNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsTag(buf []byte, offset flatbuffers.UOffsetT) (*Tag, error) { @@ -38,26 +34,18 @@ func TryGetRootAsTag(buf []byte, offset flatbuffers.UOffsetT) (*Tag, error) { return x, InitTagRoot(x, buf, offset) } -func GetRootAsTag(buf []byte, offset flatbuffers.UOffsetT) *Tag { - x := &Tag{} - InitTagRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsTag(buf []byte, offset flatbuffers.UOffsetT) (*Tag, error) { x := &Tag{} return x, InitTagRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsTag(buf []byte, offset flatbuffers.UOffsetT) *Tag { - x := &Tag{} - InitTagRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *Tag) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *Tag) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if TagNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *Tag) Table() flatbuffers.Table { diff --git a/go/gen/fb/serial/workingset.go b/go/gen/fb/serial/workingset.go index 304c1fc6cf..bff478fb3d 100644 --- a/go/gen/fb/serial/workingset.go +++ b/go/gen/fb/serial/workingset.go @@ -26,11 +26,7 @@ type WorkingSet struct { func InitWorkingSetRoot(o *WorkingSet, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if WorkingSetNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsWorkingSet(buf []byte, offset flatbuffers.UOffsetT) (*WorkingSet, error) { @@ -38,26 +34,18 @@ func TryGetRootAsWorkingSet(buf []byte, offset flatbuffers.UOffsetT) (*WorkingSe return x, InitWorkingSetRoot(x, buf, offset) } -func GetRootAsWorkingSet(buf []byte, offset flatbuffers.UOffsetT) *WorkingSet { - x := &WorkingSet{} - InitWorkingSetRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsWorkingSet(buf []byte, offset flatbuffers.UOffsetT) (*WorkingSet, error) { x := &WorkingSet{} return x, InitWorkingSetRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsWorkingSet(buf []byte, offset flatbuffers.UOffsetT) *WorkingSet { - x := &WorkingSet{} - InitWorkingSetRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *WorkingSet) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *WorkingSet) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if WorkingSetNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *WorkingSet) Table() flatbuffers.Table { @@ -168,19 +156,6 @@ func (rcv *WorkingSet) MutateTimestampMillis(n uint64) bool { return rcv._tab.MutateUint64Slot(14, n) } -func (rcv *WorkingSet) MergeState(obj *MergeState) *MergeState { - o := flatbuffers.UOffsetT(rcv._tab.Offset(16)) - if o != 0 { - x := rcv._tab.Indirect(o + rcv._tab.Pos) - if obj == nil { - obj = new(MergeState) - } - obj.Init(rcv._tab.Bytes, x) - return obj - } - return nil -} - func (rcv *WorkingSet) TryMergeState(obj *MergeState) (*MergeState, error) { o := flatbuffers.UOffsetT(rcv._tab.Offset(16)) if o != 0 { @@ -239,11 +214,7 @@ type MergeState struct { func InitMergeStateRoot(o *MergeState, buf []byte, offset flatbuffers.UOffsetT) error { n := flatbuffers.GetUOffsetT(buf[offset:]) - o.Init(buf, n+offset) - if MergeStateNumFields < o.Table().NumFields() { - return flatbuffers.ErrTableHasUnknownFields - } - return nil + return o.Init(buf, n+offset) } func TryGetRootAsMergeState(buf []byte, offset flatbuffers.UOffsetT) (*MergeState, error) { @@ -251,26 +222,18 @@ func TryGetRootAsMergeState(buf []byte, offset flatbuffers.UOffsetT) (*MergeStat return x, InitMergeStateRoot(x, buf, offset) } -func GetRootAsMergeState(buf []byte, offset flatbuffers.UOffsetT) *MergeState { - x := &MergeState{} - InitMergeStateRoot(x, buf, offset) - return x -} - func TryGetSizePrefixedRootAsMergeState(buf []byte, offset flatbuffers.UOffsetT) (*MergeState, error) { x := &MergeState{} return x, InitMergeStateRoot(x, buf, offset+flatbuffers.SizeUint32) } -func GetSizePrefixedRootAsMergeState(buf []byte, offset flatbuffers.UOffsetT) *MergeState { - x := &MergeState{} - InitMergeStateRoot(x, buf, offset+flatbuffers.SizeUint32) - return x -} - -func (rcv *MergeState) Init(buf []byte, i flatbuffers.UOffsetT) { +func (rcv *MergeState) Init(buf []byte, i flatbuffers.UOffsetT) error { rcv._tab.Bytes = buf rcv._tab.Pos = i + if MergeStateNumFields < rcv.Table().NumFields() { + return flatbuffers.ErrTableHasUnknownFields + } + return nil } func (rcv *MergeState) Table() flatbuffers.Table { diff --git a/proto/third_party/flatbuffers b/proto/third_party/flatbuffers index 08228854f3..4df20763d8 160000 --- a/proto/third_party/flatbuffers +++ b/proto/third_party/flatbuffers @@ -1 +1 @@ -Subproject commit 08228854f3acd5900cfb1b8d0c32367b0e3789a8 +Subproject commit 4df20763d862cac7ec092cdee53e4afde63399d9