Extract multipart upload implementation from mvcc cataloger (#989)

treeverse · Dec 2, 2020 · a57e068 · a57e068
1 parent 3aa396f
commit a57e068
Show file tree

Hide file tree

Showing 23 changed files with 400 additions and 385 deletions.
diff --git a/api/handler.go b/api/handler.go
@@ -9,8 +9,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/treeverse/lakefs/parade"
-
 	openapierr "github.com/go-openapi/errors"
 	"github.com/go-openapi/loads"
 	"github.com/go-openapi/runtime/middleware"
@@ -25,6 +23,7 @@ import (
 	"github.com/treeverse/lakefs/dedup"
 	"github.com/treeverse/lakefs/httputil"
 	"github.com/treeverse/lakefs/logging"
+	"github.com/treeverse/lakefs/parade"
 	"github.com/treeverse/lakefs/retention"
 	_ "github.com/treeverse/lakefs/statik"
 	"github.com/treeverse/lakefs/stats"

diff --git a/catalog/cataloger.go b/catalog/cataloger.go
@@ -115,10 +115,6 @@ type Cataloger interface {
 
 	DedupReportChannel() chan *DedupReport
 
-	CreateMultipartUpload(ctx context.Context, repository, uploadID, path, physicalAddress string, creationTime time.Time) error
-	GetMultipartUpload(ctx context.Context, repository, uploadID string) (*MultipartUpload, error)
-	DeleteMultipartUpload(ctx context.Context, repository, uploadID string) error
-
 	Commit(ctx context.Context, repository, branch string, message string, committer string, metadata Metadata) (*CommitLog, error)
 	GetCommit(ctx context.Context, repository, reference string) (*CommitLog, error)
 	ListCommits(ctx context.Context, repository, branch string, fromReference string, limit int) ([]*CommitLog, bool, error)

diff --git a/catalog/errors.go b/catalog/errors.go
@@ -16,7 +16,6 @@ var (
 	ErrBranchNotFound              = fmt.Errorf("branch %w", db.ErrNotFound)
 	ErrCommitNotFound              = fmt.Errorf("commit %w", db.ErrNotFound)
 	ErrRepositoryNotFound          = fmt.Errorf("repository %w", db.ErrNotFound)
-	ErrMultipartUploadNotFound     = fmt.Errorf("multipart upload %w", db.ErrNotFound)
 	ErrEntryNotFound               = fmt.Errorf("entry %w", db.ErrNotFound)
 	ErrUnexpected                  = errors.New("unexpected error")
 	ErrReadEntryTimeout            = errors.New("read entry timeout")

diff --git a/catalog/model.go b/catalog/model.go
@@ -50,14 +50,6 @@ type Branch struct {
 	Name       string `db:"name"`
 }
 
-type MultipartUpload struct {
-	Repository      string    `db:"repository"`
-	UploadID        string    `db:"upload_id"`
-	Path            string    `db:"path"`
-	CreationDate    time.Time `db:"creation_date"`
-	PhysicalAddress string    `db:"physical_address"`
-}
-
 func (j Metadata) Value() (driver.Value, error) {
 	if j == nil {
 		return json.Marshal(struct{}{})

diff --git a/catalog/mvcc/cataloger_create_multipart_upload.go b/catalog/mvcc/cataloger_create_multipart_upload.go
diff --git a/catalog/mvcc/cataloger_create_multipart_upload_test.go b/catalog/mvcc/cataloger_create_multipart_upload_test.go
diff --git a/catalog/mvcc/cataloger_delete_multipart_upload.go b/catalog/mvcc/cataloger_delete_multipart_upload.go
diff --git a/catalog/mvcc/cataloger_delete_multipart_upload_test.go b/catalog/mvcc/cataloger_delete_multipart_upload_test.go
diff --git a/catalog/mvcc/cataloger_get_multipart_upload.go b/catalog/mvcc/cataloger_get_multipart_upload.go
diff --git a/catalog/mvcc/cataloger_get_multipart_upload_test.go b/catalog/mvcc/cataloger_get_multipart_upload_test.go
diff --git a/catalog/mvcc/validate.go b/catalog/mvcc/validate.go
@@ -74,12 +74,6 @@ func IsValidReference(reference string) bool {
 	return true
 }
 
-func ValidateUploadID(uploadID string) ValidateFunc {
-	return func() bool {
-		return IsNonEmptyString(uploadID)
-	}
-}
-
 func ValidatePath(name string) ValidateFunc {
 	return func() bool {
 		return IsNonEmptyString(name)

diff --git a/catalog/rocks/cataloger.go b/catalog/rocks/cataloger.go
@@ -2,7 +2,6 @@ package rocks
 
 import (
 	"context"
-	"time"
 
 	"github.com/treeverse/lakefs/catalog"
 	"github.com/treeverse/lakefs/logging"
@@ -306,18 +305,6 @@ func (c *cataloger) DedupReportChannel() chan *catalog.DedupReport {
 	return c.dummyDedupCh
 }
 
-func (c *cataloger) CreateMultipartUpload(ctx context.Context, repository string, uploadID string, path string, physicalAddress string, creationTime time.Time) error {
-	panic("not implemented") // TODO: Implement
-}
-
-func (c *cataloger) GetMultipartUpload(ctx context.Context, repository string, uploadID string) (*catalog.MultipartUpload, error) {
-	panic("not implemented") // TODO: Implement
-}
-
-func (c *cataloger) DeleteMultipartUpload(ctx context.Context, repository string, uploadID string) error {
-	panic("not implemented") // TODO: Implement
-}
-
 func (c *cataloger) Commit(ctx context.Context, repository string, branch string, message string, committer string, metadata catalog.Metadata) (*catalog.CommitLog, error) {
 	repositoryID, err := NewRepositoryID(repository)
 	if err != nil {