From 3485b3147565ccd1195f19257a5b98969eb0e9d5 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Thu, 16 May 2024 12:58:42 +0530 Subject: [PATCH] Clean up & new line --- .../migrations/86_add_dc_embedding.down.sql | 2 +- server/migrations/86_add_dc_embedding.up.sql | 2 +- server/pkg/controller/embedding/controller.go | 44 +++++++++---------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/server/migrations/86_add_dc_embedding.down.sql b/server/migrations/86_add_dc_embedding.down.sql index d42a539f9..d9c271d84 100644 --- a/server/migrations/86_add_dc_embedding.down.sql +++ b/server/migrations/86_add_dc_embedding.down.sql @@ -1,2 +1,2 @@ -- Add types for the new dcs that are introduced for the derived data -ALTER TABLE embeddings DROP COLUMN IF EXISTS datacenters; \ No newline at end of file +ALTER TABLE embeddings DROP COLUMN IF EXISTS datacenters; diff --git a/server/migrations/86_add_dc_embedding.up.sql b/server/migrations/86_add_dc_embedding.up.sql index eecb8c013..28f53d4d1 100644 --- a/server/migrations/86_add_dc_embedding.up.sql +++ b/server/migrations/86_add_dc_embedding.up.sql @@ -1,3 +1,3 @@ -- Add types for the new dcs that are introduced for the derived data ALTER TYPE s3region ADD VALUE 'wasabi-eu-central-2-derived'; -ALTER TABLE embeddings ADD COLUMN IF NOT EXISTS datacenters s3region[] default '{b2-eu-cen}'; \ No newline at end of file +ALTER TABLE embeddings ADD COLUMN IF NOT EXISTS datacenters s3region[] default '{b2-eu-cen}'; diff --git a/server/pkg/controller/embedding/controller.go b/server/pkg/controller/embedding/controller.go index ff8b87696..b62642f8f 100644 --- a/server/pkg/controller/embedding/controller.go +++ b/server/pkg/controller/embedding/controller.go @@ -34,33 +34,31 @@ const ( ) type Controller struct { - Repo *embedding.Repository - AccessCtrl access.Controller - ObjectCleanupController *controller.ObjectCleanupController - S3Config *s3config.S3Config - QueueRepo *repo.QueueRepository - TaskLockingRepo *repo.TaskLockRepository - FileRepo *repo.FileRepository - CollectionRepo *repo.CollectionRepository - HostName string - cleanupCronRunning bool - derivedStorageDataCenter string - areDerivedAndHotBucketSame bool + Repo *embedding.Repository + AccessCtrl access.Controller + ObjectCleanupController *controller.ObjectCleanupController + S3Config *s3config.S3Config + QueueRepo *repo.QueueRepository + TaskLockingRepo *repo.TaskLockRepository + FileRepo *repo.FileRepository + CollectionRepo *repo.CollectionRepository + HostName string + cleanupCronRunning bool + derivedStorageDataCenter string } func New(repo *embedding.Repository, accessCtrl access.Controller, objectCleanupController *controller.ObjectCleanupController, s3Config *s3config.S3Config, queueRepo *repo.QueueRepository, taskLockingRepo *repo.TaskLockRepository, fileRepo *repo.FileRepository, collectionRepo *repo.CollectionRepository, hostName string) *Controller { return &Controller{ - Repo: repo, - AccessCtrl: accessCtrl, - ObjectCleanupController: objectCleanupController, - S3Config: s3Config, - QueueRepo: queueRepo, - TaskLockingRepo: taskLockingRepo, - FileRepo: fileRepo, - CollectionRepo: collectionRepo, - HostName: hostName, - derivedStorageDataCenter: s3Config.GetDerivedStorageDataCenter(), - areDerivedAndHotBucketSame: s3Config.GetDerivedStorageDataCenter() == s3Config.GetDerivedStorageDataCenter(), + Repo: repo, + AccessCtrl: accessCtrl, + ObjectCleanupController: objectCleanupController, + S3Config: s3Config, + QueueRepo: queueRepo, + TaskLockingRepo: taskLockingRepo, + FileRepo: fileRepo, + CollectionRepo: collectionRepo, + HostName: hostName, + derivedStorageDataCenter: s3Config.GetDerivedStorageDataCenter(), } }