From f25b4243d634bd792f0bf3a57df00df5cd434484 Mon Sep 17 00:00:00 2001 From: VDaaS org Date: Tue, 13 Jun 2023 07:38:37 +0000 Subject: [PATCH] Update [vald sha: c2693c0615fb70f33183b3f7d687c626c5ff2c7f] --- VALD_CLIENT_NODE_VERSION | 2 +- VALD_SHA | 2 +- index.d.ts | 4 +-- index.js | 2 +- package-lock.json | 4 +-- package.json | 2 +- src/vald/v1/payload/payload_pb.d.ts | 15 +++++++++ src/vald/v1/payload/payload_pb.js | 46 ++++++++++++++++++++++++- src/vtproto/ext_grpc_pb.d.ts | 1 + src/vtproto/ext_grpc_pb.js | 1 + src/vtproto/ext_pb.d.ts | 8 +++++ src/vtproto/ext_pb.js | 52 +++++++++++++++++++++++++++++ 12 files changed, 130 insertions(+), 9 deletions(-) create mode 100644 src/vtproto/ext_grpc_pb.d.ts create mode 100644 src/vtproto/ext_grpc_pb.js create mode 100644 src/vtproto/ext_pb.d.ts create mode 100644 src/vtproto/ext_pb.js diff --git a/VALD_CLIENT_NODE_VERSION b/VALD_CLIENT_NODE_VERSION index 6a126f4..de28578 100644 --- a/VALD_CLIENT_NODE_VERSION +++ b/VALD_CLIENT_NODE_VERSION @@ -1 +1 @@ -1.7.5 +1.7.6 diff --git a/VALD_SHA b/VALD_SHA index ff88658..66137aa 100644 --- a/VALD_SHA +++ b/VALD_SHA @@ -1 +1 @@ -0ec126d77a7f70e83e5fb8e658fe3db9dca08ba0 +c2693c0615fb70f33183b3f7d687c626c5ff2c7f diff --git a/index.d.ts b/index.d.ts index 9360d0e..886bb7f 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,9 +1,9 @@ +import v1_agent_core = require("./src/vald/v1/agent/core"); import v1_vald = require("./src/vald/v1/vald"); import v1_payload = require("./src/vald/v1/payload"); -import v1_agent_core = require("./src/vald/v1/agent/core"); declare const _default: { + v1_agent_core: typeof v1_agent_core, v1_vald: typeof v1_vald, v1_payload: typeof v1_payload, - v1_agent_core: typeof v1_agent_core, }; export = _default; diff --git a/index.js b/index.js index 1f4787b..19afa58 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,3 @@ +module.exports.v1_agent_core = require("./src/vald/v1/agent/core"); module.exports.v1_vald = require("./src/vald/v1/vald"); module.exports.v1_payload = require("./src/vald/v1/payload"); -module.exports.v1_agent_core = require("./src/vald/v1/agent/core"); diff --git a/package-lock.json b/package-lock.json index 4429cb4..dc0fc94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vald-client-node", - "version": "1.7.5", + "version": "1.7.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vald-client-node", - "version": "1.7.5", + "version": "1.7.6", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.8.15", diff --git a/package.json b/package.json index eb0626d..7995ab7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vald-client-node", - "version": "1.7.5", + "version": "1.7.6", "description": "A gRPC client library for Vald", "main": "index.js", "types": "index.d.ts", diff --git a/src/vald/v1/payload/payload_pb.d.ts b/src/vald/v1/payload/payload_pb.d.ts index 877f362..76bf274 100644 --- a/src/vald/v1/payload/payload_pb.d.ts +++ b/src/vald/v1/payload/payload_pb.d.ts @@ -4,6 +4,7 @@ import * as jspb from "google-protobuf"; import * as validate_validate_pb from "../../../validate/validate_pb"; import * as google_rpc_status_pb from "../../../google/rpc/status_pb"; +import * as vtproto_ext_pb from "../../../vtproto/ext_pb"; export class Search extends jspb.Message { serializeBinary(): Uint8Array; @@ -203,6 +204,9 @@ export namespace Search { getMinNum(): number; setMinNum(value: number): void; + getAggregationAlgorithm(): Search.AggregationAlgorithmMap[keyof Search.AggregationAlgorithmMap]; + setAggregationAlgorithm(value: Search.AggregationAlgorithmMap[keyof Search.AggregationAlgorithmMap]): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): Config.AsObject; static toObject(includeInstance: boolean, msg: Config): Config.AsObject; @@ -223,6 +227,7 @@ export namespace Search { ingressFilters?: Filter.Config.AsObject, egressFilters?: Filter.Config.AsObject, minNum: number, + aggregationAlgorithm: Search.AggregationAlgorithmMap[keyof Search.AggregationAlgorithmMap], } } @@ -308,6 +313,16 @@ export namespace Search { STATUS = 2, } } + + export interface AggregationAlgorithmMap { + UNKNOWN: 0; + CONCURRENTQUEUE: 1; + SORTSLICE: 2; + SORTPOOLSLICE: 3; + PAIRINGHEAP: 4; + } + + export const AggregationAlgorithm: AggregationAlgorithmMap; } export class Filter extends jspb.Message { diff --git a/src/vald/v1/payload/payload_pb.js b/src/vald/v1/payload/payload_pb.js index 1cb15b1..c3759ee 100644 --- a/src/vald/v1/payload/payload_pb.js +++ b/src/vald/v1/payload/payload_pb.js @@ -25,6 +25,8 @@ var validate_validate_pb = require('../../../validate/validate_pb.js'); goog.object.extend(proto, validate_validate_pb); var google_rpc_status_pb = require('../../../google/rpc/status_pb.js'); goog.object.extend(proto, google_rpc_status_pb); +var vtproto_ext_pb = require('../../../vtproto/ext_pb.js'); +goog.object.extend(proto, vtproto_ext_pb); goog.exportSymbol('proto.payload.v1.Control', null, global); goog.exportSymbol('proto.payload.v1.Control.CreateIndexRequest', null, global); goog.exportSymbol('proto.payload.v1.Discoverer', null, global); @@ -76,6 +78,7 @@ goog.exportSymbol('proto.payload.v1.Remove.Config', null, global); goog.exportSymbol('proto.payload.v1.Remove.MultiRequest', null, global); goog.exportSymbol('proto.payload.v1.Remove.Request', null, global); goog.exportSymbol('proto.payload.v1.Search', null, global); +goog.exportSymbol('proto.payload.v1.Search.AggregationAlgorithm', null, global); goog.exportSymbol('proto.payload.v1.Search.Config', null, global); goog.exportSymbol('proto.payload.v1.Search.IDRequest', null, global); goog.exportSymbol('proto.payload.v1.Search.MultiIDRequest', null, global); @@ -1649,6 +1652,17 @@ proto.payload.v1.Search.serializeBinaryToWriter = function(message, writer) { }; +/** + * @enum {number} + */ +proto.payload.v1.Search.AggregationAlgorithm = { + UNKNOWN: 0, + CONCURRENTQUEUE: 1, + SORTSLICE: 2, + SORTPOOLSLICE: 3, + PAIRINGHEAP: 4 +}; + /** * List of repeated fields within this message type. @@ -2814,7 +2828,8 @@ proto.payload.v1.Search.Config.toObject = function(includeInstance, msg) { timeout: jspb.Message.getFieldWithDefault(msg, 5, 0), ingressFilters: (f = msg.getIngressFilters()) && proto.payload.v1.Filter.Config.toObject(includeInstance, f), egressFilters: (f = msg.getEgressFilters()) && proto.payload.v1.Filter.Config.toObject(includeInstance, f), - minNum: jspb.Message.getFieldWithDefault(msg, 8, 0) + minNum: jspb.Message.getFieldWithDefault(msg, 8, 0), + aggregationAlgorithm: jspb.Message.getFieldWithDefault(msg, 9, 0) }; if (includeInstance) { @@ -2885,6 +2900,10 @@ proto.payload.v1.Search.Config.deserializeBinaryFromReader = function(msg, reade var value = /** @type {number} */ (reader.readUint32()); msg.setMinNum(value); break; + case 9: + var value = /** @type {!proto.payload.v1.Search.AggregationAlgorithm} */ (reader.readEnum()); + msg.setAggregationAlgorithm(value); + break; default: reader.skipField(); break; @@ -2972,6 +2991,13 @@ proto.payload.v1.Search.Config.serializeBinaryToWriter = function(message, write f ); } + f = message.getAggregationAlgorithm(); + if (f !== 0.0) { + writer.writeEnum( + 9, + f + ); + } }; @@ -3157,6 +3183,24 @@ proto.payload.v1.Search.Config.prototype.setMinNum = function(value) { }; +/** + * optional AggregationAlgorithm aggregation_algorithm = 9; + * @return {!proto.payload.v1.Search.AggregationAlgorithm} + */ +proto.payload.v1.Search.Config.prototype.getAggregationAlgorithm = function() { + return /** @type {!proto.payload.v1.Search.AggregationAlgorithm} */ (jspb.Message.getFieldWithDefault(this, 9, 0)); +}; + + +/** + * @param {!proto.payload.v1.Search.AggregationAlgorithm} value + * @return {!proto.payload.v1.Search.Config} returns this + */ +proto.payload.v1.Search.Config.prototype.setAggregationAlgorithm = function(value) { + return jspb.Message.setProto3EnumField(this, 9, value); +}; + + /** * List of repeated fields within this message type. diff --git a/src/vtproto/ext_grpc_pb.d.ts b/src/vtproto/ext_grpc_pb.d.ts new file mode 100644 index 0000000..51b4d69 --- /dev/null +++ b/src/vtproto/ext_grpc_pb.d.ts @@ -0,0 +1 @@ +// GENERATED CODE -- NO SERVICES IN PROTO diff --git a/src/vtproto/ext_grpc_pb.js b/src/vtproto/ext_grpc_pb.js new file mode 100644 index 0000000..97b3a24 --- /dev/null +++ b/src/vtproto/ext_grpc_pb.js @@ -0,0 +1 @@ +// GENERATED CODE -- NO SERVICES IN PROTO \ No newline at end of file diff --git a/src/vtproto/ext_pb.d.ts b/src/vtproto/ext_pb.d.ts new file mode 100644 index 0000000..ccc33ec --- /dev/null +++ b/src/vtproto/ext_pb.d.ts @@ -0,0 +1,8 @@ +// package: vtproto +// file: vtproto/ext.proto + +import * as jspb from "google-protobuf"; +import * as google_protobuf_descriptor_pb from "google-protobuf/google/protobuf/descriptor_pb"; + + export const mempool: jspb.ExtensionFieldInfo; + diff --git a/src/vtproto/ext_pb.js b/src/vtproto/ext_pb.js new file mode 100644 index 0000000..e3fea7d --- /dev/null +++ b/src/vtproto/ext_pb.js @@ -0,0 +1,52 @@ +// source: vtproto/ext.proto +/** + * @fileoverview + * @enhanceable + * @suppress {missingRequire} reports error on implicit type usages. + * @suppress {messageConventions} JS Compiler reports an error if a variable or + * field starts with 'MSG_' and isn't a translatable message. + * @public + */ +// GENERATED CODE -- DO NOT EDIT! +/* eslint-disable */ +// @ts-nocheck + +var jspb = require('google-protobuf'); +var goog = jspb; +var global = (function() { + if (this) { return this; } + if (typeof window !== 'undefined') { return window; } + if (typeof global !== 'undefined') { return global; } + if (typeof self !== 'undefined') { return self; } + return Function('return this')(); +}.call(null)); + +var google_protobuf_descriptor_pb = require('google-protobuf/google/protobuf/descriptor_pb.js'); +goog.object.extend(proto, google_protobuf_descriptor_pb); +goog.exportSymbol('proto.vtproto.mempool', null, global); + +/** + * A tuple of {field number, class constructor} for the extension + * field named `mempool`. + * @type {!jspb.ExtensionFieldInfo} + */ +proto.vtproto.mempool = new jspb.ExtensionFieldInfo( + 64101, + {mempool: 0}, + null, + /** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ ( + null), + 0); + +google_protobuf_descriptor_pb.MessageOptions.extensionsBinary[64101] = new jspb.ExtensionFieldBinaryInfo( + proto.vtproto.mempool, + jspb.BinaryReader.prototype.readBool, + jspb.BinaryWriter.prototype.writeBool, + undefined, + undefined, + false); +// This registers the extension field with the extended class, so that +// toObject() will function correctly. +google_protobuf_descriptor_pb.MessageOptions.extensions[64101] = proto.vtproto.mempool; + +goog.object.extend(exports, proto.vtproto);