Skip to content

Commit 0be8e7f

Browse files
authored
Remove unnecessary invoke of describe_collection() (milvus-io#2346)
Signed-off-by: yhmo <[email protected]>
1 parent 2c9c55b commit 0be8e7f

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

pymilvus/milvus_client/milvus_client.py

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -453,20 +453,17 @@ def query(
453453
ids = [ids]
454454

455455
conn = self._get_connection()
456-
try:
457-
schema_dict = conn.describe_collection(collection_name, timeout=timeout, **kwargs)
458-
except Exception as ex:
459-
logger.error("Failed to describe collection: %s", collection_name)
460-
raise ex from ex
461456

462457
if ids:
458+
try:
459+
schema_dict = conn.describe_collection(collection_name, timeout=timeout, **kwargs)
460+
except Exception as ex:
461+
logger.error("Failed to describe collection: %s", collection_name)
462+
raise ex from ex
463463
filter = self._pack_pks_expr(schema_dict, ids)
464464

465465
if not output_fields:
466466
output_fields = ["*"]
467-
vec_field_name = self._get_vector_field_name(schema_dict)
468-
if vec_field_name:
469-
output_fields.append(vec_field_name)
470467

471468
try:
472469
res = conn.query(
@@ -524,9 +521,6 @@ def get(
524521

525522
if not output_fields:
526523
output_fields = ["*"]
527-
vec_field_name = self._get_vector_field_name(schema_dict)
528-
if vec_field_name:
529-
output_fields.append(vec_field_name)
530524

531525
expr = self._pack_pks_expr(schema_dict, ids)
532526
try:
@@ -744,16 +738,6 @@ def _extract_primary_field(self, schema_dict: Dict) -> dict:
744738

745739
return {}
746740

747-
def _get_vector_field_name(self, schema_dict: Dict):
748-
fields = schema_dict.get("fields", [])
749-
if not fields:
750-
return {}
751-
752-
for field_dict in fields:
753-
if field_dict.get("type", None) == DataType.FLOAT_VECTOR:
754-
return field_dict.get("name", "")
755-
return ""
756-
757741
def _pack_pks_expr(self, schema_dict: Dict, pks: List) -> str:
758742
primary_field = self._extract_primary_field(schema_dict)
759743
pk_field_name = primary_field["name"]

0 commit comments

Comments
 (0)