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.

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

Already on GitHub? Sign in to your account

[stable12] Fix seeking on object storage #7082

Merged
merged 1 commit into from Nov 6, 2017

Conversation

Projects
None yet
2 participants
@MorrisJobke
Member

MorrisJobke commented Nov 6, 2017

Backport of #6974

Tested and works fine here 馃憤

Fix seeking on object storage
Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@rullzer

rullzer approved these changes Nov 6, 2017

@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke

MorrisJobke Nov 6, 2017

Member

A lot of weird failures related to a codecov 504 return code. I triggered the tests again

Member

MorrisJobke commented Nov 6, 2017

A lot of weird failures related to a codecov 504 return code. I triggered the tests again

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Nov 6, 2017

Codecov Report

Merging #7082 into stable12 will decrease coverage by <.01%.
The diff coverage is 0%.

@@              Coverage Diff               @@
##             stable12    #7082      +/-   ##
==============================================
- Coverage       53.75%   53.74%   -0.01%     
- Complexity      22579    22586       +7     
==============================================
  Files            1384     1384              
  Lines           86628    86639      +11     
  Branches         1329     1329              
==============================================
- Hits            46569    46567       -2     
- Misses          40059    40072      +13
Impacted Files Coverage 螖 Complexity 螖
lib/private/Files/View.php 83.81% <0%> (-0.96%) 371 <0> (+7)
core/js/js.js 61.27% <0%> (-0.56%) 0% <0%> (酶)
lib/private/Server.php 84.8% <0%> (+0.12%) 121% <0%> (酶) 猬囷笍
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (酶) 猬囷笍
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (酶) 猬囷笍

codecov bot commented Nov 6, 2017

Codecov Report

Merging #7082 into stable12 will decrease coverage by <.01%.
The diff coverage is 0%.

@@              Coverage Diff               @@
##             stable12    #7082      +/-   ##
==============================================
- Coverage       53.75%   53.74%   -0.01%     
- Complexity      22579    22586       +7     
==============================================
  Files            1384     1384              
  Lines           86628    86639      +11     
  Branches         1329     1329              
==============================================
- Hits            46569    46567       -2     
- Misses          40059    40072      +13
Impacted Files Coverage 螖 Complexity 螖
lib/private/Files/View.php 83.81% <0%> (-0.96%) 371 <0> (+7)
core/js/js.js 61.27% <0%> (-0.56%) 0% <0%> (酶)
lib/private/Server.php 84.8% <0%> (+0.12%) 121% <0%> (酶) 猬囷笍
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (酶) 猬囷笍
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (酶) 猬囷笍

@MorrisJobke MorrisJobke merged commit 3cc7c03 into stable12 Nov 6, 2017

1 of 3 checks passed

codecov/patch 0% of diff hit (target 53.75%)
Details
codecov/project 53.74% (-0.01%) compared to f9e29d0
Details
continuous-integration/drone/pr the build was successful
Details

@MorrisJobke MorrisJobke deleted the 12-6974 branch Nov 6, 2017

@MorrisJobke MorrisJobke referenced this pull request Nov 20, 2017

Merged

12.0.4 RC #7225

1 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment