From fc5197551ca400fd39281364bec5c7bf807a7df3 Mon Sep 17 00:00:00 2001 From: Wenqi Mou Date: Wed, 12 Mar 2025 06:47:04 -0400 Subject: [PATCH] br: fix pitr meta kv fail to parse in during table filter code refactor (#60023) close pingcap/tidb#57613, close pingcap/tidb#60024 --- br/pkg/stream/table_mapping.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/br/pkg/stream/table_mapping.go b/br/pkg/stream/table_mapping.go index 140aaccad8..6db21b1cb1 100644 --- a/br/pkg/stream/table_mapping.go +++ b/br/pkg/stream/table_mapping.go @@ -515,10 +515,12 @@ func ExtractValue(e *kv.Entry, cf string) ([]byte, error) { if err := rawWriteCFValue.ParseFrom(e.Value); err != nil { return nil, errors.Trace(err) } - if rawWriteCFValue.HasShortValue() { - return rawWriteCFValue.shortValue, nil + // have to be consistent with rewrite_meta_rawkv.go otherwise value like p/xxx/xxx will fall through + // and fail to parse + if rawWriteCFValue.IsDelete() || rawWriteCFValue.IsRollback() || !rawWriteCFValue.HasShortValue() { + return nil, nil } - return nil, nil + return rawWriteCFValue.GetShortValue(), nil default: return nil, errors.Errorf("unsupported column family: %s", cf) }