Fix JSON numeric marshaling #120

Merged
fyrchik merged 7 commits from fyrchik/frostfs-api-go:fix-protogen into master 2024-11-02 14:21:46 +00:00
23 changed files with 5367 additions and 1630 deletions

View file

@ -98,12 +98,20 @@ func (x *BalanceRequest_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"ownerId\":"
out.RawString(prefix[1:])
if x.OwnerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ownerId\":"
out.RawString(prefix)
x.OwnerId.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -295,22 +303,44 @@ func (x *BalanceRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -452,12 +482,20 @@ func (x *BalanceResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"balance\":"
out.RawString(prefix[1:])
if x.Balance != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"balance\":"
out.RawString(prefix)
x.Balance.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -649,22 +687,44 @@ func (x *BalanceResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}

View file

@ -26,7 +26,7 @@ const (
//
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
type AccountingServiceClient interface {
// Returns the amount of funds in GAS token for the requested NeoFS account.
// Returns the amount of funds in GAS token for the requested FrostFS account.
//
// Statuses:
// - **OK** (0, SECTION_SUCCESS):
@ -56,7 +56,7 @@ func (c *accountingServiceClient) Balance(ctx context.Context, in *BalanceReques
// All implementations should embed UnimplementedAccountingServiceServer
// for forward compatibility
type AccountingServiceServer interface {
// Returns the amount of funds in GAS token for the requested NeoFS account.
// Returns the amount of funds in GAS token for the requested FrostFS account.
//
// Statuses:
// - **OK** (0, SECTION_SUCCESS):

View file

@ -11,6 +11,7 @@ import (
easyproto "github.com/VictoriaMetrics/easyproto"
jlexer "github.com/mailru/easyjson/jlexer"
jwriter "github.com/mailru/easyjson/jwriter"
strconv "strconv"
)
type Decimal struct {
@ -113,17 +114,34 @@ func (x *Decimal) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"value\":"
out.RawString(prefix[1:])
out.Int64(x.Value)
if x.Value != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendInt(out.Buffer.Buf, x.Value, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"precision\":"
if x.Precision != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"precision\":"
out.RawString(prefix)
out.Uint32(x.Precision)
}
}
out.RawByte('}')
}
@ -155,13 +173,29 @@ func (x *Decimal) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "value":
{
var f int64
f = in.Int64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseInt(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := int64(v)
f = pv
x.Value = f
}
case "precision":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Precision = f
}
}

View file

@ -352,27 +352,66 @@ func (x *EACLRecord_Filter) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"headerType\":"
out.RawString(prefix[1:])
out.Int32(int32(x.HeaderType))
if x.HeaderType != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
{
const prefix string = ",\"matchType\":"
const prefix string = "\"headerType\":"
out.RawString(prefix)
out.Int32(int32(x.MatchType))
v := int32(x.HeaderType)
if vv, ok := HeaderType_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
const prefix string = ",\"key\":"
if x.MatchType != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"matchType\":"
out.RawString(prefix)
v := int32(x.MatchType)
if vv, ok := MatchType_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
if len(x.Key) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"key\":"
out.RawString(prefix)
out.String(x.Key)
}
}
{
const prefix string = ",\"value\":"
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.String(x.Value)
}
}
out.RawByte('}')
}
@ -566,14 +605,33 @@ func (x *EACLRecord_Target) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"role\":"
out.RawString(prefix[1:])
out.Int32(int32(x.Role))
if x.Role != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"role\":"
out.RawString(prefix)
v := int32(x.Role)
if vv, ok := Role_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
const prefix string = ",\"keys\":"
if len(x.Keys) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"keys\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Keys {
@ -584,6 +642,7 @@ func (x *EACLRecord_Target) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -808,19 +867,50 @@ func (x *EACLRecord) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"operation\":"
out.RawString(prefix[1:])
out.Int32(int32(x.Operation))
if x.Operation != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
{
const prefix string = ",\"action\":"
const prefix string = "\"operation\":"
out.RawString(prefix)
out.Int32(int32(x.Action))
v := int32(x.Operation)
if vv, ok := Operation_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
const prefix string = ",\"filters\":"
if x.Action != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"action\":"
out.RawString(prefix)
v := int32(x.Action)
if vv, ok := Action_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
if len(x.Filters) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"filters\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Filters {
@ -831,8 +921,15 @@ func (x *EACLRecord) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"targets\":"
if len(x.Targets) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"targets\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Targets {
@ -843,6 +940,7 @@ func (x *EACLRecord) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -1084,19 +1182,40 @@ func (x *EACLTable) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"version\":"
out.RawString(prefix[1:])
if x.Version != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"version\":"
out.RawString(prefix)
x.Version.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"containerID\":"
if x.ContainerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"containerID\":"
out.RawString(prefix)
x.ContainerId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"records\":"
if len(x.Records) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"records\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Records {
@ -1107,6 +1226,7 @@ func (x *EACLTable) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -1292,21 +1412,49 @@ func (x *BearerToken_Body_TokenLifetime) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"exp\":"
out.RawString(prefix[1:])
out.Uint64(x.Exp)
if x.Exp != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"exp\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Exp, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"nbf\":"
if x.Nbf != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"nbf\":"
out.RawString(prefix)
out.Uint64(x.Nbf)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Nbf, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"iat\":"
if x.Iat != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"iat\":"
out.RawString(prefix)
out.Uint64(x.Iat)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Iat, 10)
out.RawByte('"')
}
}
out.RawByte('}')
}
@ -1339,19 +1487,43 @@ func (x *BearerToken_Body_TokenLifetime) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "exp":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Exp = f
}
case "nbf":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Nbf = f
}
case "iat":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Iat = f
}
}
@ -1472,14 +1644,28 @@ func (x *BearerToken_Body_APEOverride) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"target\":"
out.RawString(prefix[1:])
if x.Target != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"target\":"
out.RawString(prefix)
x.Target.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"chains\":"
if len(x.Chains) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"chains\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Chains {
@ -1490,6 +1676,7 @@ func (x *BearerToken_Body_APEOverride) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -1720,32 +1907,68 @@ func (x *BearerToken_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"eaclTable\":"
out.RawString(prefix[1:])
if x.EaclTable != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"eaclTable\":"
out.RawString(prefix)
x.EaclTable.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"ownerID\":"
if x.OwnerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ownerID\":"
out.RawString(prefix)
x.OwnerId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"lifetime\":"
if x.Lifetime != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"lifetime\":"
out.RawString(prefix)
x.Lifetime.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"allowImpersonate\":"
if x.AllowImpersonate {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"allowImpersonate\":"
out.RawString(prefix)
out.Bool(x.AllowImpersonate)
}
}
{
const prefix string = ",\"apeOverride\":"
if x.ApeOverride != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"apeOverride\":"
out.RawString(prefix)
x.ApeOverride.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1923,17 +2146,32 @@ func (x *BearerToken) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"signature\":"
if x.Signature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"signature\":"
out.RawString(prefix)
x.Signature.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}

View file

@ -155,17 +155,37 @@ func (x *ChainTarget) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"type\":"
out.RawString(prefix[1:])
out.Int32(int32(x.Type))
if x.Type != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"type\":"
out.RawString(prefix)
v := int32(x.Type)
if vv, ok := TargetType_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
const prefix string = ",\"name\":"
if len(x.Name) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"name\":"
out.RawString(prefix)
out.String(x.Name)
}
}
out.RawByte('}')
}
@ -333,15 +353,23 @@ func (x *Chain) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
switch xx := x.Kind.(type) {
case *Chain_Raw:
{
const prefix string = ",\"raw\":"
out.RawString(prefix[1:])
if len(xx.Raw) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"raw\":"
out.RawString(prefix)
out.Base64Bytes(xx.Raw)
}
}
}
out.RawByte('}')
}

View file

@ -121,17 +121,32 @@ func (x *AddChainRequest_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"target\":"
out.RawString(prefix[1:])
if x.Target != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"target\":"
out.RawString(prefix)
x.Target.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"chain\":"
if x.Chain != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"chain\":"
out.RawString(prefix)
x.Chain.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -330,22 +345,44 @@ func (x *AddChainRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -484,12 +521,20 @@ func (x *AddChainResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"chainId\":"
out.RawString(prefix[1:])
if len(x.ChainId) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"chainId\":"
out.RawString(prefix)
out.Base64Bytes(x.ChainId)
}
}
out.RawByte('}')
}
@ -680,22 +725,44 @@ func (x *AddChainResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -857,17 +924,32 @@ func (x *RemoveChainRequest_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"target\":"
out.RawString(prefix[1:])
if x.Target != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"target\":"
out.RawString(prefix)
x.Target.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"chainId\":"
if len(x.ChainId) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"chainId\":"
out.RawString(prefix)
out.Base64Bytes(x.ChainId)
}
}
out.RawByte('}')
}
@ -1065,22 +1147,44 @@ func (x *RemoveChainRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1381,22 +1485,44 @@ func (x *RemoveChainResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1538,12 +1664,20 @@ func (x *ListChainsRequest_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"target\":"
out.RawString(prefix[1:])
if x.Target != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"target\":"
out.RawString(prefix)
x.Target.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1735,22 +1869,44 @@ func (x *ListChainsRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1895,10 +2051,17 @@ func (x *ListChainsResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"chains\":"
out.RawString(prefix[1:])
if len(x.Chains) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"chains\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Chains {
if i != 0 {
@ -1908,6 +2071,7 @@ func (x *ListChainsResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -2106,22 +2270,44 @@ func (x *ListChainsResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}

View file

@ -121,17 +121,32 @@ func (x *PutRequest_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"container\":"
out.RawString(prefix[1:])
if x.Container != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"container\":"
out.RawString(prefix)
x.Container.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"signature\":"
if x.Signature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"signature\":"
out.RawString(prefix)
x.Signature.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -330,22 +345,44 @@ func (x *PutRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -487,12 +524,20 @@ func (x *PutResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"containerId\":"
out.RawString(prefix[1:])
if x.ContainerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"containerId\":"
out.RawString(prefix)
x.ContainerId.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -684,22 +729,44 @@ func (x *PutResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -864,17 +931,32 @@ func (x *DeleteRequest_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"containerId\":"
out.RawString(prefix[1:])
if x.ContainerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"containerId\":"
out.RawString(prefix)
x.ContainerId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"signature\":"
if x.Signature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"signature\":"
out.RawString(prefix)
x.Signature.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1073,22 +1155,44 @@ func (x *DeleteRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1389,22 +1493,44 @@ func (x *DeleteResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1546,12 +1672,20 @@ func (x *GetRequest_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"containerId\":"
out.RawString(prefix[1:])
if x.ContainerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"containerId\":"
out.RawString(prefix)
x.ContainerId.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1743,22 +1877,44 @@ func (x *GetRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1946,22 +2102,44 @@ func (x *GetResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"container\":"
out.RawString(prefix[1:])
if x.Container != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"container\":"
out.RawString(prefix)
x.Container.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"signature\":"
if x.Signature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"signature\":"
out.RawString(prefix)
x.Signature.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"sessionToken\":"
if x.SessionToken != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"sessionToken\":"
out.RawString(prefix)
x.SessionToken.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -2167,22 +2345,44 @@ func (x *GetResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -2324,12 +2524,20 @@ func (x *ListRequest_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"ownerId\":"
out.RawString(prefix[1:])
if x.OwnerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ownerId\":"
out.RawString(prefix)
x.OwnerId.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -2521,22 +2729,44 @@ func (x *ListRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -2681,10 +2911,17 @@ func (x *ListResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"containerIds\":"
out.RawString(prefix[1:])
if len(x.ContainerIds) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"containerIds\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.ContainerIds {
if i != 0 {
@ -2694,6 +2931,7 @@ func (x *ListResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -2892,22 +3130,44 @@ func (x *ListResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}

View file

@ -13,6 +13,7 @@ import (
easyproto "github.com/VictoriaMetrics/easyproto"
jlexer "github.com/mailru/easyjson/jlexer"
jwriter "github.com/mailru/easyjson/jwriter"
strconv "strconv"
)
type Container_Attribute struct {
@ -115,17 +116,32 @@ func (x *Container_Attribute) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"key\":"
out.RawString(prefix[1:])
if len(x.Key) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"key\":"
out.RawString(prefix)
out.String(x.Key)
}
}
{
const prefix string = ",\"value\":"
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.String(x.Value)
}
}
out.RawByte('}')
}
@ -370,29 +386,64 @@ func (x *Container) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"version\":"
out.RawString(prefix[1:])
if x.Version != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"version\":"
out.RawString(prefix)
x.Version.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"ownerID\":"
if x.OwnerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ownerID\":"
out.RawString(prefix)
x.OwnerId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"nonce\":"
if len(x.Nonce) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"nonce\":"
out.RawString(prefix)
out.Base64Bytes(x.Nonce)
}
}
{
const prefix string = ",\"basicACL\":"
if x.BasicAcl != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"basicACL\":"
out.RawString(prefix)
out.Uint32(x.BasicAcl)
}
}
{
const prefix string = ",\"attributes\":"
if len(x.Attributes) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"attributes\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Attributes {
@ -403,11 +454,19 @@ func (x *Container) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"placementPolicy\":"
if x.PlacementPolicy != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"placementPolicy\":"
out.RawString(prefix)
x.PlacementPolicy.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -459,7 +518,15 @@ func (x *Container) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "basicACL":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.BasicAcl = f
}
case "attributes":

View file

@ -100,10 +100,17 @@ func (x *Lock) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"members\":"
out.RawString(prefix[1:])
if len(x.Members) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"members\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Members {
if i != 0 {
@ -113,6 +120,7 @@ func (x *Lock) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}

View file

@ -257,22 +257,44 @@ func (x *LocalNodeInfoRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -437,17 +459,32 @@ func (x *LocalNodeInfoResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"version\":"
out.RawString(prefix[1:])
if x.Version != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"version\":"
out.RawString(prefix)
x.Version.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"nodeInfo\":"
if x.NodeInfo != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"nodeInfo\":"
out.RawString(prefix)
x.NodeInfo.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -646,22 +683,44 @@ func (x *LocalNodeInfoResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -962,22 +1021,44 @@ func (x *NetworkInfoRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1119,12 +1200,20 @@ func (x *NetworkInfoResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"networkInfo\":"
out.RawString(prefix[1:])
if x.NetworkInfo != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"networkInfo\":"
out.RawString(prefix)
x.NetworkInfo.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1316,22 +1405,44 @@ func (x *NetworkInfoResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1632,22 +1743,44 @@ func (x *NetmapSnapshotRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1789,12 +1922,20 @@ func (x *NetmapSnapshotResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"netmap\":"
out.RawString(prefix[1:])
if x.Netmap != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"netmap\":"
out.RawString(prefix)
x.Netmap.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1986,22 +2127,44 @@ func (x *NetmapSnapshotResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}

View file

@ -40,14 +40,14 @@ type NetmapServiceClient interface {
// information about the server has been successfully read;
// - Common failures (SECTION_FAILURE_COMMON).
LocalNodeInfo(ctx context.Context, in *LocalNodeInfoRequest, opts ...grpc.CallOption) (*LocalNodeInfoResponse, error)
// Read recent information about the NeoFS network.
// Read recent information about the FrostFS network.
//
// Statuses:
// - **OK** (0, SECTION_SUCCESS):
// information about the current network state has been successfully read;
// - Common failures (SECTION_FAILURE_COMMON).
NetworkInfo(ctx context.Context, in *NetworkInfoRequest, opts ...grpc.CallOption) (*NetworkInfoResponse, error)
// Returns network map snapshot of the current NeoFS epoch.
// Returns network map snapshot of the current FrostFS epoch.
//
// Statuses:
// - **OK** (0, SECTION_SUCCESS):
@ -107,14 +107,14 @@ type NetmapServiceServer interface {
// information about the server has been successfully read;
// - Common failures (SECTION_FAILURE_COMMON).
LocalNodeInfo(context.Context, *LocalNodeInfoRequest) (*LocalNodeInfoResponse, error)
// Read recent information about the NeoFS network.
// Read recent information about the FrostFS network.
//
// Statuses:
// - **OK** (0, SECTION_SUCCESS):
// information about the current network state has been successfully read;
// - Common failures (SECTION_FAILURE_COMMON).
NetworkInfo(context.Context, *NetworkInfoRequest) (*NetworkInfoResponse, error)
// Returns network map snapshot of the current NeoFS epoch.
// Returns network map snapshot of the current FrostFS epoch.
//
// Statuses:
// - **OK** (0, SECTION_SUCCESS):

View file

@ -274,29 +274,69 @@ func (x *Filter) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"name\":"
out.RawString(prefix[1:])
if len(x.Name) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"name\":"
out.RawString(prefix)
out.String(x.Name)
}
}
{
const prefix string = ",\"key\":"
if len(x.Key) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"key\":"
out.RawString(prefix)
out.String(x.Key)
}
{
const prefix string = ",\"op\":"
out.RawString(prefix)
out.Int32(int32(x.Op))
}
{
const prefix string = ",\"value\":"
if x.Op != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"op\":"
out.RawString(prefix)
v := int32(x.Op)
if vv, ok := Operation_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.String(x.Value)
}
}
{
const prefix string = ",\"filters\":"
if len(x.Filters) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"filters\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Filters {
@ -307,6 +347,7 @@ func (x *Filter) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -558,32 +599,73 @@ func (x *Selector) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"name\":"
out.RawString(prefix[1:])
if len(x.Name) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"name\":"
out.RawString(prefix)
out.String(x.Name)
}
}
{
const prefix string = ",\"count\":"
if x.Count != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"count\":"
out.RawString(prefix)
out.Uint32(x.Count)
}
{
const prefix string = ",\"clause\":"
out.RawString(prefix)
out.Int32(int32(x.Clause))
}
{
const prefix string = ",\"attribute\":"
if x.Clause != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"clause\":"
out.RawString(prefix)
v := int32(x.Clause)
if vv, ok := Clause_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
if len(x.Attribute) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"attribute\":"
out.RawString(prefix)
out.String(x.Attribute)
}
}
{
const prefix string = ",\"filter\":"
if len(x.Filter) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"filter\":"
out.RawString(prefix)
out.String(x.Filter)
}
}
out.RawByte('}')
}
@ -621,7 +703,15 @@ func (x *Selector) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "count":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Count = f
}
case "clause":
@ -807,27 +897,56 @@ func (x *Replica) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"count\":"
out.RawString(prefix[1:])
if x.Count != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"count\":"
out.RawString(prefix)
out.Uint32(x.Count)
}
}
{
const prefix string = ",\"selector\":"
if len(x.Selector) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"selector\":"
out.RawString(prefix)
out.String(x.Selector)
}
}
{
const prefix string = ",\"ecDataCount\":"
if x.EcDataCount != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ecDataCount\":"
out.RawString(prefix)
out.Uint32(x.EcDataCount)
}
}
{
const prefix string = ",\"ecParityCount\":"
if x.EcParityCount != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ecParityCount\":"
out.RawString(prefix)
out.Uint32(x.EcParityCount)
}
}
out.RawByte('}')
}
@ -859,7 +978,15 @@ func (x *Replica) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "count":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Count = f
}
case "selector":
@ -871,13 +998,29 @@ func (x *Replica) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "ecDataCount":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.EcDataCount = f
}
case "ecParityCount":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.EcParityCount = f
}
}
@ -1067,10 +1210,17 @@ func (x *PlacementPolicy) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"replicas\":"
out.RawString(prefix[1:])
if len(x.Replicas) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"replicas\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Replicas {
if i != 0 {
@ -1080,13 +1230,27 @@ func (x *PlacementPolicy) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"containerBackupFactor\":"
if x.ContainerBackupFactor != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"containerBackupFactor\":"
out.RawString(prefix)
out.Uint32(x.ContainerBackupFactor)
}
}
{
const prefix string = ",\"selectors\":"
if len(x.Selectors) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"selectors\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Selectors {
@ -1097,8 +1261,15 @@ func (x *PlacementPolicy) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"filters\":"
if len(x.Filters) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"filters\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Filters {
@ -1109,11 +1280,19 @@ func (x *PlacementPolicy) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"unique\":"
if x.Unique {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"unique\":"
out.RawString(prefix)
out.Bool(x.Unique)
}
}
out.RawByte('}')
}
@ -1159,7 +1338,15 @@ func (x *PlacementPolicy) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "containerBackupFactor":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.ContainerBackupFactor = f
}
case "selectors":
@ -1363,19 +1550,40 @@ func (x *NodeInfo_Attribute) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"key\":"
out.RawString(prefix[1:])
if len(x.Key) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"key\":"
out.RawString(prefix)
out.String(x.Key)
}
}
{
const prefix string = ",\"value\":"
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.String(x.Value)
}
}
{
const prefix string = ",\"parents\":"
if len(x.Parents) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"parents\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Parents {
@ -1386,6 +1594,7 @@ func (x *NodeInfo_Attribute) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -1594,14 +1803,28 @@ func (x *NodeInfo) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"publicKey\":"
out.RawString(prefix[1:])
if len(x.PublicKey) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"publicKey\":"
out.RawString(prefix)
out.Base64Bytes(x.PublicKey)
}
}
{
const prefix string = ",\"addresses\":"
if len(x.Addresses) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"addresses\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Addresses {
@ -1612,8 +1835,15 @@ func (x *NodeInfo) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"attributes\":"
if len(x.Attributes) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"attributes\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Attributes {
@ -1624,10 +1854,23 @@ func (x *NodeInfo) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"state\":"
if x.State != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"state\":"
out.RawString(prefix)
out.Int32(int32(x.State))
v := int32(x.State)
if vv, ok := NodeInfo_State_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
out.RawByte('}')
}
@ -1827,14 +2070,30 @@ func (x *Netmap) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"epoch\":"
out.RawString(prefix[1:])
out.Uint64(x.Epoch)
if x.Epoch != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"epoch\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Epoch, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"nodes\":"
if len(x.Nodes) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"nodes\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Nodes {
@ -1845,6 +2104,7 @@ func (x *Netmap) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -1876,7 +2136,15 @@ func (x *Netmap) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "epoch":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Epoch = f
}
case "nodes":
@ -2002,17 +2270,32 @@ func (x *NetworkConfig_Parameter) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"key\":"
out.RawString(prefix[1:])
if len(x.Key) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"key\":"
out.RawString(prefix)
out.Base64Bytes(x.Key)
}
}
{
const prefix string = ",\"value\":"
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.Base64Bytes(x.Value)
}
}
out.RawByte('}')
}
@ -2148,10 +2431,17 @@ func (x *NetworkConfig) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"parameters\":"
out.RawString(prefix[1:])
if len(x.Parameters) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"parameters\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Parameters {
if i != 0 {
@ -2161,6 +2451,7 @@ func (x *NetworkConfig) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -2355,27 +2646,62 @@ func (x *NetworkInfo) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"currentEpoch\":"
out.RawString(prefix[1:])
out.Uint64(x.CurrentEpoch)
if x.CurrentEpoch != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
{
const prefix string = ",\"magicNumber\":"
const prefix string = "\"currentEpoch\":"
out.RawString(prefix)
out.Uint64(x.MagicNumber)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.CurrentEpoch, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"msPerBlock\":"
if x.MagicNumber != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"magicNumber\":"
out.RawString(prefix)
out.Int64(x.MsPerBlock)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.MagicNumber, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"networkConfig\":"
if x.MsPerBlock != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"msPerBlock\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendInt(out.Buffer.Buf, x.MsPerBlock, 10)
out.RawByte('"')
}
}
{
if x.NetworkConfig != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"networkConfig\":"
out.RawString(prefix)
x.NetworkConfig.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -2407,19 +2733,43 @@ func (x *NetworkInfo) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "currentEpoch":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.CurrentEpoch = f
}
case "magicNumber":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.MagicNumber = f
}
case "msPerBlock":
{
var f int64
f = in.Int64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseInt(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := int64(v)
f = pv
x.MsPerBlock = f
}
case "networkConfig":

File diff suppressed because it is too large Load diff

View file

@ -170,7 +170,7 @@ type ObjectServiceClient interface {
// provided session token has expired.
Head(ctx context.Context, in *HeadRequest, opts ...grpc.CallOption) (*HeadResponse, error)
// Search objects in container. Search query allows to match by Object
// Header's filed values. Please see the corresponding NeoFS Technical
// Header's filed values. Please see the corresponding FrostFS Technical
// Specification section for more details.
//
// Extended headers can change `Search` behaviour:
@ -301,16 +301,20 @@ type ObjectServiceClient interface {
// provided session token has expired.
PutSingle(ctx context.Context, in *PutSingleRequest, opts ...grpc.CallOption) (*PutSingleResponse, error)
// Patch the object. Request uses gRPC stream. First message must set
// the address of the object that is going to get patched. If the object's attributes
// are patched, then these attrubutes must be set only within the first stream message.
// the address of the object that is going to get patched. If the object's
// attributes are patched, then these attrubutes must be set only within the
// first stream message.
//
// If the patch request is performed by NOT the object's owner but if the actor has the permission
// to perform the patch, then `OwnerID` of the object is changed. In this case the object's owner
// loses the object's ownership after the patch request is successfully done.
// If the patch request is performed by NOT the object's owner but if the
// actor has the permission to perform the patch, then `OwnerID` of the object
// is changed. In this case the object's owner loses the object's ownership
// after the patch request is successfully done.
//
// As objects are content-addressable the patching causes new object ID generation for the patched object.
// This object id is set witihn `PatchResponse`. But the object id may remain unchanged in such cases:
// 1. The chunk of the applying patch contains the same value as the object's payload within the same range;
// As objects are content-addressable the patching causes new object ID
// generation for the patched object. This object id is set witihn
// `PatchResponse`. But the object id may remain unchanged in such cases:
// 1. The chunk of the applying patch contains the same value as the object's
// payload within the same range;
// 2. The patch that reverts the changes applied by preceding patch;
// 3. The application of the same patches for the object a few times.
//
@ -694,7 +698,7 @@ type ObjectServiceServer interface {
// provided session token has expired.
Head(context.Context, *HeadRequest) (*HeadResponse, error)
// Search objects in container. Search query allows to match by Object
// Header's filed values. Please see the corresponding NeoFS Technical
// Header's filed values. Please see the corresponding FrostFS Technical
// Specification section for more details.
//
// Extended headers can change `Search` behaviour:
@ -825,16 +829,20 @@ type ObjectServiceServer interface {
// provided session token has expired.
PutSingle(context.Context, *PutSingleRequest) (*PutSingleResponse, error)
// Patch the object. Request uses gRPC stream. First message must set
// the address of the object that is going to get patched. If the object's attributes
// are patched, then these attrubutes must be set only within the first stream message.
// the address of the object that is going to get patched. If the object's
// attributes are patched, then these attrubutes must be set only within the
// first stream message.
//
// If the patch request is performed by NOT the object's owner but if the actor has the permission
// to perform the patch, then `OwnerID` of the object is changed. In this case the object's owner
// loses the object's ownership after the patch request is successfully done.
// If the patch request is performed by NOT the object's owner but if the
// actor has the permission to perform the patch, then `OwnerID` of the object
// is changed. In this case the object's owner loses the object's ownership
// after the patch request is successfully done.
//
// As objects are content-addressable the patching causes new object ID generation for the patched object.
// This object id is set witihn `PatchResponse`. But the object id may remain unchanged in such cases:
// 1. The chunk of the applying patch contains the same value as the object's payload within the same range;
// As objects are content-addressable the patching causes new object ID
// generation for the patched object. This object id is set witihn
// `PatchResponse`. But the object id may remain unchanged in such cases:
// 1. The chunk of the applying patch contains the same value as the object's
// payload within the same range;
// 2. The patch that reverts the changes applied by preceding patch;
// 3. The application of the same patches for the object a few times.
//

View file

@ -304,42 +304,101 @@ func (x *ShortHeader) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"version\":"
out.RawString(prefix[1:])
if x.Version != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"version\":"
out.RawString(prefix)
x.Version.MarshalEasyJSON(out)
}
{
const prefix string = ",\"creationEpoch\":"
out.RawString(prefix)
out.Uint64(x.CreationEpoch)
}
{
const prefix string = ",\"ownerID\":"
if x.CreationEpoch != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"creationEpoch\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.CreationEpoch, 10)
out.RawByte('"')
}
}
{
if x.OwnerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ownerID\":"
out.RawString(prefix)
x.OwnerId.MarshalEasyJSON(out)
}
{
const prefix string = ",\"objectType\":"
out.RawString(prefix)
out.Int32(int32(x.ObjectType))
}
{
const prefix string = ",\"payloadLength\":"
if x.ObjectType != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"objectType\":"
out.RawString(prefix)
out.Uint64(x.PayloadLength)
v := int32(x.ObjectType)
if vv, ok := ObjectType_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
const prefix string = ",\"payloadHash\":"
if x.PayloadLength != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"payloadLength\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.PayloadLength, 10)
out.RawByte('"')
}
}
{
if x.PayloadHash != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"payloadHash\":"
out.RawString(prefix)
x.PayloadHash.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"homomorphicHash\":"
if x.HomomorphicHash != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"homomorphicHash\":"
out.RawString(prefix)
x.HomomorphicHash.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -378,7 +437,15 @@ func (x *ShortHeader) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "creationEpoch":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.CreationEpoch = f
}
case "ownerID":
@ -413,7 +480,15 @@ func (x *ShortHeader) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "payloadLength":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.PayloadLength = f
}
case "payloadHash":
@ -539,17 +614,32 @@ func (x *Header_Attribute) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"key\":"
out.RawString(prefix[1:])
if len(x.Key) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"key\":"
out.RawString(prefix)
out.String(x.Key)
}
}
{
const prefix string = ",\"value\":"
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.String(x.Value)
}
}
out.RawByte('}')
}
@ -797,29 +887,64 @@ func (x *Header_Split) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"parent\":"
out.RawString(prefix[1:])
if x.Parent != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"parent\":"
out.RawString(prefix)
x.Parent.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"previous\":"
if x.Previous != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"previous\":"
out.RawString(prefix)
x.Previous.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"parentSignature\":"
if x.ParentSignature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"parentSignature\":"
out.RawString(prefix)
x.ParentSignature.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"parentHeader\":"
if x.ParentHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"parentHeader\":"
out.RawString(prefix)
x.ParentHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"children\":"
if len(x.Children) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"children\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Children {
@ -830,11 +955,19 @@ func (x *Header_Split) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"splitID\":"
if len(x.SplitId) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"splitID\":"
out.RawString(prefix)
out.Base64Bytes(x.SplitId)
}
}
out.RawByte('}')
}
@ -1152,44 +1285,100 @@ func (x *Header_EC) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"parent\":"
out.RawString(prefix[1:])
if x.Parent != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"parent\":"
out.RawString(prefix)
x.Parent.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"index\":"
if x.Index != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"index\":"
out.RawString(prefix)
out.Uint32(x.Index)
}
}
{
const prefix string = ",\"total\":"
if x.Total != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"total\":"
out.RawString(prefix)
out.Uint32(x.Total)
}
}
{
const prefix string = ",\"headerLength\":"
if x.HeaderLength != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"headerLength\":"
out.RawString(prefix)
out.Uint32(x.HeaderLength)
}
}
{
const prefix string = ",\"header\":"
if len(x.Header) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"header\":"
out.RawString(prefix)
out.Base64Bytes(x.Header)
}
}
{
const prefix string = ",\"parentSplitID\":"
if len(x.ParentSplitId) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"parentSplitID\":"
out.RawString(prefix)
out.Base64Bytes(x.ParentSplitId)
}
}
{
const prefix string = ",\"parentSplitParentID\":"
if x.ParentSplitParentId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"parentSplitParentID\":"
out.RawString(prefix)
x.ParentSplitParentId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"parentAttributes\":"
if len(x.ParentAttributes) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"parentAttributes\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.ParentAttributes {
@ -1200,6 +1389,7 @@ func (x *Header_EC) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -1238,19 +1428,43 @@ func (x *Header_EC) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "index":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Index = f
}
case "total":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Total = f
}
case "headerLength":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.HeaderLength = f
}
case "header":
@ -1625,54 +1839,133 @@ func (x *Header) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"version\":"
out.RawString(prefix[1:])
if x.Version != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"version\":"
out.RawString(prefix)
x.Version.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"containerID\":"
if x.ContainerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"containerID\":"
out.RawString(prefix)
x.ContainerId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"ownerID\":"
if x.OwnerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ownerID\":"
out.RawString(prefix)
x.OwnerId.MarshalEasyJSON(out)
}
{
const prefix string = ",\"creationEpoch\":"
out.RawString(prefix)
out.Uint64(x.CreationEpoch)
}
{
const prefix string = ",\"payloadLength\":"
if x.CreationEpoch != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"creationEpoch\":"
out.RawString(prefix)
out.Uint64(x.PayloadLength)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.CreationEpoch, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"payloadHash\":"
if x.PayloadLength != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"payloadLength\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.PayloadLength, 10)
out.RawByte('"')
}
}
{
if x.PayloadHash != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"payloadHash\":"
out.RawString(prefix)
x.PayloadHash.MarshalEasyJSON(out)
}
{
const prefix string = ",\"objectType\":"
out.RawString(prefix)
out.Int32(int32(x.ObjectType))
}
{
const prefix string = ",\"homomorphicHash\":"
if x.ObjectType != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"objectType\":"
out.RawString(prefix)
v := int32(x.ObjectType)
if vv, ok := ObjectType_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
if x.HomomorphicHash != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"homomorphicHash\":"
out.RawString(prefix)
x.HomomorphicHash.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"sessionToken\":"
if x.SessionToken != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"sessionToken\":"
out.RawString(prefix)
x.SessionToken.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"attributes\":"
if len(x.Attributes) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"attributes\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Attributes {
@ -1683,16 +1976,31 @@ func (x *Header) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"split\":"
if x.Split != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"split\":"
out.RawString(prefix)
x.Split.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"ec\":"
if x.Ec != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ec\":"
out.RawString(prefix)
x.Ec.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1745,13 +2053,29 @@ func (x *Header) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "creationEpoch":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.CreationEpoch = f
}
case "payloadLength":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.PayloadLength = f
}
case "payloadHash":
@ -1983,27 +2307,56 @@ func (x *Object) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"objectID\":"
out.RawString(prefix[1:])
if x.ObjectId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"objectID\":"
out.RawString(prefix)
x.ObjectId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"signature\":"
if x.Signature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"signature\":"
out.RawString(prefix)
x.Signature.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"header\":"
if x.Header != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"header\":"
out.RawString(prefix)
x.Header.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"payload\":"
if len(x.Payload) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"payload\":"
out.RawString(prefix)
out.Base64Bytes(x.Payload)
}
}
out.RawByte('}')
}
@ -2194,22 +2547,44 @@ func (x *SplitInfo) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"splitId\":"
out.RawString(prefix[1:])
if len(x.SplitId) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"splitId\":"
out.RawString(prefix)
out.Base64Bytes(x.SplitId)
}
}
{
const prefix string = ",\"lastPart\":"
if x.LastPart != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"lastPart\":"
out.RawString(prefix)
x.LastPart.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"link\":"
if x.Link != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"link\":"
out.RawString(prefix)
x.Link.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -2390,22 +2765,44 @@ func (x *ECInfo_Chunk) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"id\":"
out.RawString(prefix[1:])
if x.Id != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"id\":"
out.RawString(prefix)
x.Id.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"index\":"
if x.Index != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"index\":"
out.RawString(prefix)
out.Uint32(x.Index)
}
}
{
const prefix string = ",\"total\":"
if x.Total != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"total\":"
out.RawString(prefix)
out.Uint32(x.Total)
}
}
out.RawByte('}')
}
@ -2444,13 +2841,29 @@ func (x *ECInfo_Chunk) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "index":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Index = f
}
case "total":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Total = f
}
}
@ -2548,10 +2961,17 @@ func (x *ECInfo) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"chunks\":"
out.RawString(prefix[1:])
if len(x.Chunks) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"chunks\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Chunks {
if i != 0 {
@ -2561,6 +2981,7 @@ func (x *ECInfo) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}

View file

@ -190,17 +190,32 @@ func (x *Address) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"containerID\":"
out.RawString(prefix[1:])
if x.ContainerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"containerID\":"
out.RawString(prefix)
x.ContainerId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"objectID\":"
if x.ObjectId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"objectID\":"
out.RawString(prefix)
x.ObjectId.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -332,12 +347,20 @@ func (x *ObjectID) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"value\":"
out.RawString(prefix[1:])
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.Base64Bytes(x.Value)
}
}
out.RawByte('}')
}
@ -461,12 +484,20 @@ func (x *ContainerID) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"value\":"
out.RawString(prefix[1:])
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.Base64Bytes(x.Value)
}
}
out.RawByte('}')
}
@ -590,12 +621,20 @@ func (x *OwnerID) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"value\":"
out.RawString(prefix[1:])
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.Base64Bytes(x.Value)
}
}
out.RawByte('}')
}
@ -739,17 +778,32 @@ func (x *Version) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"major\":"
out.RawString(prefix[1:])
if x.Major != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"major\":"
out.RawString(prefix)
out.Uint32(x.Major)
}
}
{
const prefix string = ",\"minor\":"
if x.Minor != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"minor\":"
out.RawString(prefix)
out.Uint32(x.Minor)
}
}
out.RawByte('}')
}
@ -781,13 +835,29 @@ func (x *Version) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "major":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Major = f
}
case "minor":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Minor = f
}
}
@ -919,21 +989,48 @@ func (x *Signature) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"key\":"
out.RawString(prefix[1:])
if len(x.Key) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"key\":"
out.RawString(prefix)
out.Base64Bytes(x.Key)
}
}
{
const prefix string = ",\"signature\":"
if len(x.Sign) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"signature\":"
out.RawString(prefix)
out.Base64Bytes(x.Sign)
}
}
{
const prefix string = ",\"scheme\":"
if x.Scheme != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"scheme\":"
out.RawString(prefix)
out.Int32(int32(x.Scheme))
v := int32(x.Scheme)
if vv, ok := SignatureScheme_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
out.RawByte('}')
}
@ -1106,17 +1203,32 @@ func (x *SignatureRFC6979) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"key\":"
out.RawString(prefix[1:])
if len(x.Key) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"key\":"
out.RawString(prefix)
out.Base64Bytes(x.Key)
}
}
{
const prefix string = ",\"signature\":"
if len(x.Sign) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"signature\":"
out.RawString(prefix)
out.Base64Bytes(x.Sign)
}
}
out.RawByte('}')
}
@ -1266,17 +1378,37 @@ func (x *Checksum) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"type\":"
out.RawString(prefix[1:])
out.Int32(int32(x.Type))
if x.Type != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"type\":"
out.RawString(prefix)
v := int32(x.Type)
if vv, ok := ChecksumType_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
const prefix string = ",\"sum\":"
if len(x.Sum) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"sum\":"
out.RawString(prefix)
out.Base64Bytes(x.Sum)
}
}
out.RawByte('}')
}

View file

@ -12,6 +12,7 @@ import (
easyproto "github.com/VictoriaMetrics/easyproto"
jlexer "github.com/mailru/easyjson/jlexer"
jwriter "github.com/mailru/easyjson/jwriter"
strconv "strconv"
)
type CreateRequest_Body struct {
@ -117,16 +118,33 @@ func (x *CreateRequest_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"ownerId\":"
out.RawString(prefix[1:])
if x.OwnerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ownerId\":"
out.RawString(prefix)
x.OwnerId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"expiration\":"
if x.Expiration != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"expiration\":"
out.RawString(prefix)
out.Uint64(x.Expiration)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Expiration, 10)
out.RawByte('"')
}
}
out.RawByte('}')
}
@ -166,7 +184,15 @@ func (x *CreateRequest_Body) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "expiration":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Expiration = f
}
}
@ -325,22 +351,44 @@ func (x *CreateRequest) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -499,17 +547,32 @@ func (x *CreateResponse_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"id\":"
out.RawString(prefix[1:])
if len(x.Id) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"id\":"
out.RawString(prefix)
out.Base64Bytes(x.Id)
}
}
{
const prefix string = ",\"sessionKey\":"
if len(x.SessionKey) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"sessionKey\":"
out.RawString(prefix)
out.Base64Bytes(x.SessionKey)
}
}
out.RawByte('}')
}
@ -706,22 +769,44 @@ func (x *CreateResponse) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaHeader\":"
if x.MetaHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaHeader\":"
out.RawString(prefix)
x.MetaHeader.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"verifyHeader\":"
if x.VerifyHeader != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verifyHeader\":"
out.RawString(prefix)
x.VerifyHeader.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}

View file

@ -179,14 +179,28 @@ func (x *ObjectSessionContext_Target) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"container\":"
out.RawString(prefix[1:])
if x.Container != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"container\":"
out.RawString(prefix)
x.Container.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"objects\":"
if len(x.Objects) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"objects\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Objects {
@ -197,6 +211,7 @@ func (x *ObjectSessionContext_Target) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -358,17 +373,37 @@ func (x *ObjectSessionContext) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"verb\":"
out.RawString(prefix[1:])
out.Int32(int32(x.Verb))
if x.Verb != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verb\":"
out.RawString(prefix)
v := int32(x.Verb)
if vv, ok := ObjectSessionContext_Verb_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
const prefix string = ",\"target\":"
if x.Target != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"target\":"
out.RawString(prefix)
x.Target.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -596,22 +631,49 @@ func (x *ContainerSessionContext) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"verb\":"
out.RawString(prefix[1:])
out.Int32(int32(x.Verb))
if x.Verb != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"verb\":"
out.RawString(prefix)
v := int32(x.Verb)
if vv, ok := ContainerSessionContext_Verb_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
{
const prefix string = ",\"wildcard\":"
if x.Wildcard {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"wildcard\":"
out.RawString(prefix)
out.Bool(x.Wildcard)
}
}
{
const prefix string = ",\"containerID\":"
if x.ContainerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"containerID\":"
out.RawString(prefix)
x.ContainerId.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -804,21 +866,49 @@ func (x *SessionToken_Body_TokenLifetime) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"exp\":"
out.RawString(prefix[1:])
out.Uint64(x.Exp)
if x.Exp != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"exp\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Exp, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"nbf\":"
if x.Nbf != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"nbf\":"
out.RawString(prefix)
out.Uint64(x.Nbf)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Nbf, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"iat\":"
if x.Iat != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"iat\":"
out.RawString(prefix)
out.Uint64(x.Iat)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Iat, 10)
out.RawByte('"')
}
}
out.RawByte('}')
}
@ -851,19 +941,43 @@ func (x *SessionToken_Body_TokenLifetime) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "exp":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Exp = f
}
case "nbf":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Nbf = f
}
case "iat":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Iat = f
}
}
@ -1085,41 +1199,84 @@ func (x *SessionToken_Body) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"id\":"
out.RawString(prefix[1:])
if len(x.Id) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"id\":"
out.RawString(prefix)
out.Base64Bytes(x.Id)
}
}
{
const prefix string = ",\"ownerID\":"
if x.OwnerId != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ownerID\":"
out.RawString(prefix)
x.OwnerId.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"lifetime\":"
if x.Lifetime != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"lifetime\":"
out.RawString(prefix)
x.Lifetime.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"sessionKey\":"
if len(x.SessionKey) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"sessionKey\":"
out.RawString(prefix)
out.Base64Bytes(x.SessionKey)
}
}
switch xx := x.Context.(type) {
case *SessionToken_Body_Object:
{
const prefix string = ",\"object\":"
if xx.Object != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"object\":"
out.RawString(prefix)
xx.Object.MarshalEasyJSON(out)
}
}
case *SessionToken_Body_Container:
{
const prefix string = ",\"container\":"
if xx.Container != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"container\":"
out.RawString(prefix)
xx.Container.MarshalEasyJSON(out)
}
}
}
out.RawByte('}')
}
@ -1323,17 +1480,32 @@ func (x *SessionToken) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"body\":"
out.RawString(prefix[1:])
if x.Body != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"body\":"
out.RawString(prefix)
x.Body.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"signature\":"
if x.Signature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"signature\":"
out.RawString(prefix)
x.Signature.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -1485,17 +1657,32 @@ func (x *XHeader) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"key\":"
out.RawString(prefix[1:])
if len(x.Key) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"key\":"
out.RawString(prefix)
out.String(x.Key)
}
}
{
const prefix string = ",\"value\":"
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.String(x.Value)
}
}
out.RawByte('}')
}
@ -1783,24 +1970,54 @@ func (x *RequestMetaHeader) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"version\":"
out.RawString(prefix[1:])
if x.Version != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"version\":"
out.RawString(prefix)
x.Version.MarshalEasyJSON(out)
}
{
const prefix string = ",\"epoch\":"
out.RawString(prefix)
out.Uint64(x.Epoch)
}
{
const prefix string = ",\"ttl\":"
if x.Epoch != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"epoch\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Epoch, 10)
out.RawByte('"')
}
}
{
if x.Ttl != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ttl\":"
out.RawString(prefix)
out.Uint32(x.Ttl)
}
}
{
const prefix string = ",\"xHeaders\":"
if len(x.XHeaders) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"xHeaders\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.XHeaders {
@ -1811,25 +2028,56 @@ func (x *RequestMetaHeader) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"sessionToken\":"
if x.SessionToken != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"sessionToken\":"
out.RawString(prefix)
x.SessionToken.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"bearerToken\":"
if x.BearerToken != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"bearerToken\":"
out.RawString(prefix)
x.BearerToken.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"origin\":"
if x.Origin != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"origin\":"
out.RawString(prefix)
x.Origin.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"magicNumber\":"
if x.MagicNumber != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"magicNumber\":"
out.RawString(prefix)
out.Uint64(x.MagicNumber)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.MagicNumber, 10)
out.RawByte('"')
}
}
out.RawByte('}')
}
@ -1869,13 +2117,29 @@ func (x *RequestMetaHeader) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "epoch":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Epoch = f
}
case "ttl":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Ttl = f
}
case "xHeaders":
@ -1916,7 +2180,15 @@ func (x *RequestMetaHeader) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "magicNumber":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.MagicNumber = f
}
}
@ -2123,24 +2395,54 @@ func (x *ResponseMetaHeader) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"version\":"
out.RawString(prefix[1:])
if x.Version != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"version\":"
out.RawString(prefix)
x.Version.MarshalEasyJSON(out)
}
{
const prefix string = ",\"epoch\":"
out.RawString(prefix)
out.Uint64(x.Epoch)
}
{
const prefix string = ",\"ttl\":"
if x.Epoch != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"epoch\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.Epoch, 10)
out.RawByte('"')
}
}
{
if x.Ttl != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"ttl\":"
out.RawString(prefix)
out.Uint32(x.Ttl)
}
}
{
const prefix string = ",\"xHeaders\":"
if len(x.XHeaders) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"xHeaders\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.XHeaders {
@ -2151,16 +2453,31 @@ func (x *ResponseMetaHeader) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"origin\":"
if x.Origin != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"origin\":"
out.RawString(prefix)
x.Origin.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"status\":"
if x.Status != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"status\":"
out.RawString(prefix)
x.Status.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -2199,13 +2516,29 @@ func (x *ResponseMetaHeader) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "epoch":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.Epoch = f
}
case "ttl":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Ttl = f
}
case "xHeaders":
@ -2397,27 +2730,56 @@ func (x *RequestVerificationHeader) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"bodySignature\":"
out.RawString(prefix[1:])
if x.BodySignature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"bodySignature\":"
out.RawString(prefix)
x.BodySignature.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaSignature\":"
if x.MetaSignature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaSignature\":"
out.RawString(prefix)
x.MetaSignature.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"originSignature\":"
if x.OriginSignature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"originSignature\":"
out.RawString(prefix)
x.OriginSignature.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"origin\":"
if x.Origin != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"origin\":"
out.RawString(prefix)
x.Origin.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}
@ -2635,27 +2997,56 @@ func (x *ResponseVerificationHeader) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"bodySignature\":"
out.RawString(prefix[1:])
if x.BodySignature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"bodySignature\":"
out.RawString(prefix)
x.BodySignature.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"metaSignature\":"
if x.MetaSignature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"metaSignature\":"
out.RawString(prefix)
x.MetaSignature.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"originSignature\":"
if x.OriginSignature != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"originSignature\":"
out.RawString(prefix)
x.OriginSignature.MarshalEasyJSON(out)
}
}
{
const prefix string = ",\"origin\":"
if x.Origin != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"origin\":"
out.RawString(prefix)
x.Origin.MarshalEasyJSON(out)
}
}
out.RawByte('}')
}

View file

@ -368,17 +368,32 @@ func (x *Status_Detail) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"id\":"
out.RawString(prefix[1:])
if x.Id != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"id\":"
out.RawString(prefix)
out.Uint32(x.Id)
}
}
{
const prefix string = ",\"value\":"
if len(x.Value) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"value\":"
out.RawString(prefix)
out.Base64Bytes(x.Value)
}
}
out.RawByte('}')
}
@ -410,7 +425,15 @@ func (x *Status_Detail) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "id":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Id = f
}
case "value":
@ -554,19 +577,40 @@ func (x *Status) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"code\":"
out.RawString(prefix[1:])
if x.Code != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"code\":"
out.RawString(prefix)
out.Uint32(x.Code)
}
}
{
const prefix string = ",\"message\":"
if len(x.Message) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"message\":"
out.RawString(prefix)
out.String(x.Message)
}
}
{
const prefix string = ",\"details\":"
if len(x.Details) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"details\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Details {
@ -577,6 +621,7 @@ func (x *Status) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -608,7 +653,15 @@ func (x *Status) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "code":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.Code = f
}
case "message":

View file

@ -12,6 +12,7 @@ import (
easyproto "github.com/VictoriaMetrics/easyproto"
jlexer "github.com/mailru/easyjson/jlexer"
jwriter "github.com/mailru/easyjson/jwriter"
strconv "strconv"
)
type Tombstone struct {
@ -140,19 +141,42 @@ func (x *Tombstone) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"expirationEpoch\":"
out.RawString(prefix[1:])
out.Uint64(x.ExpirationEpoch)
if x.ExpirationEpoch != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"expirationEpoch\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.ExpirationEpoch, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"splitID\":"
if len(x.SplitId) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"splitID\":"
out.RawString(prefix)
out.Base64Bytes(x.SplitId)
}
}
{
const prefix string = ",\"members\":"
if len(x.Members) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"members\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.Members {
@ -163,6 +187,7 @@ func (x *Tombstone) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -194,7 +219,15 @@ func (x *Tombstone) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "expirationEpoch":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.ExpirationEpoch = f
}
case "splitID":

View file

@ -76,6 +76,12 @@ func TestStableMarshalSingle(t *testing.T) {
var actual test.Primitives
require.NoError(t, protojson.Unmarshal(r, &actual))
t.Run("protojson compatibility", func(t *testing.T) {
data, err := protojson.Marshal(&actual)
require.NoError(t, err)
require.JSONEq(t, string(data), string(r))
})
var actualFrostfs generated.Primitives
require.NoError(t, actualFrostfs.UnmarshalJSON(r))
require.Equal(t, tc.input, &actualFrostfs)

View file

@ -130,12 +130,20 @@ func (x *Primitives_Aux) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"innerField\":"
out.RawString(prefix[1:])
if x.InnerField != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"innerField\":"
out.RawString(prefix)
out.Uint32(x.InnerField)
}
}
out.RawByte('}')
}
@ -167,7 +175,15 @@ func (x *Primitives_Aux) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "innerField":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.InnerField = f
}
}
@ -560,82 +576,192 @@ func (x *Primitives) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"fieldA\":"
out.RawString(prefix[1:])
if len(x.FieldA) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldA\":"
out.RawString(prefix)
out.Base64Bytes(x.FieldA)
}
}
{
const prefix string = ",\"fieldB\":"
if len(x.FieldB) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldB\":"
out.RawString(prefix)
out.String(x.FieldB)
}
}
{
const prefix string = ",\"fieldC\":"
if x.FieldC {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldC\":"
out.RawString(prefix)
out.Bool(x.FieldC)
}
}
{
const prefix string = ",\"fieldD\":"
if x.FieldD != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldD\":"
out.RawString(prefix)
out.Int32(x.FieldD)
}
}
{
const prefix string = ",\"fieldE\":"
if x.FieldE != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldE\":"
out.RawString(prefix)
out.Uint32(x.FieldE)
}
{
const prefix string = ",\"fieldF\":"
out.RawString(prefix)
out.Int64(x.FieldF)
}
{
const prefix string = ",\"fieldG\":"
if x.FieldF != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldF\":"
out.RawString(prefix)
out.Uint64(x.FieldG)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendInt(out.Buffer.Buf, x.FieldF, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"fieldI\":"
if x.FieldG != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldG\":"
out.RawString(prefix)
out.Uint64(x.FieldI)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.FieldG, 10)
out.RawByte('"')
}
}
{
const prefix string = ",\"fieldJ\":"
if x.FieldI != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldI\":"
out.RawString(prefix)
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.FieldI, 10)
out.RawByte('"')
}
}
{
if x.FieldJ != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldJ\":"
out.RawString(prefix)
out.Float64(x.FieldJ)
}
}
{
const prefix string = ",\"fieldK\":"
if x.FieldK != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldK\":"
out.RawString(prefix)
out.Uint32(x.FieldK)
}
}
{
const prefix string = ",\"fieldH\":"
if x.FieldH != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldH\":"
out.RawString(prefix)
out.Int32(int32(x.FieldH))
v := int32(x.FieldH)
if vv, ok := Primitives_SomeEnum_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}
}
}
switch xx := x.FieldM.(type) {
case *Primitives_FieldMa:
{
const prefix string = ",\"fieldMa\":"
if len(xx.FieldMa) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldMa\":"
out.RawString(prefix)
out.Base64Bytes(xx.FieldMa)
}
}
case *Primitives_FieldMe:
{
const prefix string = ",\"fieldMe\":"
if xx.FieldMe != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldMe\":"
out.RawString(prefix)
out.Uint32(xx.FieldMe)
}
}
case *Primitives_FieldAux:
{
const prefix string = ",\"fieldAux\":"
if xx.FieldAux != nil {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldAux\":"
out.RawString(prefix)
xx.FieldAux.MarshalEasyJSON(out)
}
}
}
out.RawByte('}')
}
@ -685,31 +811,71 @@ func (x *Primitives) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "fieldD":
{
var f int32
f = in.Int32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseInt(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := int32(v)
f = pv
x.FieldD = f
}
case "fieldE":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.FieldE = f
}
case "fieldF":
{
var f int64
f = in.Int64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseInt(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := int64(v)
f = pv
x.FieldF = f
}
case "fieldG":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.FieldG = f
}
case "fieldI":
{
var f uint64
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
x.FieldI = f
}
case "fieldJ":
@ -721,7 +887,15 @@ func (x *Primitives) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "fieldK":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.FieldK = f
}
case "fieldH":
@ -759,7 +933,15 @@ func (x *Primitives) UnmarshalEasyJSON(in *jlexer.Lexer) {
x.FieldM = xx
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
xx.FieldMe = f
}
case "fieldAux":
@ -882,12 +1064,20 @@ func (x *RepPrimitives_Aux) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"innerField\":"
out.RawString(prefix[1:])
if x.InnerField != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"innerField\":"
out.RawString(prefix)
out.Uint32(x.InnerField)
}
}
out.RawByte('}')
}
@ -919,7 +1109,15 @@ func (x *RepPrimitives_Aux) UnmarshalEasyJSON(in *jlexer.Lexer) {
case "innerField":
{
var f uint32
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
x.InnerField = f
}
}
@ -1164,10 +1362,17 @@ func (x *RepPrimitives) MarshalEasyJSON(out *jwriter.Writer) {
out.RawString("null")
return
}
first := true
out.RawByte('{')
{
const prefix string = ",\"fieldA\":"
out.RawString(prefix[1:])
if len(x.FieldA) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldA\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.FieldA {
if i != 0 {
@ -1177,8 +1382,15 @@ func (x *RepPrimitives) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"fieldB\":"
if len(x.FieldB) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldB\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.FieldB {
@ -1189,8 +1401,15 @@ func (x *RepPrimitives) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"fieldC\":"
if len(x.FieldC) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldC\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.FieldC {
@ -1201,8 +1420,15 @@ func (x *RepPrimitives) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"fieldD\":"
if len(x.FieldD) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldD\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.FieldD {
@ -1213,44 +1439,78 @@ func (x *RepPrimitives) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
{
const prefix string = ",\"fieldE\":"
if len(x.FieldE) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldE\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.FieldE {
if i != 0 {
out.RawByte(',')
}
out.Int64(x.FieldE[i])
out.RawByte('"')
out.Buffer.Buf = strconv.AppendInt(out.Buffer.Buf, x.FieldE[i], 10)
out.RawByte('"')
}
out.RawByte(']')
}
}
{
const prefix string = ",\"fieldF\":"
if len(x.FieldF) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldF\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.FieldF {
if i != 0 {
out.RawByte(',')
}
out.Uint64(x.FieldF[i])
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.FieldF[i], 10)
out.RawByte('"')
}
out.RawByte(']')
}
}
{
const prefix string = ",\"fieldFu\":"
if len(x.FieldFu) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldFu\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.FieldFu {
if i != 0 {
out.RawByte(',')
}
out.Uint64(x.FieldFu[i])
out.RawByte('"')
out.Buffer.Buf = strconv.AppendUint(out.Buffer.Buf, x.FieldFu[i], 10)
out.RawByte('"')
}
out.RawByte(']')
}
}
{
const prefix string = ",\"fieldAux\":"
if len(x.FieldAux) != 0 {
if !first {
out.RawByte(',')
} else {
first = false
}
const prefix string = "\"fieldAux\":"
out.RawString(prefix)
out.RawByte('[')
for i := range x.FieldAux {
@ -1261,6 +1521,7 @@ func (x *RepPrimitives) MarshalEasyJSON(out *jwriter.Writer) {
}
out.RawByte(']')
}
}
out.RawByte('}')
}
@ -1321,7 +1582,15 @@ func (x *RepPrimitives) UnmarshalEasyJSON(in *jlexer.Lexer) {
var list []int32
in.Delim('[')
for !in.IsDelim(']') {
f = in.Int32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseInt(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := int32(v)
f = pv
list = append(list, f)
in.WantComma()
}
@ -1334,7 +1603,15 @@ func (x *RepPrimitives) UnmarshalEasyJSON(in *jlexer.Lexer) {
var list []uint32
in.Delim('[')
for !in.IsDelim(']') {
f = in.Uint32()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 32)
if err != nil {
in.AddError(err)
return
}
pv := uint32(v)
f = pv
list = append(list, f)
in.WantComma()
}
@ -1347,7 +1624,15 @@ func (x *RepPrimitives) UnmarshalEasyJSON(in *jlexer.Lexer) {
var list []int64
in.Delim('[')
for !in.IsDelim(']') {
f = in.Int64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseInt(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := int64(v)
f = pv
list = append(list, f)
in.WantComma()
}
@ -1360,7 +1645,15 @@ func (x *RepPrimitives) UnmarshalEasyJSON(in *jlexer.Lexer) {
var list []uint64
in.Delim('[')
for !in.IsDelim(']') {
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
list = append(list, f)
in.WantComma()
}
@ -1373,7 +1666,15 @@ func (x *RepPrimitives) UnmarshalEasyJSON(in *jlexer.Lexer) {
var list []uint64
in.Delim('[')
for !in.IsDelim(']') {
f = in.Uint64()
r := in.JsonNumber()
n := r.String()
v, err := strconv.ParseUint(n, 10, 64)
if err != nil {
in.AddError(err)
return
}
pv := uint64(v)
f = pv
list = append(list, f)
in.WantComma()
}

View file

@ -59,6 +59,17 @@ func emitJSONUnmarshal(g *protogen.GeneratedFile, msg *protogen.Message) {
g.P("}")
}
func emitJSONParseInteger(g *protogen.GeneratedFile, ident string, method string, bitSize int, typ string) {
g.P("r := in.JsonNumber()")
g.P("n := r.String()")
g.P("v, err := ", strconvPackage.Ident(method), "(n, 10, ", bitSize, ")")
g.P("if err != nil {")
g.P(" in.AddError(err)")
g.P(" return")
g.P("}")
g.P(ident, " := ", typ, "(v)")
}
func emitJSONFieldRead(g *protogen.GeneratedFile, f *protogen.Field, name string) {
g.P("{")
defer g.P("}")
@ -100,13 +111,17 @@ func emitJSONFieldRead(g *protogen.GeneratedFile, f *protogen.Field, name string
}`)
template = "%s = parsedValue"
case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind:
template = "%s = in.Int32()"
emitJSONParseInteger(g, "pv", "ParseInt", 32, "int32")
template = "%s = pv"
case protoreflect.Uint32Kind, protoreflect.Fixed32Kind:
template = "%s = in.Uint32()"
emitJSONParseInteger(g, "pv", "ParseUint", 32, "uint32")
template = "%s = pv"
case protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
template = "%s = in.Int64()"
emitJSONParseInteger(g, "pv", "ParseInt", 64, "int64")
template = "%s = pv"
case protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
template = "%s = in.Uint64()"
emitJSONParseInteger(g, "pv", "ParseUint", 64, "uint64")
template = "%s = pv"
case protoreflect.FloatKind:
template = "%s = in.Float32()"
case protoreflect.DoubleKind:
@ -147,8 +162,11 @@ func emitJSONMarshal(g *protogen.GeneratedFile, msg *protogen.Message) {
g.P("func (x *", msg.GoIdent.GoName, ") MarshalEasyJSON(out *", jwriterPackage.Ident("Writer"), ") {")
g.P(`if x == nil { out.RawString("null"); return }`)
if len(msg.Fields) != 0 {
g.P("first := true")
}
g.P("out.RawByte('{')")
for i, f := range msg.Fields {
for _, f := range msg.Fields {
if f.Oneof != nil {
if f.Oneof.Fields[0] != f {
continue
@ -157,29 +175,35 @@ func emitJSONMarshal(g *protogen.GeneratedFile, msg *protogen.Message) {
g.P("switch xx := x.", f.Oneof.GoName, ".(type) {")
for _, ff := range f.Oneof.Fields {
g.P("case *", ff.GoIdent, ":")
emitJSONFieldWrite(g, ff, "xx", i == 0)
emitJSONFieldWrite(g, ff, "xx")
}
g.P("}")
continue
}
emitJSONFieldWrite(g, f, "x", i == 0)
emitJSONFieldWrite(g, f, "x")
}
g.P("out.RawByte('}')")
g.P("}")
}
func emitJSONFieldWrite(g *protogen.GeneratedFile, f *protogen.Field, name string, first bool) {
func emitJSONFieldWrite(g *protogen.GeneratedFile, f *protogen.Field, name string) {
g.P("{")
defer g.P("}")
g.P("const prefix string = ", `",\"`, fieldJSONName(f), `\":"`)
if first {
g.P("out.RawString(prefix[1:])")
} else {
g.P("out.RawString(prefix)")
}
selector := name + "." + f.GoName
isNotDefault := notNil
if f.Desc.IsList() {
isNotDefault = notEmpty
} else if f.Desc.Kind() != protoreflect.MessageKind {
_, isNotDefault = easyprotoKindInfo(f.Desc.Kind())
}
g.P("if ", isNotDefault(selector), "{")
defer g.P("}")
g.P("if !first { out.RawByte(','); } else { first = false; }")
g.P("const prefix string = ", `"\"`, fieldJSONName(f), `\":"`)
g.P("out.RawString(prefix)")
if f.Desc.IsList() {
selector += "[i]"
g.P("out.RawByte('[')")
@ -195,15 +219,27 @@ func emitJSONFieldWrite(g *protogen.GeneratedFile, f *protogen.Field, name strin
case protoreflect.BoolKind:
template = "out.Bool(%s)"
case protoreflect.EnumKind:
template = "out.Int32(int32(%s))"
enumType := fieldType(g, f).String()
template = `v := int32(%s)
if vv, ok := ` + enumType + `_name[v]; ok {
out.String(vv)
} else {
out.Int32(v)
}`
case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind:
template = "out.Int32(%s)"
case protoreflect.Uint32Kind, protoreflect.Fixed32Kind:
template = "out.Uint32(%s)"
case protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
template = "out.Int64(%s)"
g.P("out.RawByte('\"')")
g.P("out.Buffer.Buf = ", strconvPackage.Ident("AppendInt"), "(out.Buffer.Buf, ", selector, ", 10)")
g.P("out.RawByte('\"')")
return
case protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
template = "out.Uint64(%s)"
g.P("out.RawByte('\"')")
g.P("out.Buffer.Buf = ", strconvPackage.Ident("AppendUint"), "(out.Buffer.Buf, ", selector, ", 10)")
g.P("out.RawByte('\"')")
return
case protoreflect.FloatKind:
template = "out.Float32(%s)"
case protoreflect.DoubleKind: