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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11] fix moving folders out of a cache jail #6588

Merged
merged 13 commits into from Sep 25, 2017

Conversation

Projects
None yet
4 participants
@icewind1991
Member

icewind1991 commented Sep 20, 2017

Backport of #5424

I originally thought that the problem that this fixes was introduced by move optimizations in 12, thus the original backport was only to 12.

@rullzer

Failing tests

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Sep 21, 2017

Codecov Report

Merging #6588 into stable11 will increase coverage by 0.03%.
The diff coverage is 83.63%.

@@              Coverage Diff               @@
##             stable11    #6588      +/-   ##
==============================================
+ Coverage       57.43%   57.47%   +0.03%     
- Complexity      19475    19501      +26     
==============================================
  Files            1215     1220       +5     
  Lines           72710    72818     +108     
  Branches         1239     1239              
==============================================
+ Hits            41760    41850      +90     
- Misses          30950    30968      +18
Impacted Files Coverage Δ Complexity Δ
...ueryBuilder/FunctionBuilder/OCIFunctionBuilder.php 0% <0%> (ø) 1 <1> (?)
...ryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php 0% <0%> (ø) 1 <1> (?)
version.php 0% <0%> (ø) 0 <0> (ø) ⬇️
lib/private/Repair.php 23.65% <0%> (-0.26%) 21 <0> (ø)
lib/private/DB/SQLiteSessionInit.php 100% <100%> (ø) 4 <0> (ø) ⬇️
lib/private/Files/Cache/Wrapper/CacheJail.php 85.71% <100%> (+0.34%) 38 <1> (+1) ⬆️
...yBuilder/FunctionBuilder/SqliteFunctionBuilder.php 100% <100%> (ø) 1 <1> (?)
lib/private/DB/QueryBuilder/QueryBuilder.php 88.17% <50%> (-0.84%) 63 <0> (-1)
...B/QueryBuilder/FunctionBuilder/FunctionBuilder.php 72.72% <72.72%> (ø) 5 <5> (?)
lib/private/Repair/NC11/RepairInvalidPaths.php 93.75% <93.75%> (ø) 18 <18> (?)
... and 8 more

codecov bot commented Sep 21, 2017

Codecov Report

Merging #6588 into stable11 will increase coverage by 0.03%.
The diff coverage is 83.63%.

@@              Coverage Diff               @@
##             stable11    #6588      +/-   ##
==============================================
+ Coverage       57.43%   57.47%   +0.03%     
- Complexity      19475    19501      +26     
==============================================
  Files            1215     1220       +5     
  Lines           72710    72818     +108     
  Branches         1239     1239              
==============================================
+ Hits            41760    41850      +90     
- Misses          30950    30968      +18
Impacted Files Coverage Δ Complexity Δ
...ueryBuilder/FunctionBuilder/OCIFunctionBuilder.php 0% <0%> (ø) 1 <1> (?)
...ryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php 0% <0%> (ø) 1 <1> (?)
version.php 0% <0%> (ø) 0 <0> (ø) ⬇️
lib/private/Repair.php 23.65% <0%> (-0.26%) 21 <0> (ø)
lib/private/DB/SQLiteSessionInit.php 100% <100%> (ø) 4 <0> (ø) ⬇️
lib/private/Files/Cache/Wrapper/CacheJail.php 85.71% <100%> (+0.34%) 38 <1> (+1) ⬆️
...yBuilder/FunctionBuilder/SqliteFunctionBuilder.php 100% <100%> (ø) 1 <1> (?)
lib/private/DB/QueryBuilder/QueryBuilder.php 88.17% <50%> (-0.84%) 63 <0> (-1)
...B/QueryBuilder/FunctionBuilder/FunctionBuilder.php 72.72% <72.72%> (ø) 5 <5> (?)
lib/private/Repair/NC11/RepairInvalidPaths.php 93.75% <93.75%> (ø) 18 <18> (?)
... and 8 more

icewind1991 and others added some commits Jun 15, 2017

fix moving folders out of a cache jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
Add repair step for invalid paths
Signed-off-by: Robin Appelman <robin@icewind.nl>
Run repair step only once
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Add function builder to the query builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
Add MD5() to sqlite
Signed-off-by: Robin Appelman <robin@icewind.nl>
adjust to moved repair step
Signed-off-by: Robin Appelman <robin@icewind.nl>
use a generator instead of fetching all rows at once
Signed-off-by: Robin Appelman <robin@icewind.nl>
chunk getting invalid paths and reuse queries
Signed-off-by: Robin Appelman <robin@icewind.nl>
rename fun to func
Signed-off-by: Robin Appelman <robin@icewind.nl>
Fix version for repair step
Signed-off-by: Robin Appelman <robin@icewind.nl>
Add brackets around concat statements so comparing the result works a…
…s intended

Signed-off-by: Joas Schilling <coding@schilljs.com>
Fix function builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
adjust test to new version
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991

This comment has been minimized.

Show comment
Hide comment
@icewind1991

icewind1991 Sep 22, 2017

Member

ci is finally happy

Member

icewind1991 commented Sep 22, 2017

ci is finally happy

@rullzer

Fine by me

@MorrisJobke

Tested and works 👍

@MorrisJobke MorrisJobke merged commit 2c2d2e5 into stable11 Sep 25, 2017

3 checks passed

codecov/patch 83.63% of diff hit (target 57.43%)
Details
codecov/project 57.47% (+0.03%) compared to 406521a
Details
continuous-integration/drone/pr the build was successful
Details

@MorrisJobke MorrisJobke deleted the moveFromCache-from-shared-11 branch Sep 25, 2017

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