Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable12] touch opertation on object storage, don't create the file cache entry to early #7207

Merged
merged 1 commit into from
Nov 17, 2017
Merged

[stable12] touch opertation on object storage, don't create the file cache entry to early #7207

merged 1 commit into from
Nov 17, 2017

Conversation

schiessle
Copy link
Member

backport of #7206

@schiessle
only create the file cache entry after the empty file was created suc…
83ef3d2 
…cessfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@schiessle schiessle added the 3. to review Waiting for reviews label Nov 17, 2017
@schiessle schiessle added this to the Nextcloud 12.0.4 milestone Nov 17, 2017
@schiessle schiessle mentioned this pull request Nov 17, 2017
Merged
rullzer
rullzer approved these changes Nov 17, 2017
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@codecov
Copy link

codecov bot commented Nov 17, 2017 •
edited
Loading

Codecov Report

Merging #7207 into stable12 will increase coverage by 23%.
The diff coverage is 80%.

@@              Coverage Diff               @@
##             stable12    #7207      +/-   ##
==============================================
+ Coverage       30.75%   53.76%     +23%     
  Complexity      22589    22589              
==============================================
  Files            1384     1384              
  Lines           86664    86663       -1     
  Branches         1329     1329              
==============================================
+ Hits            26656    46595   +19939     
+ Misses          60008    40068   -19940
Impacted Files Coverage Δ Complexity Δ
...b/private/Files/ObjectStore/ObjectStoreStorage.php 66.94% <80%> (+66.94%) 74 <0> (ø) ⬇️
lib/private/Files/Storage/DAV.php 64.81% <0%> (+0.21%) 161% <0%> (ø) ⬇️
lib/private/Files/Stream/Encryption.php 75% <0%> (+0.46%) 53% <0%> (ø) ⬇️
lib/private/Installer.php 51.42% <0%> (+0.71%) 74% <0%> (ø) ⬇️
lib/private/Setup.php 12.39% <0%> (+0.85%) 50% <0%> (ø) ⬇️
lib/public/AppFramework/Db/Mapper.php 99.12% <0%> (+0.87%) 30% <0%> (ø) ⬇️
lib/private/legacy/image.php 38.91% <0%> (+0.88%) 212% <0%> (ø) ⬇️
lib/private/Group/Group.php 87.23% <0%> (+1.06%) 35% <0%> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 91.93% <0%> (+1.61%) 29% <0%> (ø) ⬇️
apps/dav/lib/CardDAV/PhotoCache.php 1.75% <0%> (+1.75%) 39% <0%> (ø) ⬇️
... and 367 more

@schiessle schiessle merged commit d9cea2f into stable12 Nov 17, 2017
@schiessle schiessle deleted the fix-object-storage-touch-12 branch November 17, 2017 13:48
@MorrisJobke MorrisJobke mentioned this pull request Nov 20, 2017
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@icewind1991 icewind1991 icewind1991 approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
Nextcloud 12.0.4
Development

Successfully merging this pull request may close these issues.
3 participants
@schiessle @rullzer @icewind1991