From e0ee9d117f8f88ada2816320e817b9c6a79398d7 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Tue, 20 Feb 2024 14:54:55 +0800 Subject: [PATCH] address comment Signed-off-by: lance6716 --- pkg/import_sstpb/import_sstpb.pb.go | 7 +++++-- proto/import_sstpb.proto | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/import_sstpb/import_sstpb.pb.go b/pkg/import_sstpb/import_sstpb.pb.go index e815a7770..6501ec06a 100644 --- a/pkg/import_sstpb/import_sstpb.pb.go +++ b/pkg/import_sstpb/import_sstpb.pb.go @@ -1512,8 +1512,11 @@ func (m *Pair) GetOp() Pair_OP { } type WriteBatch struct { - CommitTs uint64 `protobuf:"varint,1,opt,name=commit_ts,json=commitTs,proto3" json:"commit_ts,omitempty"` - Pairs []*Pair `protobuf:"bytes,2,rep,name=pairs,proto3" json:"pairs,omitempty"` + CommitTs uint64 `protobuf:"varint,1,opt,name=commit_ts,json=commitTs,proto3" json:"commit_ts,omitempty"` + Pairs []*Pair `protobuf:"bytes,2,rep,name=pairs,proto3" json:"pairs,omitempty"` + // in order to be compatible with features like PiTR, import service should use + // this optional fields to compose data in write CF. When it's not set, import + // service can use commit_ts instead. StartTs uint64 `protobuf:"varint,3,opt,name=start_ts,json=startTs,proto3" json:"start_ts,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` diff --git a/proto/import_sstpb.proto b/proto/import_sstpb.proto index 7ba9b04f8..d5ae0c178 100644 --- a/proto/import_sstpb.proto +++ b/proto/import_sstpb.proto @@ -283,6 +283,9 @@ message Pair { message WriteBatch { uint64 commit_ts = 1; repeated Pair pairs = 2; + // in order to be compatible with features like PiTR, import service should use + // this optional fields to compose data in write CF. When it's not set, import + // service can use commit_ts instead. uint64 start_ts = 3; }