diff --git a/web/vtadmin/src/proto/vtadmin.d.ts b/web/vtadmin/src/proto/vtadmin.d.ts index 85defc746ca..7122c9f221e 100644 --- a/web/vtadmin/src/proto/vtadmin.d.ts +++ b/web/vtadmin/src/proto/vtadmin.d.ts @@ -33002,13 +33002,8 @@ export namespace query { EXPRESSION = 31, HEXNUM = 4128, HEXVAL = 4129, -<<<<<<< HEAD - BITNUM = 4130 -======= BITNUM = 4130, - VECTOR = 2083, RAW = 2084 ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) } /** Properties of a Value. */ diff --git a/web/vtadmin/src/proto/vtadmin.js b/web/vtadmin/src/proto/vtadmin.js index 9ebdfeb6f25..be54a69c7c6 100644 --- a/web/vtadmin/src/proto/vtadmin.js +++ b/web/vtadmin/src/proto/vtadmin.js @@ -78153,11 +78153,7 @@ export const query = $root.query = (() => { * @property {number} HEXNUM=4128 HEXNUM value * @property {number} HEXVAL=4129 HEXVAL value * @property {number} BITNUM=4130 BITNUM value -<<<<<<< HEAD -======= - * @property {number} VECTOR=2083 VECTOR value * @property {number} RAW=2084 RAW value ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) */ query.Type = (function() { const valuesById = {}, values = Object.create(valuesById); @@ -78196,11 +78192,7 @@ export const query = $root.query = (() => { values[valuesById[4128] = "HEXNUM"] = 4128; values[valuesById[4129] = "HEXVAL"] = 4129; values[valuesById[4130] = "BITNUM"] = 4130; -<<<<<<< HEAD -======= - values[valuesById[2083] = "VECTOR"] = 2083; values[valuesById[2084] = "RAW"] = 2084; ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) return values; })(); @@ -78389,11 +78381,7 @@ export const query = $root.query = (() => { case 4128: case 4129: case 4130: -<<<<<<< HEAD -======= - case 2083: case 2084: ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) break; } if (message.value != null && message.hasOwnProperty("value")) @@ -78561,17 +78549,10 @@ export const query = $root.query = (() => { case 4130: message.type = 4130; break; -<<<<<<< HEAD -======= - case "VECTOR": - case 2083: - message.type = 2083; - break; case "RAW": case 2084: message.type = 2084; break; ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) } if (object.value != null) if (typeof object.value === "string") @@ -78844,11 +78825,7 @@ export const query = $root.query = (() => { case 4128: case 4129: case 4130: -<<<<<<< HEAD -======= - case 2083: case 2084: ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) break; } if (message.value != null && message.hasOwnProperty("value")) @@ -79025,17 +79002,10 @@ export const query = $root.query = (() => { case 4130: message.type = 4130; break; -<<<<<<< HEAD -======= - case "VECTOR": - case 2083: - message.type = 2083; - break; case "RAW": case 2084: message.type = 2084; break; ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) } if (object.value != null) if (typeof object.value === "string") @@ -80526,11 +80496,7 @@ export const query = $root.query = (() => { case 4128: case 4129: case 4130: -<<<<<<< HEAD -======= - case 2083: case 2084: ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) break; } if (message.table != null && message.hasOwnProperty("table")) @@ -80724,17 +80690,10 @@ export const query = $root.query = (() => { case 4130: message.type = 4130; break; -<<<<<<< HEAD -======= - case "VECTOR": - case 2083: - message.type = 2083; - break; case "RAW": case 2084: message.type = 2084; break; ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) } if (object.table != null) message.table = String(object.table); @@ -97117,28 +97076,25 @@ export const query = $root.query = (() => { return GetSchemaRequest; })(); -<<<<<<< HEAD -======= - query.UDFInfo = (function() { + query.GetSchemaResponse = (function() { /** - * Properties of a UDFInfo. + * Properties of a GetSchemaResponse. * @memberof query - * @interface IUDFInfo - * @property {string|null} [name] UDFInfo name - * @property {boolean|null} [aggregating] UDFInfo aggregating - * @property {query.Type|null} [return_type] UDFInfo return_type + * @interface IGetSchemaResponse + * @property {Object.|null} [table_definition] GetSchemaResponse table_definition */ /** - * Constructs a new UDFInfo. + * Constructs a new GetSchemaResponse. * @memberof query - * @classdesc Represents a UDFInfo. - * @implements IUDFInfo + * @classdesc Represents a GetSchemaResponse. + * @implements IGetSchemaResponse * @constructor - * @param {query.IUDFInfo=} [properties] Properties to set + * @param {query.IGetSchemaResponse=} [properties] Properties to set */ - function UDFInfo(properties) { + function GetSchemaResponse(properties) { + this.table_definition = {}; if (properties) for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -97146,103 +97102,95 @@ export const query = $root.query = (() => { } /** - * UDFInfo name. - * @member {string} name - * @memberof query.UDFInfo - * @instance - */ - UDFInfo.prototype.name = ""; - - /** - * UDFInfo aggregating. - * @member {boolean} aggregating - * @memberof query.UDFInfo - * @instance - */ - UDFInfo.prototype.aggregating = false; - - /** - * UDFInfo return_type. - * @member {query.Type} return_type - * @memberof query.UDFInfo + * GetSchemaResponse table_definition. + * @member {Object.} table_definition + * @memberof query.GetSchemaResponse * @instance */ - UDFInfo.prototype.return_type = 0; + GetSchemaResponse.prototype.table_definition = $util.emptyObject; /** - * Creates a new UDFInfo instance using the specified properties. + * Creates a new GetSchemaResponse instance using the specified properties. * @function create - * @memberof query.UDFInfo + * @memberof query.GetSchemaResponse * @static - * @param {query.IUDFInfo=} [properties] Properties to set - * @returns {query.UDFInfo} UDFInfo instance + * @param {query.IGetSchemaResponse=} [properties] Properties to set + * @returns {query.GetSchemaResponse} GetSchemaResponse instance */ - UDFInfo.create = function create(properties) { - return new UDFInfo(properties); + GetSchemaResponse.create = function create(properties) { + return new GetSchemaResponse(properties); }; /** - * Encodes the specified UDFInfo message. Does not implicitly {@link query.UDFInfo.verify|verify} messages. + * Encodes the specified GetSchemaResponse message. Does not implicitly {@link query.GetSchemaResponse.verify|verify} messages. * @function encode - * @memberof query.UDFInfo + * @memberof query.GetSchemaResponse * @static - * @param {query.IUDFInfo} message UDFInfo message or plain object to encode + * @param {query.IGetSchemaResponse} message GetSchemaResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - UDFInfo.encode = function encode(message, writer) { + GetSchemaResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && Object.hasOwnProperty.call(message, "name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.aggregating != null && Object.hasOwnProperty.call(message, "aggregating")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.aggregating); - if (message.return_type != null && Object.hasOwnProperty.call(message, "return_type")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.return_type); + if (message.table_definition != null && Object.hasOwnProperty.call(message, "table_definition")) + for (let keys = Object.keys(message.table_definition), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.table_definition[keys[i]]).ldelim(); return writer; }; /** - * Encodes the specified UDFInfo message, length delimited. Does not implicitly {@link query.UDFInfo.verify|verify} messages. + * Encodes the specified GetSchemaResponse message, length delimited. Does not implicitly {@link query.GetSchemaResponse.verify|verify} messages. * @function encodeDelimited - * @memberof query.UDFInfo + * @memberof query.GetSchemaResponse * @static - * @param {query.IUDFInfo} message UDFInfo message or plain object to encode + * @param {query.IGetSchemaResponse} message GetSchemaResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - UDFInfo.encodeDelimited = function encodeDelimited(message, writer) { + GetSchemaResponse.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a UDFInfo message from the specified reader or buffer. + * Decodes a GetSchemaResponse message from the specified reader or buffer. * @function decode - * @memberof query.UDFInfo + * @memberof query.GetSchemaResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {query.UDFInfo} UDFInfo + * @returns {query.GetSchemaResponse} GetSchemaResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UDFInfo.decode = function decode(reader, length) { + GetSchemaResponse.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - let end = length === undefined ? reader.len : reader.pos + length, message = new $root.query.UDFInfo(); + let end = length === undefined ? reader.len : reader.pos + length, message = new $root.query.GetSchemaResponse(), key, value; while (reader.pos < end) { let tag = reader.uint32(); switch (tag >>> 3) { - case 1: { - message.name = reader.string(); - break; - } case 2: { - message.aggregating = reader.bool(); - break; - } - case 3: { - message.return_type = reader.int32(); + if (message.table_definition === $util.emptyObject) + message.table_definition = {}; + let end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + let tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.table_definition[key] = value; break; } default: @@ -97254,489 +97202,53 @@ export const query = $root.query = (() => { }; /** - * Decodes a UDFInfo message from the specified reader or buffer, length delimited. + * Decodes a GetSchemaResponse message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof query.UDFInfo + * @memberof query.GetSchemaResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {query.UDFInfo} UDFInfo + * @returns {query.GetSchemaResponse} GetSchemaResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UDFInfo.decodeDelimited = function decodeDelimited(reader) { + GetSchemaResponse.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a UDFInfo message. + * Verifies a GetSchemaResponse message. * @function verify - * @memberof query.UDFInfo + * @memberof query.GetSchemaResponse * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - UDFInfo.verify = function verify(message) { + GetSchemaResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.aggregating != null && message.hasOwnProperty("aggregating")) - if (typeof message.aggregating !== "boolean") - return "aggregating: boolean expected"; - if (message.return_type != null && message.hasOwnProperty("return_type")) - switch (message.return_type) { - default: - return "return_type: enum value expected"; - case 0: - case 257: - case 770: - case 259: - case 772: - case 261: - case 774: - case 263: - case 776: - case 265: - case 778: - case 1035: - case 1036: - case 2061: - case 2062: - case 2063: - case 2064: - case 785: - case 18: - case 6163: - case 10260: - case 6165: - case 10262: - case 6167: - case 10264: - case 2073: - case 2074: - case 2075: - case 28: - case 2077: - case 2078: - case 31: - case 4128: - case 4129: - case 4130: - case 2083: - case 2084: - break; - } + if (message.table_definition != null && message.hasOwnProperty("table_definition")) { + if (!$util.isObject(message.table_definition)) + return "table_definition: object expected"; + let key = Object.keys(message.table_definition); + for (let i = 0; i < key.length; ++i) + if (!$util.isString(message.table_definition[key[i]])) + return "table_definition: string{k:string} expected"; + } return null; }; /** - * Creates a UDFInfo message from a plain object. Also converts values to their respective internal types. + * Creates a GetSchemaResponse message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof query.UDFInfo + * @memberof query.GetSchemaResponse * @static * @param {Object.} object Plain object - * @returns {query.UDFInfo} UDFInfo + * @returns {query.GetSchemaResponse} GetSchemaResponse */ - UDFInfo.fromObject = function fromObject(object) { - if (object instanceof $root.query.UDFInfo) - return object; - let message = new $root.query.UDFInfo(); - if (object.name != null) - message.name = String(object.name); - if (object.aggregating != null) - message.aggregating = Boolean(object.aggregating); - switch (object.return_type) { - default: - if (typeof object.return_type === "number") { - message.return_type = object.return_type; - break; - } - break; - case "NULL_TYPE": - case 0: - message.return_type = 0; - break; - case "INT8": - case 257: - message.return_type = 257; - break; - case "UINT8": - case 770: - message.return_type = 770; - break; - case "INT16": - case 259: - message.return_type = 259; - break; - case "UINT16": - case 772: - message.return_type = 772; - break; - case "INT24": - case 261: - message.return_type = 261; - break; - case "UINT24": - case 774: - message.return_type = 774; - break; - case "INT32": - case 263: - message.return_type = 263; - break; - case "UINT32": - case 776: - message.return_type = 776; - break; - case "INT64": - case 265: - message.return_type = 265; - break; - case "UINT64": - case 778: - message.return_type = 778; - break; - case "FLOAT32": - case 1035: - message.return_type = 1035; - break; - case "FLOAT64": - case 1036: - message.return_type = 1036; - break; - case "TIMESTAMP": - case 2061: - message.return_type = 2061; - break; - case "DATE": - case 2062: - message.return_type = 2062; - break; - case "TIME": - case 2063: - message.return_type = 2063; - break; - case "DATETIME": - case 2064: - message.return_type = 2064; - break; - case "YEAR": - case 785: - message.return_type = 785; - break; - case "DECIMAL": - case 18: - message.return_type = 18; - break; - case "TEXT": - case 6163: - message.return_type = 6163; - break; - case "BLOB": - case 10260: - message.return_type = 10260; - break; - case "VARCHAR": - case 6165: - message.return_type = 6165; - break; - case "VARBINARY": - case 10262: - message.return_type = 10262; - break; - case "CHAR": - case 6167: - message.return_type = 6167; - break; - case "BINARY": - case 10264: - message.return_type = 10264; - break; - case "BIT": - case 2073: - message.return_type = 2073; - break; - case "ENUM": - case 2074: - message.return_type = 2074; - break; - case "SET": - case 2075: - message.return_type = 2075; - break; - case "TUPLE": - case 28: - message.return_type = 28; - break; - case "GEOMETRY": - case 2077: - message.return_type = 2077; - break; - case "JSON": - case 2078: - message.return_type = 2078; - break; - case "EXPRESSION": - case 31: - message.return_type = 31; - break; - case "HEXNUM": - case 4128: - message.return_type = 4128; - break; - case "HEXVAL": - case 4129: - message.return_type = 4129; - break; - case "BITNUM": - case 4130: - message.return_type = 4130; - break; - case "VECTOR": - case 2083: - message.return_type = 2083; - break; - case "RAW": - case 2084: - message.return_type = 2084; - break; - } - return message; - }; - - /** - * Creates a plain object from a UDFInfo message. Also converts values to other types if specified. - * @function toObject - * @memberof query.UDFInfo - * @static - * @param {query.UDFInfo} message UDFInfo - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - UDFInfo.toObject = function toObject(message, options) { - if (!options) - options = {}; - let object = {}; - if (options.defaults) { - object.name = ""; - object.aggregating = false; - object.return_type = options.enums === String ? "NULL_TYPE" : 0; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.aggregating != null && message.hasOwnProperty("aggregating")) - object.aggregating = message.aggregating; - if (message.return_type != null && message.hasOwnProperty("return_type")) - object.return_type = options.enums === String ? $root.query.Type[message.return_type] === undefined ? message.return_type : $root.query.Type[message.return_type] : message.return_type; - return object; - }; - - /** - * Converts this UDFInfo to JSON. - * @function toJSON - * @memberof query.UDFInfo - * @instance - * @returns {Object.} JSON object - */ - UDFInfo.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for UDFInfo - * @function getTypeUrl - * @memberof query.UDFInfo - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - UDFInfo.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/query.UDFInfo"; - }; - - return UDFInfo; - })(); - ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) - query.GetSchemaResponse = (function() { - - /** - * Properties of a GetSchemaResponse. - * @memberof query - * @interface IGetSchemaResponse - * @property {Object.|null} [table_definition] GetSchemaResponse table_definition - */ - - /** - * Constructs a new GetSchemaResponse. - * @memberof query - * @classdesc Represents a GetSchemaResponse. - * @implements IGetSchemaResponse - * @constructor - * @param {query.IGetSchemaResponse=} [properties] Properties to set - */ - function GetSchemaResponse(properties) { - this.table_definition = {}; - if (properties) - for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * GetSchemaResponse table_definition. - * @member {Object.} table_definition - * @memberof query.GetSchemaResponse - * @instance - */ - GetSchemaResponse.prototype.table_definition = $util.emptyObject; - - /** - * Creates a new GetSchemaResponse instance using the specified properties. - * @function create - * @memberof query.GetSchemaResponse - * @static - * @param {query.IGetSchemaResponse=} [properties] Properties to set - * @returns {query.GetSchemaResponse} GetSchemaResponse instance - */ - GetSchemaResponse.create = function create(properties) { - return new GetSchemaResponse(properties); - }; - - /** - * Encodes the specified GetSchemaResponse message. Does not implicitly {@link query.GetSchemaResponse.verify|verify} messages. - * @function encode - * @memberof query.GetSchemaResponse - * @static - * @param {query.IGetSchemaResponse} message GetSchemaResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSchemaResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.table_definition != null && Object.hasOwnProperty.call(message, "table_definition")) - for (let keys = Object.keys(message.table_definition), i = 0; i < keys.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.table_definition[keys[i]]).ldelim(); - return writer; - }; - - /** - * Encodes the specified GetSchemaResponse message, length delimited. Does not implicitly {@link query.GetSchemaResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof query.GetSchemaResponse - * @static - * @param {query.IGetSchemaResponse} message GetSchemaResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSchemaResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a GetSchemaResponse message from the specified reader or buffer. - * @function decode - * @memberof query.GetSchemaResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {query.GetSchemaResponse} GetSchemaResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSchemaResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - let end = length === undefined ? reader.len : reader.pos + length, message = new $root.query.GetSchemaResponse(), key, value; - while (reader.pos < end) { - let tag = reader.uint32(); - switch (tag >>> 3) { - case 2: { - if (message.table_definition === $util.emptyObject) - message.table_definition = {}; - let end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - let tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; - } - } - message.table_definition[key] = value; - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a GetSchemaResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof query.GetSchemaResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {query.GetSchemaResponse} GetSchemaResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSchemaResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a GetSchemaResponse message. - * @function verify - * @memberof query.GetSchemaResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - GetSchemaResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.table_definition != null && message.hasOwnProperty("table_definition")) { - if (!$util.isObject(message.table_definition)) - return "table_definition: object expected"; - let key = Object.keys(message.table_definition); - for (let i = 0; i < key.length; ++i) - if (!$util.isString(message.table_definition[key[i]])) - return "table_definition: string{k:string} expected"; - } - return null; - }; - - /** - * Creates a GetSchemaResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof query.GetSchemaResponse - * @static - * @param {Object.} object Plain object - * @returns {query.GetSchemaResponse} GetSchemaResponse - */ - GetSchemaResponse.fromObject = function fromObject(object) { - if (object instanceof $root.query.GetSchemaResponse) + GetSchemaResponse.fromObject = function fromObject(object) { + if (object instanceof $root.query.GetSchemaResponse) return object; let message = new $root.query.GetSchemaResponse(); if (object.table_definition) { @@ -100574,27 +100086,27 @@ export const vschema = $root.vschema = (() => { return Keyspace; })(); -<<<<<<< HEAD -======= - vschema.MultiTenantSpec = (function() { + vschema.Vindex = (function() { /** - * Properties of a MultiTenantSpec. + * Properties of a Vindex. * @memberof vschema - * @interface IMultiTenantSpec - * @property {string|null} [tenant_id_column_name] MultiTenantSpec tenant_id_column_name - * @property {query.Type|null} [tenant_id_column_type] MultiTenantSpec tenant_id_column_type + * @interface IVindex + * @property {string|null} [type] Vindex type + * @property {Object.|null} [params] Vindex params + * @property {string|null} [owner] Vindex owner */ /** - * Constructs a new MultiTenantSpec. + * Constructs a new Vindex. * @memberof vschema - * @classdesc Represents a MultiTenantSpec. - * @implements IMultiTenantSpec + * @classdesc Represents a Vindex. + * @implements IVindex * @constructor - * @param {vschema.IMultiTenantSpec=} [properties] Properties to set + * @param {vschema.IVindex=} [properties] Properties to set */ - function MultiTenantSpec(properties) { + function Vindex(properties) { + this.params = {}; if (properties) for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -100602,475 +100114,51 @@ export const vschema = $root.vschema = (() => { } /** - * MultiTenantSpec tenant_id_column_name. - * @member {string} tenant_id_column_name - * @memberof vschema.MultiTenantSpec + * Vindex type. + * @member {string} type + * @memberof vschema.Vindex + * @instance + */ + Vindex.prototype.type = ""; + + /** + * Vindex params. + * @member {Object.} params + * @memberof vschema.Vindex * @instance */ - MultiTenantSpec.prototype.tenant_id_column_name = ""; + Vindex.prototype.params = $util.emptyObject; /** - * MultiTenantSpec tenant_id_column_type. - * @member {query.Type} tenant_id_column_type - * @memberof vschema.MultiTenantSpec + * Vindex owner. + * @member {string} owner + * @memberof vschema.Vindex * @instance */ - MultiTenantSpec.prototype.tenant_id_column_type = 0; + Vindex.prototype.owner = ""; /** - * Creates a new MultiTenantSpec instance using the specified properties. + * Creates a new Vindex instance using the specified properties. * @function create - * @memberof vschema.MultiTenantSpec + * @memberof vschema.Vindex * @static - * @param {vschema.IMultiTenantSpec=} [properties] Properties to set - * @returns {vschema.MultiTenantSpec} MultiTenantSpec instance + * @param {vschema.IVindex=} [properties] Properties to set + * @returns {vschema.Vindex} Vindex instance */ - MultiTenantSpec.create = function create(properties) { - return new MultiTenantSpec(properties); + Vindex.create = function create(properties) { + return new Vindex(properties); }; /** - * Encodes the specified MultiTenantSpec message. Does not implicitly {@link vschema.MultiTenantSpec.verify|verify} messages. + * Encodes the specified Vindex message. Does not implicitly {@link vschema.Vindex.verify|verify} messages. * @function encode - * @memberof vschema.MultiTenantSpec + * @memberof vschema.Vindex * @static - * @param {vschema.IMultiTenantSpec} message MultiTenantSpec message or plain object to encode + * @param {vschema.IVindex} message Vindex message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - MultiTenantSpec.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.tenant_id_column_name != null && Object.hasOwnProperty.call(message, "tenant_id_column_name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.tenant_id_column_name); - if (message.tenant_id_column_type != null && Object.hasOwnProperty.call(message, "tenant_id_column_type")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.tenant_id_column_type); - return writer; - }; - - /** - * Encodes the specified MultiTenantSpec message, length delimited. Does not implicitly {@link vschema.MultiTenantSpec.verify|verify} messages. - * @function encodeDelimited - * @memberof vschema.MultiTenantSpec - * @static - * @param {vschema.IMultiTenantSpec} message MultiTenantSpec message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MultiTenantSpec.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a MultiTenantSpec message from the specified reader or buffer. - * @function decode - * @memberof vschema.MultiTenantSpec - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {vschema.MultiTenantSpec} MultiTenantSpec - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MultiTenantSpec.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - let end = length === undefined ? reader.len : reader.pos + length, message = new $root.vschema.MultiTenantSpec(); - while (reader.pos < end) { - let tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.tenant_id_column_name = reader.string(); - break; - } - case 2: { - message.tenant_id_column_type = reader.int32(); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a MultiTenantSpec message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof vschema.MultiTenantSpec - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {vschema.MultiTenantSpec} MultiTenantSpec - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MultiTenantSpec.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a MultiTenantSpec message. - * @function verify - * @memberof vschema.MultiTenantSpec - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - MultiTenantSpec.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.tenant_id_column_name != null && message.hasOwnProperty("tenant_id_column_name")) - if (!$util.isString(message.tenant_id_column_name)) - return "tenant_id_column_name: string expected"; - if (message.tenant_id_column_type != null && message.hasOwnProperty("tenant_id_column_type")) - switch (message.tenant_id_column_type) { - default: - return "tenant_id_column_type: enum value expected"; - case 0: - case 257: - case 770: - case 259: - case 772: - case 261: - case 774: - case 263: - case 776: - case 265: - case 778: - case 1035: - case 1036: - case 2061: - case 2062: - case 2063: - case 2064: - case 785: - case 18: - case 6163: - case 10260: - case 6165: - case 10262: - case 6167: - case 10264: - case 2073: - case 2074: - case 2075: - case 28: - case 2077: - case 2078: - case 31: - case 4128: - case 4129: - case 4130: - case 2083: - case 2084: - break; - } - return null; - }; - - /** - * Creates a MultiTenantSpec message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof vschema.MultiTenantSpec - * @static - * @param {Object.} object Plain object - * @returns {vschema.MultiTenantSpec} MultiTenantSpec - */ - MultiTenantSpec.fromObject = function fromObject(object) { - if (object instanceof $root.vschema.MultiTenantSpec) - return object; - let message = new $root.vschema.MultiTenantSpec(); - if (object.tenant_id_column_name != null) - message.tenant_id_column_name = String(object.tenant_id_column_name); - switch (object.tenant_id_column_type) { - default: - if (typeof object.tenant_id_column_type === "number") { - message.tenant_id_column_type = object.tenant_id_column_type; - break; - } - break; - case "NULL_TYPE": - case 0: - message.tenant_id_column_type = 0; - break; - case "INT8": - case 257: - message.tenant_id_column_type = 257; - break; - case "UINT8": - case 770: - message.tenant_id_column_type = 770; - break; - case "INT16": - case 259: - message.tenant_id_column_type = 259; - break; - case "UINT16": - case 772: - message.tenant_id_column_type = 772; - break; - case "INT24": - case 261: - message.tenant_id_column_type = 261; - break; - case "UINT24": - case 774: - message.tenant_id_column_type = 774; - break; - case "INT32": - case 263: - message.tenant_id_column_type = 263; - break; - case "UINT32": - case 776: - message.tenant_id_column_type = 776; - break; - case "INT64": - case 265: - message.tenant_id_column_type = 265; - break; - case "UINT64": - case 778: - message.tenant_id_column_type = 778; - break; - case "FLOAT32": - case 1035: - message.tenant_id_column_type = 1035; - break; - case "FLOAT64": - case 1036: - message.tenant_id_column_type = 1036; - break; - case "TIMESTAMP": - case 2061: - message.tenant_id_column_type = 2061; - break; - case "DATE": - case 2062: - message.tenant_id_column_type = 2062; - break; - case "TIME": - case 2063: - message.tenant_id_column_type = 2063; - break; - case "DATETIME": - case 2064: - message.tenant_id_column_type = 2064; - break; - case "YEAR": - case 785: - message.tenant_id_column_type = 785; - break; - case "DECIMAL": - case 18: - message.tenant_id_column_type = 18; - break; - case "TEXT": - case 6163: - message.tenant_id_column_type = 6163; - break; - case "BLOB": - case 10260: - message.tenant_id_column_type = 10260; - break; - case "VARCHAR": - case 6165: - message.tenant_id_column_type = 6165; - break; - case "VARBINARY": - case 10262: - message.tenant_id_column_type = 10262; - break; - case "CHAR": - case 6167: - message.tenant_id_column_type = 6167; - break; - case "BINARY": - case 10264: - message.tenant_id_column_type = 10264; - break; - case "BIT": - case 2073: - message.tenant_id_column_type = 2073; - break; - case "ENUM": - case 2074: - message.tenant_id_column_type = 2074; - break; - case "SET": - case 2075: - message.tenant_id_column_type = 2075; - break; - case "TUPLE": - case 28: - message.tenant_id_column_type = 28; - break; - case "GEOMETRY": - case 2077: - message.tenant_id_column_type = 2077; - break; - case "JSON": - case 2078: - message.tenant_id_column_type = 2078; - break; - case "EXPRESSION": - case 31: - message.tenant_id_column_type = 31; - break; - case "HEXNUM": - case 4128: - message.tenant_id_column_type = 4128; - break; - case "HEXVAL": - case 4129: - message.tenant_id_column_type = 4129; - break; - case "BITNUM": - case 4130: - message.tenant_id_column_type = 4130; - break; - case "VECTOR": - case 2083: - message.tenant_id_column_type = 2083; - break; - case "RAW": - case 2084: - message.tenant_id_column_type = 2084; - break; - } - return message; - }; - - /** - * Creates a plain object from a MultiTenantSpec message. Also converts values to other types if specified. - * @function toObject - * @memberof vschema.MultiTenantSpec - * @static - * @param {vschema.MultiTenantSpec} message MultiTenantSpec - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - MultiTenantSpec.toObject = function toObject(message, options) { - if (!options) - options = {}; - let object = {}; - if (options.defaults) { - object.tenant_id_column_name = ""; - object.tenant_id_column_type = options.enums === String ? "NULL_TYPE" : 0; - } - if (message.tenant_id_column_name != null && message.hasOwnProperty("tenant_id_column_name")) - object.tenant_id_column_name = message.tenant_id_column_name; - if (message.tenant_id_column_type != null && message.hasOwnProperty("tenant_id_column_type")) - object.tenant_id_column_type = options.enums === String ? $root.query.Type[message.tenant_id_column_type] === undefined ? message.tenant_id_column_type : $root.query.Type[message.tenant_id_column_type] : message.tenant_id_column_type; - return object; - }; - - /** - * Converts this MultiTenantSpec to JSON. - * @function toJSON - * @memberof vschema.MultiTenantSpec - * @instance - * @returns {Object.} JSON object - */ - MultiTenantSpec.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for MultiTenantSpec - * @function getTypeUrl - * @memberof vschema.MultiTenantSpec - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - MultiTenantSpec.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/vschema.MultiTenantSpec"; - }; - - return MultiTenantSpec; - })(); - ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) - vschema.Vindex = (function() { - - /** - * Properties of a Vindex. - * @memberof vschema - * @interface IVindex - * @property {string|null} [type] Vindex type - * @property {Object.|null} [params] Vindex params - * @property {string|null} [owner] Vindex owner - */ - - /** - * Constructs a new Vindex. - * @memberof vschema - * @classdesc Represents a Vindex. - * @implements IVindex - * @constructor - * @param {vschema.IVindex=} [properties] Properties to set - */ - function Vindex(properties) { - this.params = {}; - if (properties) - for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * Vindex type. - * @member {string} type - * @memberof vschema.Vindex - * @instance - */ - Vindex.prototype.type = ""; - - /** - * Vindex params. - * @member {Object.} params - * @memberof vschema.Vindex - * @instance - */ - Vindex.prototype.params = $util.emptyObject; - - /** - * Vindex owner. - * @member {string} owner - * @memberof vschema.Vindex - * @instance - */ - Vindex.prototype.owner = ""; - - /** - * Creates a new Vindex instance using the specified properties. - * @function create - * @memberof vschema.Vindex - * @static - * @param {vschema.IVindex=} [properties] Properties to set - * @returns {vschema.Vindex} Vindex instance - */ - Vindex.create = function create(properties) { - return new Vindex(properties); - }; - - /** - * Encodes the specified Vindex message. Does not implicitly {@link vschema.Vindex.verify|verify} messages. - * @function encode - * @memberof vschema.Vindex - * @static - * @param {vschema.IVindex} message Vindex message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Vindex.encode = function encode(message, writer) { + Vindex.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); if (message.type != null && Object.hasOwnProperty.call(message, "type")) @@ -102357,11 +101445,7 @@ export const vschema = $root.vschema = (() => { case 4128: case 4129: case 4130: -<<<<<<< HEAD -======= - case 2083: case 2084: ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) break; } return null; @@ -102528,37 +101612,11 @@ export const vschema = $root.vschema = (() => { case 4130: message.type = 4130; break; -<<<<<<< HEAD -======= - case "VECTOR": - case 2083: - message.type = 2083; - break; case "RAW": case 2084: message.type = 2084; break; } - if (object.invisible != null) - message.invisible = Boolean(object.invisible); - if (object["default"] != null) - message["default"] = String(object["default"]); - if (object.collation_name != null) - message.collation_name = String(object.collation_name); - if (object.size != null) - message.size = object.size | 0; - if (object.scale != null) - message.scale = object.scale | 0; - if (object.nullable != null) - message.nullable = Boolean(object.nullable); - if (object.values) { - if (!Array.isArray(object.values)) - throw TypeError(".vschema.Column.values: array expected"); - message.values = []; - for (let i = 0; i < object.values.length; ++i) - message.values[i] = String(object.values[i]); ->>>>>>> e89f684b09 (JSON Encoding: Use Type_RAW for marshalling json (#16637)) - } return message; };