diff --git a/api/connection.go b/api/connection.go index 0a45b66aa..643767058 100644 --- a/api/connection.go +++ b/api/connection.go @@ -30,7 +30,6 @@ type Connection interface { CreateObject(bucketName string, fn func(uint64) (int, interface{})) error CreateObjectWithId(bucketName string, id int, obj interface{}) error CreateObjectWithStringId(bucketName string, id []byte, obj interface{}) error - CreateObjectWithSetSequence(bucketName string, id int, obj interface{}) error GetAll(bucketName string, obj interface{}, append func(o interface{}) (interface{}, error)) error GetAllWithJsoniter(bucketName string, obj interface{}, append func(o interface{}) (interface{}, error)) error ConvertToKey(v int) []byte diff --git a/api/database/boltdb/db.go b/api/database/boltdb/db.go index a930c97f0..7fc0b8832 100644 --- a/api/database/boltdb/db.go +++ b/api/database/boltdb/db.go @@ -325,27 +325,6 @@ func (connection *DbConnection) CreateObjectWithStringId(bucketName string, id [ }) } -// CreateObjectWithSetSequence creates a new object in the bucket, using the specified id, and sets the bucket sequence -// avoid this :) -func (connection *DbConnection) CreateObjectWithSetSequence(bucketName string, id int, obj interface{}) error { - return connection.Batch(func(tx *bolt.Tx) error { - bucket := tx.Bucket([]byte(bucketName)) - - // We manually manage sequences for schedules - err := bucket.SetSequence(uint64(id)) - if err != nil { - return err - } - - data, err := connection.MarshalObject(obj) - if err != nil { - return err - } - - return bucket.Put(connection.ConvertToKey(id), data) - }) -} - func (connection *DbConnection) GetAll(bucketName string, obj interface{}, append func(o interface{}) (interface{}, error)) error { err := connection.View(func(tx *bolt.Tx) error { bucket := tx.Bucket([]byte(bucketName)) diff --git a/api/dataservices/endpoint/endpoint.go b/api/dataservices/endpoint/endpoint.go index 9ecc4ee21..a798d7c97 100644 --- a/api/dataservices/endpoint/endpoint.go +++ b/api/dataservices/endpoint/endpoint.go @@ -83,7 +83,7 @@ func (service *Service) Endpoints() ([]portainer.Endpoint, error) { // CreateEndpoint assign an ID to a new environment(endpoint) and saves it. func (service *Service) Create(endpoint *portainer.Endpoint) error { - return service.connection.CreateObjectWithSetSequence(BucketName, int(endpoint.ID), endpoint) + return service.connection.CreateObjectWithId(BucketName, int(endpoint.ID), endpoint) } // GetNextIdentifier returns the next identifier for an environment(endpoint). diff --git a/api/dataservices/schedule/schedule.go b/api/dataservices/schedule/schedule.go index d1cdb800e..f338938b2 100644 --- a/api/dataservices/schedule/schedule.go +++ b/api/dataservices/schedule/schedule.go @@ -108,7 +108,7 @@ func (service *Service) SchedulesByJobType(jobType portainer.JobType) ([]portain // Create assign an ID to a new schedule and saves it. func (service *Service) CreateSchedule(schedule *portainer.Schedule) error { - return service.connection.CreateObjectWithSetSequence(BucketName, int(schedule.ID), schedule) + return service.connection.CreateObjectWithId(BucketName, int(schedule.ID), schedule) } // GetNextIdentifier returns the next identifier for a schedule. diff --git a/api/dataservices/stack/stack.go b/api/dataservices/stack/stack.go index 92ea0dd5e..6e697930a 100644 --- a/api/dataservices/stack/stack.go +++ b/api/dataservices/stack/stack.go @@ -134,7 +134,7 @@ func (service *Service) GetNextIdentifier() int { // CreateStack creates a new stack. func (service *Service) Create(stack *portainer.Stack) error { - return service.connection.CreateObjectWithSetSequence(BucketName, int(stack.ID), stack) + return service.connection.CreateObjectWithId(BucketName, int(stack.ID), stack) } // UpdateStack updates a stack.