refactor file transfer

Author: Thejas-bhat

index/scorch/scorch.go

@@ -15,10 +15,8 @@
 package scorch
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -1212,88 +1210,6 @@ func (s *Scorch) CopyReader() index.CopyReader {
 	return rv
 }
 
-func (s *Scorch) UpdateFileInBolt(key []byte, value []byte) error {
-	tx, err := s.rootBolt.Begin(true)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			_ = tx.Rollback()
-		}
-	}()
-
-	snapshotsBucket, err := tx.CreateBucketIfNotExists(util.BoltSnapshotsBucket)
-	if err != nil {
-		return err
-	}
-
-	// currently this is specific to centroid index file update
-	if bytes.Equal(key, util.BoltCentroidIndexKey) {
-		// todo: guard against duplicate updates
-		centroidBucket, err := snapshotsBucket.CreateBucketIfNotExists(util.BoltCentroidIndexKey)
-		if err != nil {
-			return err
-		}
-		if centroidBucket == nil {
-			return fmt.Errorf("centroid bucket not found")
-		}
-		existingValue := centroidBucket.Get(util.BoltPathKey)
-		if existingValue != nil {
-			return fmt.Errorf("key already exists %v %v", s.path, string(existingValue))
-		}
-
-		err = centroidBucket.Put(util.BoltPathKey, value)
-		if err != nil {
-			return err
-		}
-	}
-
-	err = tx.Commit()
-	if err != nil {
-		return err
-	}
-
-	err = s.rootBolt.Sync()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// CopyFile copies a specific file to a destination directory which has an access to a bleve index
-// doing a io.Copy() isn't enough because the file needs to be tracked in bolt file as well
-func (s *Scorch) CopyFile(file string, d index.IndexDirectory) error {
-	s.rootLock.Lock()
-	defer s.rootLock.Unlock()
-
-	// this code is currently specific to centroid index file but is future proofed for other files
-	// to be updated in the dest's bolt
-	if strings.HasSuffix(file, "centroid_index") {
-		// centroid index file - this is outside the snapshots domain so the bolt update is different
-		err := d.UpdateFileInBolt(util.BoltCentroidIndexKey, []byte(file))
-		if err != nil {
-			return fmt.Errorf("error updating dest index bolt: %w", err)
-		}
-	}
-
-	dest, err := d.GetWriter(filepath.Join("store", file))
-	if err != nil {
-		return err
-	}
-
-	source, err := os.Open(filepath.Join(s.path, file))
-	if err != nil {
-		return err
-	}
-
-	defer source.Close()
-	defer dest.Close()
-	_, err = io.Copy(dest, source)
-	return err
-}
-
 // external API to fire a scorch event (EventKindIndexStart) externally from bleve
 func (s *Scorch) FireIndexEvent() {
 	s.fireEvent(EventKindIndexStart, 0)

index_impl.go

@@ -1432,38 +1432,6 @@ func (m *searchHitSorter) Less(i, j int) bool {
 	return c < 0
 }
 
-func (i *indexImpl) CopyFile(file string, d index.IndexDirectory) (err error) {
-	i.mutex.RLock()
-	defer i.mutex.RUnlock()
-
-	if !i.open {
-		return ErrorIndexClosed
-	}
-
-	copyIndex, ok := i.i.(index.IndexFileCopyable)
-	if !ok {
-		return fmt.Errorf("index implementation does not support copy reader")
-	}
-
-	return copyIndex.CopyFile(file, d)
-}
-
-func (i *indexImpl) UpdateFileInBolt(key []byte, value []byte) error {
-	i.mutex.RLock()
-	defer i.mutex.RUnlock()
-
-	if !i.open {
-		return ErrorIndexClosed
-	}
-
-	copyIndex, ok := i.i.(index.IndexFileCopyable)
-	if !ok {
-		return fmt.Errorf("index implementation does not support file copy")
-	}
-
-	return copyIndex.UpdateFileInBolt(key, value)
-}
-
 // CopyTo (index.Directory, filter)
 func (i *indexImpl) CopyTo(d index.Directory) (err error) {
 	i.mutex.RLock()