admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-08 10:08:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: symbol 'GetStorageMetrics' and 'enableDynamicField' (#28580)

Browse Source 
/kind bug
to #28579 #28504

1. replace enableDynamic with enableDynamicField
2. cgo directly link to milvus_storage

Signed-off-by: PowderLi <min.li@zilliz.com>
This commit is contained in:
PowderLi 2023-11-21 10:20:22 +08:00 committed by GitHub
parent d7145e2c06
commit c238bff9fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/distributed/proxy/httpserver/handler_v1.go
View File

@ -325,7 +325,7 @@ func (h *Handlers) getCollectionDetails(c *gin.Context) {
"indexes": indexDesc, "indexes": indexDesc,
"load": collLoadState, "load": collLoadState,
"shardsNum": coll.ShardsNum, "shardsNum": coll.ShardsNum,
"enableDynamic": coll.Schema.EnableDynamicField, "enableDynamicField": coll.Schema.EnableDynamicField,
}}) }})
} }

6
internal/distributed/proxy/httpserver/handler_v1_test.go
View File

@ -269,7 +269,7 @@ func TestVectorCollectionsDescribe(t *testing.T) {
name: "get load status fail", name: "get load status fail",
mp: mp2, mp: mp2,
exceptCode: http.StatusOK, exceptCode: http.StatusOK,
expectedBody: "{\"code\":200,\"data\":{\"collectionName\":\"" + DefaultCollectionName + "\",\"description\":\"\",\"enableDynamic\":true,\"fields\":[{\"autoId\":false,\"description\":\"\",\"name\":\"book_id\",\"primaryKey\":true,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"word_count\",\"primaryKey\":false,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"book_intro\",\"primaryKey\":false,\"type\":\"FloatVector(2)\"}],\"indexes\":[{\"fieldName\":\"book_intro\",\"indexName\":\"" + DefaultIndexName + "\",\"metricType\":\"L2\"}],\"load\":\"\",\"shardsNum\":1}}", expectedBody: "{\"code\":200,\"data\":{\"collectionName\":\"" + DefaultCollectionName + "\",\"description\":\"\",\"enableDynamicField\":true,\"fields\":[{\"autoId\":false,\"description\":\"\",\"name\":\"book_id\",\"primaryKey\":true,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"word_count\",\"primaryKey\":false,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"book_intro\",\"primaryKey\":false,\"type\":\"FloatVector(2)\"}],\"indexes\":[{\"fieldName\":\"book_intro\",\"indexName\":\"" + DefaultIndexName + "\",\"metricType\":\"L2\"}],\"load\":\"\",\"shardsNum\":1}}",
}) })
mp3 := mocks.NewMockProxy(t) mp3 := mocks.NewMockProxy(t)
@ -280,7 +280,7 @@ func TestVectorCollectionsDescribe(t *testing.T) {
name: "get indexes fail", name: "get indexes fail",
mp: mp3, mp: mp3,
exceptCode: http.StatusOK, exceptCode: http.StatusOK,
expectedBody: "{\"code\":200,\"data\":{\"collectionName\":\"" + DefaultCollectionName + "\",\"description\":\"\",\"enableDynamic\":true,\"fields\":[{\"autoId\":false,\"description\":\"\",\"name\":\"book_id\",\"primaryKey\":true,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"word_count\",\"primaryKey\":false,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"book_intro\",\"primaryKey\":false,\"type\":\"FloatVector(2)\"}],\"indexes\":[],\"load\":\"LoadStateLoaded\",\"shardsNum\":1}}", expectedBody: "{\"code\":200,\"data\":{\"collectionName\":\"" + DefaultCollectionName + "\",\"description\":\"\",\"enableDynamicField\":true,\"fields\":[{\"autoId\":false,\"description\":\"\",\"name\":\"book_id\",\"primaryKey\":true,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"word_count\",\"primaryKey\":false,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"book_intro\",\"primaryKey\":false,\"type\":\"FloatVector(2)\"}],\"indexes\":[],\"load\":\"LoadStateLoaded\",\"shardsNum\":1}}",
}) })
mp4 := mocks.NewMockProxy(t) mp4 := mocks.NewMockProxy(t)
@ -291,7 +291,7 @@ func TestVectorCollectionsDescribe(t *testing.T) {
name: "show collection details success", name: "show collection details success",
mp: mp4, mp: mp4,
exceptCode: http.StatusOK, exceptCode: http.StatusOK,
expectedBody: "{\"code\":200,\"data\":{\"collectionName\":\"" + DefaultCollectionName + "\",\"description\":\"\",\"enableDynamic\":true,\"fields\":[{\"autoId\":false,\"description\":\"\",\"name\":\"book_id\",\"primaryKey\":true,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"word_count\",\"primaryKey\":false,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"book_intro\",\"primaryKey\":false,\"type\":\"FloatVector(2)\"}],\"indexes\":[{\"fieldName\":\"book_intro\",\"indexName\":\"" + DefaultIndexName + "\",\"metricType\":\"L2\"}],\"load\":\"LoadStateLoaded\",\"shardsNum\":1}}", expectedBody: "{\"code\":200,\"data\":{\"collectionName\":\"" + DefaultCollectionName + "\",\"description\":\"\",\"enableDynamicField\":true,\"fields\":[{\"autoId\":false,\"description\":\"\",\"name\":\"book_id\",\"primaryKey\":true,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"word_count\",\"primaryKey\":false,\"type\":\"Int64\"},{\"autoId\":false,\"description\":\"\",\"name\":\"book_intro\",\"primaryKey\":false,\"type\":\"FloatVector(2)\"}],\"indexes\":[{\"fieldName\":\"book_intro\",\"indexName\":\"" + DefaultIndexName + "\",\"metricType\":\"L2\"}],\"load\":\"LoadStateLoaded\",\"shardsNum\":1}}",
}) })
for _, tt := range testCases { for _, tt := range testCases {

2
internal/util/metrics/c_registry.go
View File

@ -19,7 +19,7 @@
package metrics package metrics
/* /*
#cgo pkg-config: milvus_segcore milvus_common #cgo pkg-config: milvus_segcore milvus_storage milvus_common
#include <stdlib.h> #include <stdlib.h>
#include "segcore/metrics_c.h" #include "segcore/metrics_c.h"

2
tests/restful_client/testcases/test_restful_sdk_mix_use_scenario.py
View File

@ -38,7 +38,7 @@ class TestRestfulSdkCompatibility(TestBase):
rsp = client.collection_describe(name) rsp = client.collection_describe(name)
assert rsp['code'] == 200 assert rsp['code'] == 200
assert rsp['data']['collectionName'] == name assert rsp['data']['collectionName'] == name
assert rsp['data']['enableDynamic'] == enable_dynamic assert rsp['data']['enableDynamicField'] == enable_dynamic
assert rsp['data']['load'] == "LoadStateNotLoad" assert rsp['data']['load'] == "LoadStateNotLoad"
assert rsp['data']['shardsNum'] == shard_num assert rsp['data']['shardsNum'] == shard_num