added optional allow empty commits #7186
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8634cd4
to
bfdb40a
Compare
E2E Test Results - DynamoDB Local - Local Block Adapter |
8b64a80
to
991b053
Compare
johnnyaug
reviewed
Dec 24, 2023
pkg/graveler/graveler.go
Outdated
| @@ -436,6 +436,7 @@ type CommitParams struct { | |||
| Metadata Metadata | |||
| // SourceMetaRange - If exists, use it directly. Fail if branch has uncommitted changes | |||
| SourceMetaRange *MetaRangeID | |||
| AllowEmpty *bool | |||
johnnyaug
reviewed
Dec 24, 2023
| @@ -558,6 +558,10 @@ components: | |||
| description: set date to override creation date in the commit (Unix Epoch in seconds) | |||
| type: integer | |||
| format: int64 | |||
| allow_empty: | |||
| description: sets whether a commit can contain no changes | |||
There was a problem hiding this comment.
Suggested change
| description: sets whether a commit can contain no changes | |
| description: allow commits without any changes |
7027552
to
95557ee
Compare
c1ba509
to
138bfd7
Compare
|
♻️ PR Preview b5edb3e has been successfully destroyed since this PR has been closed.
🤖 By surge-preview |
138bfd7
to
fdf3d30
Compare
fdf3d30
to
aaf97e6
Compare
nopcoder
suggested changes
Jan 3, 2024
pkg/api/controller.go
Outdated
| @@ -2520,7 +2520,7 @@ func (c *Controller) Commit(w http.ResponseWriter, r *http.Request, body apigen. | |||
| metadata = body.Metadata.AdditionalProperties | |||
| } | |||
|
|
|||
| newCommit, err := c.Catalog.Commit(ctx, repository, branch, body.Message, user.Committer(), metadata, body.Date, params.SourceMetarange, graveler.WithForce(swag.BoolValue(body.Force))) | |||
| newCommit, err := c.Catalog.Commit(ctx, repository, branch, body.Message, user.Committer(), metadata, body.Date, params.SourceMetarange, body.AllowEmpty, graveler.WithForce(swag.BoolValue(body.Force))) | |||
There was a problem hiding this comment.
use swag.BoolValue to pass allow empty to the underlying layer. we no longer need pointer to represent optional.
pkg/catalog/catalog.go
Outdated
| @@ -1110,7 +1110,7 @@ func (c *Catalog) ResetEntries(ctx context.Context, repositoryID string, branch | |||
| return c.Store.ResetPrefix(ctx, repository, branchID, keyPrefix, opts...) | |||
| } | |||
|
|
|||
| func (c *Catalog) Commit(ctx context.Context, repositoryID, branch, message, committer string, metadata Metadata, date *int64, sourceMetarange *string, opts ...graveler.SetOptionsFunc) (*CommitLog, error) { | |||
| func (c *Catalog) Commit(ctx context.Context, repositoryID, branch, message, committer string, metadata Metadata, date *int64, sourceMetarange *string, allowEmpty *bool, opts ...graveler.SetOptionsFunc) (*CommitLog, error) { | |||
There was a problem hiding this comment.
Think we should refactor the signature - can be in a different pr and just pass commit params/options same struct layout as we pass to graveler so it will not stay a long list of arguments. When using struct the default value of each parameter will represent the default behaviour and the caller will not pass pointers to date and source metarange.
nopcoder
approved these changes
Jan 3, 2024
|
@lynnro314 Can we add this to Python Wrapper also? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #7042