enhance: Show segment's Memory Size (#265)

Signed-off-by: yangxuan <[email protected]>
milvus-io · May 30, 2024 · 7e6f3f0 · 7e6f3f0
1 parent af72ef7
commit 7e6f3f0
Show file tree

Hide file tree

Showing 27 changed files with 10,557 additions and 4,365 deletions.
diff --git a/models/segment.go b/models/segment.go
@@ -95,7 +95,8 @@ func NewSegmentFromV2_1(info *datapb.SegmentInfo, key string) *Segment {
 }
 
 func NewSegmentFromV2_2(info *datapbv2.SegmentInfo, key string,
-	lazy func() ([]datapbv2.FieldBinlog, []datapbv2.FieldBinlog, []datapbv2.FieldBinlog, error)) *Segment {
+	lazy func() ([]datapbv2.FieldBinlog, []datapbv2.FieldBinlog, []datapbv2.FieldBinlog, error),
+) *Segment {
 	s := newSegmentFromBase(info)
 	s.key = key
 	s.State = SegmentState(info.GetState())
@@ -108,7 +109,7 @@ func NewSegmentFromV2_2(info *datapbv2.SegmentInfo, key string,
 			r := &FieldBinlog{
 				FieldID: fbl.GetFieldID(),
 				Binlogs: lo.Map(fbl.GetBinlogs(), func(binlog *datapbv2.Binlog, _ int) *Binlog {
-					return newBinlog(binlog)
+					return newBinlogV2(binlog)
 				}),
 			}
 			return r
@@ -216,6 +217,7 @@ type Binlog struct {
 	TimestampTo   uint64
 	LogPath       string
 	LogSize       int64
+	MemSize       int64
 }
 
 func newBinlog[T interface {
@@ -233,3 +235,21 @@ func newBinlog[T interface {
 		LogSize:       binlog.GetLogSize(),
 	}
 }
+
+func newBinlogV2[T interface {
+	GetEntriesNum() int64
+	GetTimestampFrom() uint64
+	GetTimestampTo() uint64
+	GetLogPath() string
+	GetLogSize() int64
+	GetMemorySize() int64
+}](binlog T) *Binlog {
+	return &Binlog{
+		EntriesNum:    binlog.GetEntriesNum(),
+		TimestampFrom: binlog.GetTimestampFrom(),
+		TimestampTo:   binlog.GetTimestampTo(),
+		LogPath:       binlog.GetLogPath(),
+		LogSize:       binlog.GetLogSize(),
+		MemSize:       binlog.GetMemorySize(),
+	}
+}
diff --git a/proto/v2.2/common.proto b/proto/v2.2/common.proto
@@ -108,6 +108,7 @@ message Status {
     int32 code = 3;
     bool retriable = 4;
     string detail = 5;
+    map<string, string> extra_info = 6;
 }
 
 message KeyValuePair {
@@ -130,14 +131,17 @@ enum PlaceholderType {
     FloatVector = 101;
     Float16Vector = 102;
     BFloat16Vector = 103;
+    SparseFloatVector = 104;
     Int64 = 5;
     VarChar = 21;
 }
 
 message PlaceholderValue {
     string tag = 1;
     PlaceholderType type = 2;
-    // values is a 2d-array, every array contains a vector
+    // values is a 2d-array of nq rows, every row contains a query vector.
+    // for dense vector, all rows are of the same length; for sparse vector,
+    // the length of each row may vary depending on their number of non-zeros.
     repeated bytes values = 3;
 }
 
@@ -195,6 +199,7 @@ enum MsgType {
     DescribeIndex = 301;
     DropIndex = 302;
     GetIndexStatistics = 303;
+    AlterIndex = 304;
 
     /* MANIPULATION REQUESTS */
     Insert = 400;
@@ -271,6 +276,7 @@ enum MsgType {
     DescribeResourceGroup = 1703;
     TransferNode = 1704;
     TransferReplica = 1705;
+    UpdateResourceGroups = 1706;
 
     /* Database group */
     CreateDatabase = 1801;
@@ -381,6 +387,18 @@ enum ObjectPrivilege {
     PrivilegeDropDatabase = 36;
     PrivilegeListDatabases = 37;
     PrivilegeFlushAll = 38;
+
+    PrivilegeCreatePartition = 39;
+    PrivilegeDropPartition = 40;
+    PrivilegeShowPartitions = 41;
+    PrivilegeHasPartition = 42;
+    PrivilegeGetFlushState = 43;
+    PrivilegeCreateAlias = 44;
+    PrivilegeDropAlias = 45;
+    PrivilegeDescribeAlias = 46;
+    PrivilegeListAliases = 47;
+
+    PrivilegeUpdateResourceGroups = 48;
 }
 
 message PrivilegeExt {
@@ -435,3 +453,10 @@ message ServerInfo {
     // reserved for newly-added feature if necessary.
     map<string, string> reserved = 6;
 }
+
+// NodeInfo is used to describe the node information.
+message NodeInfo {
+    int64 nodeID = 1;
+    string address = 2;
+    string hostname = 3;
+}