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.

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

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

Merged
merged 13 commits into from Sep 25, 2017
Merged

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

merged 13 commits into from Sep 25, 2017

Conversation

icewind1991
Copy link
Member

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.

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Sep 20, 2017
@icewind1991 icewind1991 added this to the Nextcloud 11.0.7 milestone Sep 20, 2017
rullzer
rullzer requested changes Sep 20, 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.

Failing tests

@codecov
Copy link

codecov bot commented Sep 21, 2017 •
edited

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

@MorrisJobke MorrisJobke mentioned this pull request Sep 21, 2017
Closed
icewind1991 and others added 10 commits September 22, 2017 15:47
@icewind1991
fix moving folders out of a cache jail
c5803ef 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Add repair step for invalid paths
0597d3f 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@MorrisJobke @icewind1991
Run repair step only once
daa2c86 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@icewind1991
adjust to moved repair step
f01bd93 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
use a generator instead of fetching all rows at once
19ce46e 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
chunk getting invalid paths and reuse queries
a96dd73 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Add MD5() to sqlite
ed6c612 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Add function builder to the query builder
f9eda27 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
rename fun to func
d132b80 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Fix version for repair step
f1b7dbf 
Signed-off-by: Robin Appelman <robin@icewind.nl>
nickvergessen and others added 3 commits September 22, 2017 16:04
@nickvergessen @icewind1991
Add brackets around concat statements so comparing the result works a…
12df8dd 
…s intended

Signed-off-by: Joas Schilling <coding@schilljs.com>
@icewind1991
Fix function builder
12b02e9 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
adjust test to new version
94fe6fd 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Copy link
Member Author

ci is finally happy

rullzer
rullzer approved these changes Sep 24, 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.

Fine by me

MorrisJobke
MorrisJobke approved these changes Sep 25, 2017
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke MorrisJobke merged commit 2c2d2e5 into stable11 Sep 25, 2017
@MorrisJobke MorrisJobke deleted the moveFromCache-from-shared-11 branch September 25, 2017 09:06
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

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@LukasReschke LukasReschke Awaiting requested review from LukasReschke

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@icewind1991 @rullzer @MorrisJobke @nickvergessen