Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Jan 14, 2022

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #30531

In #28774 we disabled the
caching for the groupfolder application since it worked due to the fact
that in groupfolders, getFileIds could be called with the same $cacheId
and path for actually different groupfolders.

This revert this change and instead add the folderId from the
groupFolder to the cacheId. This solve the issue of the uniqueness of
the cacheId inside GroupFolder. Downside is that we introduce
groupfolder specific implementation inside the server repo.

The seconf optimization is to not consider paths starting with
__groupfolders in executeCheck. This is due to the fact that files in
the groupfolder application call two times executeCheck one time with
the url __groupfolder/<folderId>/<path> and the other time with <path>.
The first time will always return an empty systemTags array while the
second call will return the correct system tags.

Signed-off-by: Carl Schwan <[email protected]>
Don't call twice $cache->getId

Signed-off-by: Carl Schwan <[email protected]>
@st3iny
Copy link
Member

st3iny commented Jan 14, 2022

Do we still backport to stable20? I thought only the last 3 version are targets for backports (21 - 23).

@CarlSchwan
Copy link
Member

Do we still backport to stable20? I thought only the last 3 version are targets for backports (21 - 23).

For some specific change, we still do e.g. #30668

@skjnldsv skjnldsv added the 3. to review Waiting for reviews label Jan 17, 2022
@skjnldsv
Copy link
Member

php cs is not happy

@nickvergessen nickvergessen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jan 17, 2022
@nickvergessen
Copy link
Member

php cs is not happy

The backport is heavily broken, half of the diff is missing.

@CarlSchwan CarlSchwan force-pushed the backport/30531/stable20 branch from 9636384 to ab01174 Compare January 17, 2022 13:29
Signed-off-by: Carl Schwan <[email protected]>
@CarlSchwan CarlSchwan force-pushed the backport/30531/stable20 branch from ab01174 to e5c54bd Compare January 17, 2022 13:39
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81 PVince81 merged commit 900d68e into stable20 Jan 18, 2022
@PVince81 PVince81 deleted the backport/30531/stable20 branch January 18, 2022 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants