Merge branch 'main' of github.com:milvus-io/milvus-sdk-node

milvus-io · Jan 25, 2024 · d61b23b · d61b23b
2 parents a59f070 + 040ccf0
commit d61b23b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -6,7 +6,7 @@ module.exports = {
   testTimeout: 60000,
   // because user will cause other test fail, but we still have user spec
   coveragePathIgnorePatterns: ['dist'],
-  testPathIgnorePatterns: ['cloud.spec.ts', 'serverless.spec.ts', 'fetch.spec.ts', 'node-fetch.spec.ts'], // add this line
+  testPathIgnorePatterns: ['cloud.spec.ts', 'serverless.spec.ts'], // add this line
   testEnvironmentOptions: {
     NODE_ENV: 'production',
   },

diff --git a/milvus/grpc/Data.ts b/milvus/grpc/Data.ts
@@ -826,6 +826,7 @@ export class Data extends Collection {
   async count(data: CountReq): Promise<CountResult> {
     const queryResult = await this.query({
       collection_name: data.collection_name,
+      expr: data.expr || '',
       output_fields: [DEFAULT_COUNT_QUERY_STRING],
     });
 

diff --git a/milvus/types/Data.ts b/milvus/types/Data.ts
@@ -69,7 +69,9 @@ export interface FlushReq extends GrpcTimeOut {
   collection_names: string[];
 }
 
-export interface CountReq extends collectionNameReq {}
+export interface CountReq extends collectionNameReq {
+  expr?: string;
+}
 
 export interface InsertReq extends collectionNameReq {
   partition_name?: string;

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@zilliz/milvus2-sdk-node",
   "author": "ued@zilliz.com",
   "version": "2.3.6",
-  "milvusVersion": "v2.3.4",
+  "milvusVersion": "v2.3.5",
   "main": "dist/milvus",
   "files": [
     "dist"

diff --git a/proto b/proto
diff --git a/test/grpc/Data.spec.ts b/test/grpc/Data.spec.ts
@@ -458,6 +458,15 @@ describe(`Data.API`, () => {
     expect(Number(res.data[0][DEFAULT_COUNT_QUERY_STRING])).toEqual(count.data);
   });
 
+  it(`Query with count(*) and expr`, async () => {
+    const count = await milvusClient.count({
+      collection_name: COLLECTION_NAME,
+      expr: 'id < 0',
+    });
+
+    expect(count.data).toEqual(0);
+  });
+
   it(`Query with data limit only`, async () => {
     const expr = 'id > 0';
     const res = await milvusClient.query({
+4 −4		cmake/protobuf/CMakeLists.txt
+288 −232		go-api/commonpb/common.pb.go
+907 −599		go-api/milvuspb/milvus.pb.go
+306 −117		go-api/schemapb/schema.pb.go
+18 −3		proto/common.proto
+115 −10		proto/milvus.proto
+25 −1		proto/schema.proto