From b8ae5f0b987dbacaaa5b2b486f1d6705fc67e40c Mon Sep 17 00:00:00 2001
From: Steven Danna <danna@cockroachlabs.com>
Date: Wed, 6 Mar 2024 09:30:35 +0000
Subject: [PATCH] storage: EncodeMVCCValueForExport does not inline

Epic: none
Release note: None
---
 pkg/sql/importer/import_mvcc_test.go | 5 +++--
 pkg/storage/mvcc_value.go            | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg/sql/importer/import_mvcc_test.go b/pkg/sql/importer/import_mvcc_test.go
index 9b979471fbcc..f1225b10576a 100644
--- a/pkg/sql/importer/import_mvcc_test.go
+++ b/pkg/sql/importer/import_mvcc_test.go
@@ -70,8 +70,9 @@ func TestMVCCValueHeaderImportEpoch(t *testing.T) {
 			Key:    startKey,
 			EndKey: endKey,
 		},
-		MVCCFilter: kvpb.MVCCFilter_All,
-		StartTime:  hlc.Timestamp{},
+		MVCCFilter:             kvpb.MVCCFilter_All,
+		StartTime:              hlc.Timestamp{},
+		IncludeMVCCValueHeader: true,
 	}
 
 	header := kvpb.Header{Timestamp: s.Clock().Now()}
diff --git a/pkg/storage/mvcc_value.go b/pkg/storage/mvcc_value.go
index 868a550f60c4..2803b7975ca9 100644
--- a/pkg/storage/mvcc_value.go
+++ b/pkg/storage/mvcc_value.go
@@ -136,8 +136,6 @@ func (v MVCCValue) SafeFormat(w redact.SafePrinter, _ rune) {
 
 // EncodeMVCCValueForExport strips fields from the MVCCValueHeader that
 // should not get exported out of the cluster.
-//
-//gcassert:inline
 func EncodeMVCCValueForExport(mvccValue MVCCValue) ([]byte, error) {
 	// Consider a fast path, where only the roachpb.Value gets exported.
 	// Currently, this only occurs if the value was not imported.