From c129021ec7c7db43cf8543fb31df1337f7ebc3c8 Mon Sep 17 00:00:00 2001 From: Ahsan Barkati Date: Mon, 28 Jun 2021 14:32:54 +0530 Subject: [PATCH] fix(restore): Set kv version to restoreTs for all keys (#7930) The kv version should be set to restore timestamp for rolled-up keys and schema keys as well. --- worker/restore_map.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/worker/restore_map.go b/worker/restore_map.go index 753a21790df..16daa1a500d 100644 --- a/worker/restore_map.go +++ b/worker/restore_map.go @@ -367,7 +367,9 @@ func (m *mapper) processReqCh(ctx context.Context) error { return err } for _, kv := range kvs { - if err := toBuffer(kv, kv.Version); err != nil { + version := kv.Version + kv.Version = m.restoreTs + if err := toBuffer(kv, version); err != nil { return err } } @@ -398,8 +400,10 @@ func (m *mapper) processReqCh(ctx context.Context) error { kv.StreamId = 0 // Schema and type keys are not stored in an intermediate format so their // value can be written as is. + version := kv.Version + kv.Version = m.restoreTs kv.Key = restoreKey - if err := toBuffer(kv, kv.Version); err != nil { + if err := toBuffer(kv, version); err != nil { return err }