@@ -574,11 +574,6 @@ func runBatchDefineCmd(d *datadriven.TestData, b *Batch) error {
574574}
575575
576576func runBuildRemoteCmd (td * datadriven.TestData , d * DB , storage remote.Storage ) error {
577- b := d .NewIndexedBatch ()
578- if err := runBatchDefineCmd (td , b ); err != nil {
579- return err
580- }
581-
582577 if len (td .CmdArgs ) < 1 {
583578 return errors .New ("build <path>: argument missing" )
584579 }
@@ -605,55 +600,10 @@ func runBuildRemoteCmd(td *datadriven.TestData, d *DB, storage remote.Storage) e
605600 return err
606601 }
607602 w := sstable .NewWriter (objstorageprovider .NewRemoteWritable (f ), writeOpts )
608- iter := b .newInternalIter (nil )
609- for kv := iter .First (); kv != nil ; kv = iter .Next () {
610- tmp := kv .K
611- tmp .SetSeqNum (0 )
612- if err := w .Raw ().Add (tmp , kv .InPlaceValue (), false ); err != nil {
613- return err
614- }
615- }
616- if err := iter .Close (); err != nil {
603+ if err := sstable .ParseTestSST (w .Raw (), td .Input ); err != nil {
617604 return err
618605 }
619606
620- if rdi := b .newRangeDelIter (nil , math .MaxUint64 ); rdi != nil {
621- s , err := rdi .First ()
622- for ; s != nil && err == nil ; s , err = rdi .Next () {
623- if err = w .DeleteRange (s .Start , s .End ); err != nil {
624- return err
625- }
626- }
627- if err != nil {
628- return err
629- }
630- }
631-
632- if rki := b .newRangeKeyIter (nil , math .MaxUint64 ); rki != nil {
633- s , err := rki .First ()
634- for ; s != nil ; s , err = rki .Next () {
635- for _ , k := range s .Keys {
636- var err error
637- switch k .Kind () {
638- case base .InternalKeyKindRangeKeySet :
639- err = w .RangeKeySet (s .Start , s .End , k .Suffix , k .Value )
640- case base .InternalKeyKindRangeKeyUnset :
641- err = w .RangeKeyUnset (s .Start , s .End , k .Suffix )
642- case base .InternalKeyKindRangeKeyDelete :
643- err = w .RangeKeyDelete (s .Start , s .End )
644- default :
645- panic ("not a range key" )
646- }
647- if err != nil {
648- return err
649- }
650- }
651- }
652- if err != nil {
653- return err
654- }
655- }
656-
657607 return w .Close ()
658608}
659609
0 commit comments