Skip to content

Commit 1a66590

Browse files
MrPresent-HanMrPresent-Han
andauthored
build(deps): [3.0] bump milvus-proto for compaction observability (#3797) (#3799)
## What changed - Bump the PyMilvus 3.0 `milvus-proto` submodule from `0d1eefd` to `9e4f0eb`. - Regenerate the Python protobuf bindings from merged `milvus-io/milvus-proto#669`. ## Why This establishes the 3.0 protocol baseline required by the compaction lifecycle observability backport without mixing generated protocol changes into the feature PR. ## Verification - `make check_proto_product` - Related PyMilvus unit tests pr: #3797 Signed-off-by: MrPresent-Han <[email protected]> Co-authored-by: MrPresent-Han <[email protected]>
1 parent 4816eab commit 1a66590

7 files changed

Lines changed: 588 additions & 490 deletions

File tree

‎pymilvus/grpc_gen/common_pb2.py‎

Lines changed: 41 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pymilvus/grpc_gen/common_pb2.pyi‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,35 @@ class CompactionState(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
273273
Executing: _ClassVar[CompactionState]
274274
Completed: _ClassVar[CompactionState]
275275

276+
class CompactionTaskState(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
277+
__slots__ = ()
278+
CompactionTaskStateUnknown: _ClassVar[CompactionTaskState]
279+
CompactionTaskStateExecuting: _ClassVar[CompactionTaskState]
280+
CompactionTaskStatePipelining: _ClassVar[CompactionTaskState]
281+
CompactionTaskStateCompleted: _ClassVar[CompactionTaskState]
282+
CompactionTaskStateFailed: _ClassVar[CompactionTaskState]
283+
CompactionTaskStateTimeout: _ClassVar[CompactionTaskState]
284+
CompactionTaskStateAnalyzing: _ClassVar[CompactionTaskState]
285+
CompactionTaskStateIndexing: _ClassVar[CompactionTaskState]
286+
CompactionTaskStateCleaned: _ClassVar[CompactionTaskState]
287+
CompactionTaskStateMetaSaved: _ClassVar[CompactionTaskState]
288+
CompactionTaskStateStatistic: _ClassVar[CompactionTaskState]
289+
290+
class CompactionType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
291+
__slots__ = ()
292+
CompactionTypeUndefined: _ClassVar[CompactionType]
293+
CompactionTypeMerge: _ClassVar[CompactionType]
294+
CompactionTypeMix: _ClassVar[CompactionType]
295+
CompactionTypeSingle: _ClassVar[CompactionType]
296+
CompactionTypeMinor: _ClassVar[CompactionType]
297+
CompactionTypeMajor: _ClassVar[CompactionType]
298+
CompactionTypeLevel0Delete: _ClassVar[CompactionType]
299+
CompactionTypeClustering: _ClassVar[CompactionType]
300+
CompactionTypeSort: _ClassVar[CompactionType]
301+
CompactionTypePartitionKeySort: _ClassVar[CompactionType]
302+
CompactionTypeClusteringPartitionKeySort: _ClassVar[CompactionType]
303+
CompactionTypeBumpSchemaVersion: _ClassVar[CompactionType]
304+
276305
class ConsistencyLevel(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
277306
__slots__ = ()
278307
Strong: _ClassVar[ConsistencyLevel]
@@ -663,6 +692,29 @@ BoolExprV1: DslType
663692
UndefiedState: CompactionState
664693
Executing: CompactionState
665694
Completed: CompactionState
695+
CompactionTaskStateUnknown: CompactionTaskState
696+
CompactionTaskStateExecuting: CompactionTaskState
697+
CompactionTaskStatePipelining: CompactionTaskState
698+
CompactionTaskStateCompleted: CompactionTaskState
699+
CompactionTaskStateFailed: CompactionTaskState
700+
CompactionTaskStateTimeout: CompactionTaskState
701+
CompactionTaskStateAnalyzing: CompactionTaskState
702+
CompactionTaskStateIndexing: CompactionTaskState
703+
CompactionTaskStateCleaned: CompactionTaskState
704+
CompactionTaskStateMetaSaved: CompactionTaskState
705+
CompactionTaskStateStatistic: CompactionTaskState
706+
CompactionTypeUndefined: CompactionType
707+
CompactionTypeMerge: CompactionType
708+
CompactionTypeMix: CompactionType
709+
CompactionTypeSingle: CompactionType
710+
CompactionTypeMinor: CompactionType
711+
CompactionTypeMajor: CompactionType
712+
CompactionTypeLevel0Delete: CompactionType
713+
CompactionTypeClustering: CompactionType
714+
CompactionTypeSort: CompactionType
715+
CompactionTypePartitionKeySort: CompactionType
716+
CompactionTypeClusteringPartitionKeySort: CompactionType
717+
CompactionTypeBumpSchemaVersion: CompactionType
666718
Strong: ConsistencyLevel
667719
Session: ConsistencyLevel
668720
Bounded: ConsistencyLevel
@@ -1199,3 +1251,11 @@ class SearchAggregationSpec(_message.Message):
11991251
sub_aggregation: SearchAggregationSpec
12001252
search_size: int
12011253
def __init__(self, fields: _Optional[_Iterable[str]] = ..., size: _Optional[int] = ..., metrics: _Optional[_Mapping[str, MetricAggSpec]] = ..., order: _Optional[_Iterable[_Union[OrderSpec, _Mapping]]] = ..., top_hits: _Optional[_Union[TopHitsSpec, _Mapping]] = ..., sub_aggregation: _Optional[_Union[SearchAggregationSpec, _Mapping]] = ..., search_size: _Optional[int] = ...) -> None: ...
1254+
1255+
class IDRange(_message.Message):
1256+
__slots__ = ("begin", "end")
1257+
BEGIN_FIELD_NUMBER: _ClassVar[int]
1258+
END_FIELD_NUMBER: _ClassVar[int]
1259+
begin: int
1260+
end: int
1261+
def __init__(self, begin: _Optional[int] = ..., end: _Optional[int] = ...) -> None: ...

‎pymilvus/grpc_gen/milvus_pb2.py‎

Lines changed: 436 additions & 436 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pymilvus/grpc_gen/milvus_pb2.pyi‎

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,7 +1600,7 @@ class FlushCollectionResult(_message.Message):
16001600
def __init__(self, collection_name: _Optional[str] = ..., segment_ids: _Optional[_Union[_schema_pb2.LongArray, _Mapping]] = ..., flush_segment_ids: _Optional[_Union[_schema_pb2.LongArray, _Mapping]] = ..., seal_time: _Optional[int] = ..., flush_ts: _Optional[int] = ..., channel_cps: _Optional[_Mapping[str, _msg_pb2.MsgPosition]] = ...) -> None: ...
16011601

16021602
class PersistentSegmentInfo(_message.Message):
1603-
__slots__ = ("segmentID", "collectionID", "partitionID", "num_rows", "state", "level", "is_sorted", "storage_version")
1603+
__slots__ = ("segmentID", "collectionID", "partitionID", "num_rows", "state", "level", "is_sorted", "storage_version", "insert_channel", "compaction_from")
16041604
SEGMENTID_FIELD_NUMBER: _ClassVar[int]
16051605
COLLECTIONID_FIELD_NUMBER: _ClassVar[int]
16061606
PARTITIONID_FIELD_NUMBER: _ClassVar[int]
@@ -1609,6 +1609,8 @@ class PersistentSegmentInfo(_message.Message):
16091609
LEVEL_FIELD_NUMBER: _ClassVar[int]
16101610
IS_SORTED_FIELD_NUMBER: _ClassVar[int]
16111611
STORAGE_VERSION_FIELD_NUMBER: _ClassVar[int]
1612+
INSERT_CHANNEL_FIELD_NUMBER: _ClassVar[int]
1613+
COMPACTION_FROM_FIELD_NUMBER: _ClassVar[int]
16121614
segmentID: int
16131615
collectionID: int
16141616
partitionID: int
@@ -1617,17 +1619,21 @@ class PersistentSegmentInfo(_message.Message):
16171619
level: _common_pb2.SegmentLevel
16181620
is_sorted: bool
16191621
storage_version: int
1620-
def __init__(self, segmentID: _Optional[int] = ..., collectionID: _Optional[int] = ..., partitionID: _Optional[int] = ..., num_rows: _Optional[int] = ..., state: _Optional[_Union[_common_pb2.SegmentState, str]] = ..., level: _Optional[_Union[_common_pb2.SegmentLevel, str]] = ..., is_sorted: bool = ..., storage_version: _Optional[int] = ...) -> None: ...
1622+
insert_channel: str
1623+
compaction_from: _containers.RepeatedScalarFieldContainer[int]
1624+
def __init__(self, segmentID: _Optional[int] = ..., collectionID: _Optional[int] = ..., partitionID: _Optional[int] = ..., num_rows: _Optional[int] = ..., state: _Optional[_Union[_common_pb2.SegmentState, str]] = ..., level: _Optional[_Union[_common_pb2.SegmentLevel, str]] = ..., is_sorted: bool = ..., storage_version: _Optional[int] = ..., insert_channel: _Optional[str] = ..., compaction_from: _Optional[_Iterable[int]] = ...) -> None: ...
16211625

16221626
class GetPersistentSegmentInfoRequest(_message.Message):
1623-
__slots__ = ("base", "dbName", "collectionName")
1627+
__slots__ = ("base", "dbName", "collectionName", "states")
16241628
BASE_FIELD_NUMBER: _ClassVar[int]
16251629
DBNAME_FIELD_NUMBER: _ClassVar[int]
16261630
COLLECTIONNAME_FIELD_NUMBER: _ClassVar[int]
1631+
STATES_FIELD_NUMBER: _ClassVar[int]
16271632
base: _common_pb2.MsgBase
16281633
dbName: str
16291634
collectionName: str
1630-
def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., dbName: _Optional[str] = ..., collectionName: _Optional[str] = ...) -> None: ...
1635+
states: _containers.RepeatedScalarFieldContainer[_common_pb2.SegmentState]
1636+
def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., dbName: _Optional[str] = ..., collectionName: _Optional[str] = ..., states: _Optional[_Iterable[_Union[_common_pb2.SegmentState, str]]] = ...) -> None: ...
16311637

16321638
class GetPersistentSegmentInfoResponse(_message.Message):
16331639
__slots__ = ("status", "infos")
@@ -1826,10 +1832,16 @@ class GetCompactionStateResponse(_message.Message):
18261832
def __init__(self, status: _Optional[_Union[_common_pb2.Status, _Mapping]] = ..., state: _Optional[_Union[_common_pb2.CompactionState, str]] = ..., executingPlanNo: _Optional[int] = ..., timeoutPlanNo: _Optional[int] = ..., completedPlanNo: _Optional[int] = ..., failedPlanNo: _Optional[int] = ...) -> None: ...
18271833

18281834
class GetCompactionPlansRequest(_message.Message):
1829-
__slots__ = ("compactionID",)
1835+
__slots__ = ("compactionID", "db_name", "collection_name", "collection_id")
18301836
COMPACTIONID_FIELD_NUMBER: _ClassVar[int]
1837+
DB_NAME_FIELD_NUMBER: _ClassVar[int]
1838+
COLLECTION_NAME_FIELD_NUMBER: _ClassVar[int]
1839+
COLLECTION_ID_FIELD_NUMBER: _ClassVar[int]
18311840
compactionID: int
1832-
def __init__(self, compactionID: _Optional[int] = ...) -> None: ...
1841+
db_name: str
1842+
collection_name: str
1843+
collection_id: int
1844+
def __init__(self, compactionID: _Optional[int] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., collection_id: _Optional[int] = ...) -> None: ...
18331845

18341846
class GetCompactionPlansResponse(_message.Message):
18351847
__slots__ = ("status", "state", "mergeInfos")
@@ -1842,12 +1854,30 @@ class GetCompactionPlansResponse(_message.Message):
18421854
def __init__(self, status: _Optional[_Union[_common_pb2.Status, _Mapping]] = ..., state: _Optional[_Union[_common_pb2.CompactionState, str]] = ..., mergeInfos: _Optional[_Iterable[_Union[CompactionMergeInfo, _Mapping]]] = ...) -> None: ...
18431855

18441856
class CompactionMergeInfo(_message.Message):
1845-
__slots__ = ("sources", "target")
1857+
__slots__ = ("sources", "target", "plan_id", "trigger_id", "collection_id", "partition_id", "channel", "type", "state", "failure_reason", "targets")
18461858
SOURCES_FIELD_NUMBER: _ClassVar[int]
18471859
TARGET_FIELD_NUMBER: _ClassVar[int]
1860+
PLAN_ID_FIELD_NUMBER: _ClassVar[int]
1861+
TRIGGER_ID_FIELD_NUMBER: _ClassVar[int]
1862+
COLLECTION_ID_FIELD_NUMBER: _ClassVar[int]
1863+
PARTITION_ID_FIELD_NUMBER: _ClassVar[int]
1864+
CHANNEL_FIELD_NUMBER: _ClassVar[int]
1865+
TYPE_FIELD_NUMBER: _ClassVar[int]
1866+
STATE_FIELD_NUMBER: _ClassVar[int]
1867+
FAILURE_REASON_FIELD_NUMBER: _ClassVar[int]
1868+
TARGETS_FIELD_NUMBER: _ClassVar[int]
18481869
sources: _containers.RepeatedScalarFieldContainer[int]
18491870
target: int
1850-
def __init__(self, sources: _Optional[_Iterable[int]] = ..., target: _Optional[int] = ...) -> None: ...
1871+
plan_id: int
1872+
trigger_id: int
1873+
collection_id: int
1874+
partition_id: int
1875+
channel: str
1876+
type: _common_pb2.CompactionType
1877+
state: _common_pb2.CompactionTaskState
1878+
failure_reason: str
1879+
targets: _containers.RepeatedScalarFieldContainer[int]
1880+
def __init__(self, sources: _Optional[_Iterable[int]] = ..., target: _Optional[int] = ..., plan_id: _Optional[int] = ..., trigger_id: _Optional[int] = ..., collection_id: _Optional[int] = ..., partition_id: _Optional[int] = ..., channel: _Optional[str] = ..., type: _Optional[_Union[_common_pb2.CompactionType, str]] = ..., state: _Optional[_Union[_common_pb2.CompactionTaskState, str]] = ..., failure_reason: _Optional[str] = ..., targets: _Optional[_Iterable[int]] = ...) -> None: ...
18511881

18521882
class GetFlushStateRequest(_message.Message):
18531883
__slots__ = ("segmentIDs", "flush_ts", "db_name", "collection_name")

0 commit comments

Comments
 (0)