kvserver: remove rangeKeysInOrder param to msstw

Author: tbg

pkg/kv/kvserver/kv_snapshot_strategy.go

@@ -118,8 +118,7 @@ func (kvSS *kvBatchSnapshotStrategy) Receive(
 	// The last key range is the user key span.
 	localRanges := keyRanges[:len(keyRanges)-1]
 	mvccRange := keyRanges[len(keyRanges)-1]
-	msstw, err := newMultiSSTWriter(ctx, kvSS.st, kvSS.scratch, localRanges, mvccRange, kvSS.sstChunkSize,
-		true /* rangeKeysInOrder */)
+	msstw, err := newMultiSSTWriter(ctx, kvSS.st, kvSS.scratch, localRanges, mvccRange, kvSS.sstChunkSize)
 	if err != nil {
 		return noSnap, err
 	}

pkg/kv/kvserver/multi_sst_writer.go

@@ -70,7 +70,6 @@ func newMultiSSTWriter(
 	localKeySpans []roachpb.Span,
 	mvccKeySpan roachpb.Span,
 	sstChunkSize int64,
-	rangeKeysInOrder bool,
 ) (*multiSSTWriter, error) {
 	msstw := &multiSSTWriter{
 		st:            st,
@@ -82,15 +81,7 @@ func newMultiSSTWriter(
 			End:   storage.EngineKey{Key: mvccKeySpan.EndKey},
 		}},
 		sstChunkSize: sstChunkSize,
-	}
-	if rangeKeysInOrder {
-		// We disable snapshot sstable splitting unless the sender has
-		// specified in its snapshot header that it is sending range keys in
-		// key order alongside point keys, as opposed to sending them at the end
-		// of the snapshot. This is necessary to efficiently produce fragmented
-		// snapshot sstables, as otherwise range keys will arrive out-of-order
-		// wrt. point keys.
-		msstw.maxSSTSize = MaxSnapshotSSTableSize.Get(&st.SV)
+		maxSSTSize:   MaxSnapshotSSTableSize.Get(&st.SV),
 	}
 	msstw.rangeKeyFrag = rangekey.Fragmenter{
 		Cmp:    storage.EngineComparer.Compare,

pkg/kv/kvserver/replica_sst_snapshot_storage_test.go

@@ -298,10 +298,7 @@ func testMultiSSTWriterInitSSTInner(t *testing.T, interesting bool) {
 	// Disabling columnar blocks causes stats changes.
 	storage.ColumnarBlocksEnabled.Override(context.Background(), &st.SV, true)
 
-	msstw, err := newMultiSSTWriter(
-		ctx, st, scratch, localSpans, mvccSpan, 0,
-		true, /* rangeKeysInOrder */
-	)
+	msstw, err := newMultiSSTWriter(ctx, st, scratch, localSpans, mvccSpan, 0)
 	require.NoError(t, err)
 
 	var buf redact.StringBuilder
@@ -430,7 +427,7 @@ func TestMultiSSTWriterSize(t *testing.T) {
 	mvccSpan := keySpans[len(keySpans)-1]
 
 	// Make a reference msstw with the default size.
-	referenceMsstw, err := newMultiSSTWriter(ctx, settings, ref, localSpans, mvccSpan, 0, true /* rangeKeysInOrder */)
+	referenceMsstw, err := newMultiSSTWriter(ctx, settings, ref, localSpans, mvccSpan, 0)
 	require.NoError(t, err)
 	require.Equal(t, int64(0), referenceMsstw.dataSize)
 	now := timeutil.Now().UnixNano()
@@ -462,7 +459,7 @@ func TestMultiSSTWriterSize(t *testing.T) {
 
 	MaxSnapshotSSTableSize.Override(ctx, &settings.SV, 100)
 
-	multiSSTWriter, err := newMultiSSTWriter(ctx, settings, scratch, localSpans, mvccSpan, 0, true)
+	multiSSTWriter, err := newMultiSSTWriter(ctx, settings, scratch, localSpans, mvccSpan, 0)
 	require.NoError(t, err)
 	require.Equal(t, int64(0), multiSSTWriter.dataSize)
 
@@ -544,7 +541,7 @@ func TestMultiSSTWriterAddLastSpan(t *testing.T) {
 	localSpans := keySpans[:len(keySpans)-1]
 	mvccSpan := keySpans[len(keySpans)-1]
 
-	msstw, err := newMultiSSTWriter(ctx, cluster.MakeTestingClusterSettings(), scratch, localSpans, mvccSpan, 0, true)
+	msstw, err := newMultiSSTWriter(ctx, cluster.MakeTestingClusterSettings(), scratch, localSpans, mvccSpan, 0)
 	require.NoError(t, err)
 	testKey := storage.MVCCKey{Key: roachpb.RKey("d1").AsRawKey(), Timestamp: hlc.Timestamp{WallTime: 1}}
 	testEngineKey, _ := storage.DecodeEngineKey(storage.EncodeMVCCKey(testKey))