beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactor

Browse source
This commit is contained in:
Neeraj Gupta 2024-05-16 12:49:23 +05:30
parent e0738db6ae
commit 4cc866fa12
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/pkg/controller/embedding/controller.go
View file

@ -44,7 +44,6 @@ type Controller struct {
CollectionRepo *repo.CollectionRepository CollectionRepo *repo.CollectionRepository
HostName string HostName string
cleanupCronRunning bool cleanupCronRunning bool
derivedStorageS3Client *s3.S3
derivedStorageDataCenter string derivedStorageDataCenter string
areDerivedAndHotBucketSame bool areDerivedAndHotBucketSame bool
} }
@ -60,7 +59,6 @@ func New(repo *embedding.Repository, accessCtrl access.Controller, objectCleanup
FileRepo: fileRepo, FileRepo: fileRepo,
CollectionRepo: collectionRepo, CollectionRepo: collectionRepo,
HostName: hostName, HostName: hostName,
derivedStorageS3Client: s3Config.GetDerivedStorageS3Client(),
derivedStorageDataCenter: s3Config.GetDerivedStorageDataCenter(), derivedStorageDataCenter: s3Config.GetDerivedStorageDataCenter(),
areDerivedAndHotBucketSame: s3Config.GetDerivedStorageDataCenter() == s3Config.GetDerivedStorageDataCenter(), areDerivedAndHotBucketSame: s3Config.GetDerivedStorageDataCenter() == s3Config.GetDerivedStorageDataCenter(),
} }
@ -245,7 +243,8 @@ func (c *Controller) getEmbeddingObjectsParallel(objectKeys []string) ([]ente.Em
var wg sync.WaitGroup var wg sync.WaitGroup
var errs []error var errs []error
embeddingObjects := make([]ente.EmbeddingObject, len(objectKeys)) embeddingObjects := make([]ente.EmbeddingObject, len(objectKeys))
downloader := s3manager.NewDownloaderWithClient(c.derivedStorageS3Client) s3Client := c.S3Config.GetS3Client(c.derivedStorageDataCenter)
downloader := s3manager.NewDownloaderWithClient(&s3Client)
for i, objectKey := range objectKeys { for i, objectKey := range objectKeys {
wg.Add(1) wg.Add(1)
@ -282,7 +281,8 @@ type embeddingObjectResult struct {
func (c *Controller) getEmbeddingObjectsParallelV2(userID int64, dbEmbeddingRows []ente.Embedding) ([]embeddingObjectResult, error) { func (c *Controller) getEmbeddingObjectsParallelV2(userID int64, dbEmbeddingRows []ente.Embedding) ([]embeddingObjectResult, error) {
var wg sync.WaitGroup var wg sync.WaitGroup
embeddingObjects := make([]embeddingObjectResult, len(dbEmbeddingRows)) embeddingObjects := make([]embeddingObjectResult, len(dbEmbeddingRows))
downloader := s3manager.NewDownloaderWithClient(c.derivedStorageS3Client) s3Client := c.S3Config.GetS3Client(c.derivedStorageDataCenter)
downloader := s3manager.NewDownloaderWithClient(&s3Client)
for i, dbEmbeddingRow := range dbEmbeddingRows { for i, dbEmbeddingRow := range dbEmbeddingRows {
wg.Add(1) wg.Add(1)