diff --git a/go/cmd/vtctldclient/command/vschemas.go b/go/cmd/vtctldclient/command/vschemas.go index 112461f7cb2..20b673b6862 100644 --- a/go/cmd/vtctldclient/command/vschemas.go +++ b/go/cmd/vtctldclient/command/vschemas.go @@ -118,7 +118,7 @@ func commandApplyVSchema(cmd *cobra.Command, args []string) error { return err } fmt.Printf("New VSchema object:\n%s\nIf this is not what you expected, check the input data (as JSON parsing will skip unexpected fields).\n", vsData) - for vdxName, ups := range res.VindexUnknownParams { + for vdxName, ups := range res.UnknownVindexParams { for _, param := range ups.Params { fmt.Printf("Unknown param in vindex %s: %s\n", vdxName, param) } diff --git a/go/vt/proto/vtctldata/vtctldata.pb.go b/go/vt/proto/vtctldata/vtctldata.pb.go index efc63fbc5a1..a0fc62a0884 100644 --- a/go/vt/proto/vtctldata/vtctldata.pb.go +++ b/go/vt/proto/vtctldata/vtctldata.pb.go @@ -2002,7 +2002,7 @@ type ApplyVSchemaResponse struct { unknownFields protoimpl.UnknownFields VSchema *vschema.Keyspace `protobuf:"bytes,1,opt,name=v_schema,json=vSchema,proto3" json:"v_schema,omitempty"` - VindexUnknownParams map[string]*ApplyVSchemaResponse_ParamList `protobuf:"bytes,2,rep,name=vindex_unknown_params,json=vindexUnknownParams,proto3" json:"vindex_unknown_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + UnknownVindexParams map[string]*ApplyVSchemaResponse_ParamList `protobuf:"bytes,2,rep,name=unknown_vindex_params,json=unknownVindexParams,proto3" json:"unknown_vindex_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *ApplyVSchemaResponse) Reset() { @@ -2044,9 +2044,9 @@ func (x *ApplyVSchemaResponse) GetVSchema() *vschema.Keyspace { return nil } -func (x *ApplyVSchemaResponse) GetVindexUnknownParams() map[string]*ApplyVSchemaResponse_ParamList { +func (x *ApplyVSchemaResponse) GetUnknownVindexParams() map[string]*ApplyVSchemaResponse_ParamList { if x != nil { - return x.VindexUnknownParams + return x.UnknownVindexParams } return nil } @@ -15970,15 +15970,15 @@ var file_vtctldata_proto_rawDesc = []byte{ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x08, 0x76, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x76, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x07, 0x76, 0x53, - 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x6c, 0x0a, 0x15, 0x76, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, - 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, + 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x6c, 0x0a, 0x15, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, + 0x5f, 0x76, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x56, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x55, 0x6e, 0x6b, 0x6e, - 0x6f, 0x77, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, - 0x76, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x50, 0x61, 0x72, - 0x61, 0x6d, 0x73, 0x1a, 0x71, 0x0a, 0x18, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x55, 0x6e, 0x6b, - 0x6e, 0x6f, 0x77, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x56, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, + 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x56, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x50, 0x61, 0x72, + 0x61, 0x6d, 0x73, 0x1a, 0x71, 0x0a, 0x18, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x56, 0x69, + 0x6e, 0x64, 0x65, 0x78, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x3f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x74, 0x63, 0x74, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x70, 0x70, @@ -18020,7 +18020,7 @@ var file_vtctldata_proto_goTypes = []interface{}{ (*Workflow_Stream_Log)(nil), // 241: vtctldata.Workflow.Stream.Log (*Workflow_Stream_ThrottlerStatus)(nil), // 242: vtctldata.Workflow.Stream.ThrottlerStatus nil, // 243: vtctldata.ApplySchemaResponse.RowsAffectedByShardEntry - nil, // 244: vtctldata.ApplyVSchemaResponse.VindexUnknownParamsEntry + nil, // 244: vtctldata.ApplyVSchemaResponse.UnknownVindexParamsEntry (*ApplyVSchemaResponse_ParamList)(nil), // 245: vtctldata.ApplyVSchemaResponse.ParamList nil, // 246: vtctldata.CancelSchemaMigrationResponse.RowsAffectedByShardEntry nil, // 247: vtctldata.CleanupSchemaMigrationResponse.RowsAffectedByShardEntry @@ -18117,7 +18117,7 @@ var file_vtctldata_proto_depIdxs = []int32{ 243, // 29: vtctldata.ApplySchemaResponse.rows_affected_by_shard:type_name -> vtctldata.ApplySchemaResponse.RowsAffectedByShardEntry 284, // 30: vtctldata.ApplyVSchemaRequest.v_schema:type_name -> vschema.Keyspace 284, // 31: vtctldata.ApplyVSchemaResponse.v_schema:type_name -> vschema.Keyspace - 244, // 32: vtctldata.ApplyVSchemaResponse.vindex_unknown_params:type_name -> vtctldata.ApplyVSchemaResponse.VindexUnknownParamsEntry + 244, // 32: vtctldata.ApplyVSchemaResponse.unknown_vindex_params:type_name -> vtctldata.ApplyVSchemaResponse.UnknownVindexParamsEntry 277, // 33: vtctldata.BackupRequest.tablet_alias:type_name -> topodata.TabletAlias 277, // 34: vtctldata.BackupResponse.tablet_alias:type_name -> topodata.TabletAlias 273, // 35: vtctldata.BackupResponse.event:type_name -> logutil.Event @@ -18274,7 +18274,7 @@ var file_vtctldata_proto_depIdxs = []int32{ 276, // 186: vtctldata.Workflow.Stream.Log.created_at:type_name -> vttime.Time 276, // 187: vtctldata.Workflow.Stream.Log.updated_at:type_name -> vttime.Time 276, // 188: vtctldata.Workflow.Stream.ThrottlerStatus.time_throttled:type_name -> vttime.Time - 245, // 189: vtctldata.ApplyVSchemaResponse.VindexUnknownParamsEntry.value:type_name -> vtctldata.ApplyVSchemaResponse.ParamList + 245, // 189: vtctldata.ApplyVSchemaResponse.UnknownVindexParamsEntry.value:type_name -> vtctldata.ApplyVSchemaResponse.ParamList 10, // 190: vtctldata.FindAllShardsInKeyspaceResponse.ShardsEntry.value:type_name -> vtctldata.Shard 300, // 191: vtctldata.GetCellsAliasesResponse.AliasesEntry.value:type_name -> topodata.CellsAlias 252, // 192: vtctldata.GetSrvKeyspaceNamesResponse.NamesEntry.value:type_name -> vtctldata.GetSrvKeyspaceNamesResponse.NameList diff --git a/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go b/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go index c889b287d53..536876d3bab 100644 --- a/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go +++ b/go/vt/proto/vtctldata/vtctldata_vtproto.pb.go @@ -715,12 +715,12 @@ func (m *ApplyVSchemaResponse) CloneVT() *ApplyVSchemaResponse { r := &ApplyVSchemaResponse{ VSchema: m.VSchema.CloneVT(), } - if rhs := m.VindexUnknownParams; rhs != nil { + if rhs := m.UnknownVindexParams; rhs != nil { tmpContainer := make(map[string]*ApplyVSchemaResponse_ParamList, len(rhs)) for k, v := range rhs { tmpContainer[k] = v.CloneVT() } - r.VindexUnknownParams = tmpContainer + r.UnknownVindexParams = tmpContainer } if len(m.unknownFields) > 0 { r.unknownFields = make([]byte, len(m.unknownFields)) @@ -7538,9 +7538,9 @@ func (m *ApplyVSchemaResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) i -= len(m.unknownFields) copy(dAtA[i:], m.unknownFields) } - if len(m.VindexUnknownParams) > 0 { - for k := range m.VindexUnknownParams { - v := m.VindexUnknownParams[k] + if len(m.UnknownVindexParams) > 0 { + for k := range m.UnknownVindexParams { + v := m.UnknownVindexParams[k] baseI := i size, err := v.MarshalToSizedBufferVT(dAtA[:i]) if err != nil { @@ -20334,8 +20334,8 @@ func (m *ApplyVSchemaResponse) SizeVT() (n int) { l = m.VSchema.SizeVT() n += 1 + l + sov(uint64(l)) } - if len(m.VindexUnknownParams) > 0 { - for k, v := range m.VindexUnknownParams { + if len(m.UnknownVindexParams) > 0 { + for k, v := range m.UnknownVindexParams { _ = k _ = v l = 0 @@ -30785,7 +30785,7 @@ func (m *ApplyVSchemaResponse) UnmarshalVT(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VindexUnknownParams", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field UnknownVindexParams", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -30812,8 +30812,8 @@ func (m *ApplyVSchemaResponse) UnmarshalVT(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.VindexUnknownParams == nil { - m.VindexUnknownParams = make(map[string]*ApplyVSchemaResponse_ParamList) + if m.UnknownVindexParams == nil { + m.UnknownVindexParams = make(map[string]*ApplyVSchemaResponse_ParamList) } var mapkey string var mapvalue *ApplyVSchemaResponse_ParamList @@ -30910,7 +30910,7 @@ func (m *ApplyVSchemaResponse) UnmarshalVT(dAtA []byte) error { iNdEx += skippy } } - m.VindexUnknownParams[mapkey] = mapvalue + m.UnknownVindexParams[mapkey] = mapvalue iNdEx = postIndex default: iNdEx = preIndex diff --git a/go/vt/vtctl/grpcvtctldserver/server.go b/go/vt/vtctl/grpcvtctldserver/server.go index 722e09955f2..ebfaae178b1 100644 --- a/go/vt/vtctl/grpcvtctldserver/server.go +++ b/go/vt/vtctl/grpcvtctldserver/server.go @@ -371,7 +371,7 @@ func (s *VtctldServer) ApplyVSchema(ctx context.Context, req *vtctldatapb.ApplyV } // Attach unknown Vindex params to the response. - vindexUnknownParams := make(map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList) + unknownVindexParams := make(map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList) var vdxNames []string for name := range ksVs.Vindexes { vdxNames = append(vdxNames, name) @@ -384,14 +384,14 @@ func (s *VtctldServer) ApplyVSchema(ctx context.Context, req *vtctldatapb.ApplyV if len(ups) == 0 { continue } - vindexUnknownParams[name] = &vtctldatapb.ApplyVSchemaResponse_ParamList{Params: ups} + unknownVindexParams[name] = &vtctldatapb.ApplyVSchemaResponse_ParamList{Params: ups} } } if req.DryRun { // we return what was passed in and parsed, rather than current return &vtctldatapb.ApplyVSchemaResponse{ VSchema: vs, - VindexUnknownParams: vindexUnknownParams, + UnknownVindexParams: unknownVindexParams, }, nil } @@ -413,7 +413,7 @@ func (s *VtctldServer) ApplyVSchema(ctx context.Context, req *vtctldatapb.ApplyV } return &vtctldatapb.ApplyVSchemaResponse{ VSchema: updatedVS, - VindexUnknownParams: vindexUnknownParams, + UnknownVindexParams: unknownVindexParams, }, nil } diff --git a/go/vt/vtctl/grpcvtctldserver/server_test.go b/go/vt/vtctl/grpcvtctldserver/server_test.go index 5ed67985c1c..ad051223ea1 100644 --- a/go/vt/vtctl/grpcvtctldserver/server_test.go +++ b/go/vt/vtctl/grpcvtctldserver/server_test.go @@ -428,7 +428,7 @@ func TestApplyVSchema(t *testing.T) { }, }, }, - VindexUnknownParams: map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList{ + UnknownVindexParams: map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList{ "lookup1": { Params: []string{"goodbye", "hello"}, }, @@ -499,7 +499,7 @@ func TestApplyVSchema(t *testing.T) { }, }, }, - VindexUnknownParams: map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList{ + UnknownVindexParams: map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList{ "lookup1": { Params: []string{"goodbye", "hello"}, }, diff --git a/proto/vtctldata.proto b/proto/vtctldata.proto index eb1357b1273..44db621ae70 100644 --- a/proto/vtctldata.proto +++ b/proto/vtctldata.proto @@ -374,7 +374,7 @@ message ApplyVSchemaRequest { message ApplyVSchemaResponse { vschema.Keyspace v_schema = 1; - map vindex_unknown_params = 2; + map unknown_vindex_params = 2; message ParamList { repeated string params = 1; diff --git a/web/vtadmin/src/proto/vtadmin.d.ts b/web/vtadmin/src/proto/vtadmin.d.ts index 12fba4319c8..1b94f14dd91 100644 --- a/web/vtadmin/src/proto/vtadmin.d.ts +++ b/web/vtadmin/src/proto/vtadmin.d.ts @@ -45286,8 +45286,8 @@ export namespace vtctldata { /** ApplyVSchemaResponse v_schema */ v_schema?: (vschema.IKeyspace|null); - /** ApplyVSchemaResponse vindex_unknown_params */ - vindex_unknown_params?: ({ [k: string]: vtctldata.ApplyVSchemaResponse.IParamList }|null); + /** ApplyVSchemaResponse unknown_vindex_params */ + unknown_vindex_params?: ({ [k: string]: vtctldata.ApplyVSchemaResponse.IParamList }|null); } /** Represents an ApplyVSchemaResponse. */ @@ -45302,8 +45302,8 @@ export namespace vtctldata { /** ApplyVSchemaResponse v_schema. */ public v_schema?: (vschema.IKeyspace|null); - /** ApplyVSchemaResponse vindex_unknown_params. */ - public vindex_unknown_params: { [k: string]: vtctldata.ApplyVSchemaResponse.IParamList }; + /** ApplyVSchemaResponse unknown_vindex_params. */ + public unknown_vindex_params: { [k: string]: vtctldata.ApplyVSchemaResponse.IParamList }; /** * Creates a new ApplyVSchemaResponse instance using the specified properties. diff --git a/web/vtadmin/src/proto/vtadmin.js b/web/vtadmin/src/proto/vtadmin.js index 8755af8cb7a..2ff4b5feb8d 100644 --- a/web/vtadmin/src/proto/vtadmin.js +++ b/web/vtadmin/src/proto/vtadmin.js @@ -111635,7 +111635,7 @@ export const vtctldata = $root.vtctldata = (() => { * @memberof vtctldata * @interface IApplyVSchemaResponse * @property {vschema.IKeyspace|null} [v_schema] ApplyVSchemaResponse v_schema - * @property {Object.|null} [vindex_unknown_params] ApplyVSchemaResponse vindex_unknown_params + * @property {Object.|null} [unknown_vindex_params] ApplyVSchemaResponse unknown_vindex_params */ /** @@ -111647,7 +111647,7 @@ export const vtctldata = $root.vtctldata = (() => { * @param {vtctldata.IApplyVSchemaResponse=} [properties] Properties to set */ function ApplyVSchemaResponse(properties) { - this.vindex_unknown_params = {}; + this.unknown_vindex_params = {}; if (properties) for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -111663,12 +111663,12 @@ export const vtctldata = $root.vtctldata = (() => { ApplyVSchemaResponse.prototype.v_schema = null; /** - * ApplyVSchemaResponse vindex_unknown_params. - * @member {Object.} vindex_unknown_params + * ApplyVSchemaResponse unknown_vindex_params. + * @member {Object.} unknown_vindex_params * @memberof vtctldata.ApplyVSchemaResponse * @instance */ - ApplyVSchemaResponse.prototype.vindex_unknown_params = $util.emptyObject; + ApplyVSchemaResponse.prototype.unknown_vindex_params = $util.emptyObject; /** * Creates a new ApplyVSchemaResponse instance using the specified properties. @@ -111696,10 +111696,10 @@ export const vtctldata = $root.vtctldata = (() => { writer = $Writer.create(); if (message.v_schema != null && Object.hasOwnProperty.call(message, "v_schema")) $root.vschema.Keyspace.encode(message.v_schema, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.vindex_unknown_params != null && Object.hasOwnProperty.call(message, "vindex_unknown_params")) - for (let keys = Object.keys(message.vindex_unknown_params), i = 0; i < keys.length; ++i) { + if (message.unknown_vindex_params != null && Object.hasOwnProperty.call(message, "unknown_vindex_params")) + for (let keys = Object.keys(message.unknown_vindex_params), i = 0; i < keys.length; ++i) { writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]); - $root.vtctldata.ApplyVSchemaResponse.ParamList.encode(message.vindex_unknown_params[keys[i]], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim().ldelim(); + $root.vtctldata.ApplyVSchemaResponse.ParamList.encode(message.unknown_vindex_params[keys[i]], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim().ldelim(); } return writer; }; @@ -111740,8 +111740,8 @@ export const vtctldata = $root.vtctldata = (() => { break; } case 2: { - if (message.vindex_unknown_params === $util.emptyObject) - message.vindex_unknown_params = {}; + if (message.unknown_vindex_params === $util.emptyObject) + message.unknown_vindex_params = {}; let end2 = reader.uint32() + reader.pos; key = ""; value = null; @@ -111759,7 +111759,7 @@ export const vtctldata = $root.vtctldata = (() => { break; } } - message.vindex_unknown_params[key] = value; + message.unknown_vindex_params[key] = value; break; } default: @@ -111802,14 +111802,14 @@ export const vtctldata = $root.vtctldata = (() => { if (error) return "v_schema." + error; } - if (message.vindex_unknown_params != null && message.hasOwnProperty("vindex_unknown_params")) { - if (!$util.isObject(message.vindex_unknown_params)) - return "vindex_unknown_params: object expected"; - let key = Object.keys(message.vindex_unknown_params); + if (message.unknown_vindex_params != null && message.hasOwnProperty("unknown_vindex_params")) { + if (!$util.isObject(message.unknown_vindex_params)) + return "unknown_vindex_params: object expected"; + let key = Object.keys(message.unknown_vindex_params); for (let i = 0; i < key.length; ++i) { - let error = $root.vtctldata.ApplyVSchemaResponse.ParamList.verify(message.vindex_unknown_params[key[i]]); + let error = $root.vtctldata.ApplyVSchemaResponse.ParamList.verify(message.unknown_vindex_params[key[i]]); if (error) - return "vindex_unknown_params." + error; + return "unknown_vindex_params." + error; } } return null; @@ -111832,14 +111832,14 @@ export const vtctldata = $root.vtctldata = (() => { throw TypeError(".vtctldata.ApplyVSchemaResponse.v_schema: object expected"); message.v_schema = $root.vschema.Keyspace.fromObject(object.v_schema); } - if (object.vindex_unknown_params) { - if (typeof object.vindex_unknown_params !== "object") - throw TypeError(".vtctldata.ApplyVSchemaResponse.vindex_unknown_params: object expected"); - message.vindex_unknown_params = {}; - for (let keys = Object.keys(object.vindex_unknown_params), i = 0; i < keys.length; ++i) { - if (typeof object.vindex_unknown_params[keys[i]] !== "object") - throw TypeError(".vtctldata.ApplyVSchemaResponse.vindex_unknown_params: object expected"); - message.vindex_unknown_params[keys[i]] = $root.vtctldata.ApplyVSchemaResponse.ParamList.fromObject(object.vindex_unknown_params[keys[i]]); + if (object.unknown_vindex_params) { + if (typeof object.unknown_vindex_params !== "object") + throw TypeError(".vtctldata.ApplyVSchemaResponse.unknown_vindex_params: object expected"); + message.unknown_vindex_params = {}; + for (let keys = Object.keys(object.unknown_vindex_params), i = 0; i < keys.length; ++i) { + if (typeof object.unknown_vindex_params[keys[i]] !== "object") + throw TypeError(".vtctldata.ApplyVSchemaResponse.unknown_vindex_params: object expected"); + message.unknown_vindex_params[keys[i]] = $root.vtctldata.ApplyVSchemaResponse.ParamList.fromObject(object.unknown_vindex_params[keys[i]]); } } return message; @@ -111859,16 +111859,16 @@ export const vtctldata = $root.vtctldata = (() => { options = {}; let object = {}; if (options.objects || options.defaults) - object.vindex_unknown_params = {}; + object.unknown_vindex_params = {}; if (options.defaults) object.v_schema = null; if (message.v_schema != null && message.hasOwnProperty("v_schema")) object.v_schema = $root.vschema.Keyspace.toObject(message.v_schema, options); let keys2; - if (message.vindex_unknown_params && (keys2 = Object.keys(message.vindex_unknown_params)).length) { - object.vindex_unknown_params = {}; + if (message.unknown_vindex_params && (keys2 = Object.keys(message.unknown_vindex_params)).length) { + object.unknown_vindex_params = {}; for (let j = 0; j < keys2.length; ++j) - object.vindex_unknown_params[keys2[j]] = $root.vtctldata.ApplyVSchemaResponse.ParamList.toObject(message.vindex_unknown_params[keys2[j]], options); + object.unknown_vindex_params[keys2[j]] = $root.vtctldata.ApplyVSchemaResponse.ParamList.toObject(message.unknown_vindex_params[keys2[j]], options); } return object; };