Add interface to allow "more direct" access to the filecache without direct db #44044
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
icewind1991
force-pushed
the
remove-filecache-joins
branch
3 times, most recently
from
17ea359
to
39b1c7c
Compare
icewind1991
force-pushed
the
remove-filecache-joins
branch
from
39b1c7c
to
5f5b0ff
Compare
icewind1991
force-pushed
the
remove-filecache-joins
branch
2 times, most recently
from
a14aa3a
to
224966c
Compare
45 tasks
icewind1991
force-pushed
the
remove-filecache-joins
branch
2 times, most recently
from
19ff9e6
to
dc9729e
Compare
icewind1991
force-pushed
the
remove-filecache-joins
branch
3 times, most recently
from
f6dc6a2
to
3dc3ee4
Compare
icewind1991
changed the title
icewind1991
requested review from
a team,
Altahrim,
artonge and
Fenn-CS
and removed request for
a team
icewind1991
force-pushed
the
remove-filecache-joins
branch
from
3dc3ee4
to
df7f85b
Compare
Merged
artonge
reviewed
Mar 25, 2024
Merged
come-nc
reviewed
Mar 25, 2024
| $qb->andWhere($qb->expr()->eq('f.storage', $qb->createNamedParameter($node->getMountPoint()->getNumericStorageId(), IQueryBuilder::PARAM_INT))); | ||
| if ($shallow) { | ||
| $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId(), IQueryBuilder::PARAM_INT))); | ||
| } else { | ||
| $qb->andWhere($qb->expr()->like('f.path', $qb->createNamedParameter($this->dbConnection->escapeLikeParameter($node->getInternalPath()) . '/%'))); | ||
| } | ||
| $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId()))); |
There was a problem hiding this comment.
What is this change about?
Comment on lines
+83
to
+85
| $shareManager->getSharesBy($user->getUID(), IShare::TYPE_USER), | ||
| $shareManager->getSharesBy($user->getUID(), IShare::TYPE_GROUP), | ||
| $shareManager->getSharesBy($user->getUID(), IShare::TYPE_ROOM), |
There was a problem hiding this comment.
Where did the $src parameter go?
| @@ -0,0 +1,100 @@ | |||
| <?php | |||
|
|
|||
| ->where($builder->expr()->eq('m.mount_point', $mountPoint)) | ||
| ->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY))); | ||
|
|
||
| $result = $query->execute(); | ||
|
|
||
| $results = []; | ||
| while ($row = $result->fetch()) { | ||
| $results[$row['user_id']] = $row['size']; | ||
| $results[$row['user_id']] = $this->getSizeForHomeStorage($row['storage_id']); |
There was a problem hiding this comment.
This means one query per row instead of getting all sizes in the first query, no?
| @@ -0,0 +1,76 @@ | |||
| <?php | |||
|
|
|||
… do direct db queries Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
icewind1991
force-pushed
the
remove-filecache-joins
branch
from
df7f85b
to
015988b
Compare
|
Let me split out the interface and changes to remove filecache joins to simplify reviewing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds and interface for the filecache that is lower level than the "normal" filesystem apis to allow for some more optimized retrieval of filecache data without requiring direct database access.
This will be needed when we start restricting direct database access to the filecache for sharding.
Pr comes with a few cases of replacing direct-db with the new interface.
extracted from #43576