perf(external-share): Port to Entity and use snowflake Ids #55369

CarlSchwan · 2025-09-28T09:27:24Z

Port away from Files::buildNotExistingFileName
Use IUser and IGroup instead of plain string

Resolves: #

Summary

TODO

...

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)
Labels added where applicable (ex: bug/enhancement, 3. to review, feature component)
Milestone added for target branch/version (ex: 32.x for stable32)

lib/public/DB/IResult.php

apps/files_sharing/lib/Hooks.php

come-nc · 2025-09-28T20:06:06Z

According to integation tests you broke federated shares @CarlSchwan

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php

apps/files_sharing/lib/External/Manager.php

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php

apps/files_sharing/lib/External/Manager.php

icewind1991 · 2025-09-30T08:48:24Z

apps/files_sharing/lib/External/Manager.php

 	 * @return array|false
 	 */
-	protected function tryOCMEndPoint($remoteDomain, $token, $remoteId, $feedback) {
+	protected function tryOCMEndPoint(string $remoteDomain, string $token, string $remoteId, string $feedback) {


missing return type

icewind1991 · 2025-09-30T08:50:18Z

apps/files_sharing/lib/External/Manager.php

-				return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
+				try {
+					$response = $this->cloudFederationProviderManager->sendCloudNotification($remoteDomain, $notification);
+				} catch (OCMProviderException) {


maybe add this catch block around the switch and have it return false directly instead of relying on the $response staying null bahavior.

reverted the whole part, since I suspect this is breaking the integration test

still failing 😭

apps/files_sharing/lib/External/Manager.php

provokateurin · 2025-10-29T21:49:15Z

apps/files_sharing/openapi.json

These changes will break the clients

I don't really see a way around that. Using an int will fails as JSON doesn't support such big numbers, particularly on 32bits machine

It can already fail on 32 bit systems as we are using BIGINT as unique keys. PHP is using signed int so on 32 bit the maximum is 2^31.

The difference is now even "small" instances will have large IDs. On 32 bits servers, we know PHP fail to keep the right value with float(lose precision) and int (truncate).

I don't know if OpenAPI offers a way to represent large numbers, even for 32 bit systems.

Either way, this change is not allowed 🤷‍♀️

o

- Port away from Files::buildNotExistingFileName - Use IUser and IGroup instead of plain string Signed-off-by: Carl Schwan <[email protected]>

Move the functionality in the last place it is used OC\Files\Node\Folder Signed-off-by: Carl Schwan <[email protected]>

Signed-off-by: Carl Schwan <[email protected]>

This might fixes the test. Signed-off-by: Carl Schwan <[email protected]>

Signed-off-by: Carl Schwan <[email protected]>

This removes all the read after write and we don't need to queries all the time the same share in the same request anymore. Signed-off-by: Carl Schwan <[email protected]>

Signed-off-by: Carl Schwan <[email protected]>

CarlSchwan added this to the Nextcloud 33 milestone Sep 28, 2025

CarlSchwan self-assigned this Sep 28, 2025

CarlSchwan requested a review from a team as a code owner September 28, 2025 09:27

CarlSchwan requested review from Altahrim, icewind1991 and salmart-dev and removed request for a team September 28, 2025 09:27

CarlSchwan added the 3. to review Waiting for reviews label Sep 28, 2025

CarlSchwan requested a review from come-nc September 28, 2025 09:28

CarlSchwan force-pushed the carl/cleanup-external-manager branch 2 times, most recently from c3a408f to 0c9834a Compare September 28, 2025 10:01

CarlSchwan added technical debt ♻️ refactor Refactor code (not a bug fix, not a feature just refactoring) feature: sharing labels Sep 28, 2025

come-nc reviewed Sep 28, 2025

View reviewed changes

lib/public/DB/IResult.php Outdated Show resolved Hide resolved

CarlSchwan force-pushed the carl/cleanup-external-manager branch from 0c9834a to 4b5ed3f Compare September 28, 2025 10:20

come-nc approved these changes Sep 28, 2025

View reviewed changes

CarlSchwan force-pushed the carl/cleanup-external-manager branch from 4b5ed3f to 853ea64 Compare September 28, 2025 10:54

Altahrim approved these changes Sep 28, 2025

View reviewed changes

apps/files_sharing/lib/Hooks.php Show resolved Hide resolved

CarlSchwan force-pushed the carl/cleanup-external-manager branch 2 times, most recently from 04fd1d0 to 05935e0 Compare September 29, 2025 10:00

come-nc reviewed Sep 29, 2025

View reviewed changes

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php Outdated Show resolved Hide resolved

apps/files_sharing/lib/External/Manager.php Outdated Show resolved Hide resolved

CarlSchwan force-pushed the carl/cleanup-external-manager branch 2 times, most recently from c1e8ffc to 46c8632 Compare September 30, 2025 08:24

icewind1991 reviewed Sep 30, 2025

View reviewed changes

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php Show resolved Hide resolved

icewind1991 reviewed Sep 30, 2025

View reviewed changes

apps/files_sharing/lib/External/Manager.php Outdated Show resolved Hide resolved

icewind1991 reviewed Sep 30, 2025

View reviewed changes

apps/files_sharing/lib/External/Manager.php Outdated Show resolved Hide resolved

icewind1991 reviewed Sep 30, 2025

View reviewed changes

apps/files_sharing/lib/External/Manager.php Outdated Show resolved Hide resolved

CarlSchwan force-pushed the carl/cleanup-external-manager branch from 7a461a8 to d61da55 Compare October 1, 2025 08:50

CarlSchwan force-pushed the carl/cleanup-external-manager branch from d61da55 to 4ff702f Compare October 29, 2025 15:53

CarlSchwan requested a review from provokateurin as a code owner October 29, 2025 15:53

CarlSchwan requested review from Altahrim and come-nc October 29, 2025 15:54

CarlSchwan changed the title ~~refactor(external-share): Cleanup OCA\FIles_Sharing\External\Manager~~ perf(external-share): Port to Entity and use snowflake Ids Oct 29, 2025

CarlSchwan force-pushed the carl/cleanup-external-manager branch from 4ff702f to 0a8012b Compare October 29, 2025 15:56

CarlSchwan mentioned this pull request Oct 29, 2025

Use snowflake ids #56045

Open

11 tasks

CarlSchwan force-pushed the carl/cleanup-external-manager branch 2 times, most recently from e9a5835 to 86518ae Compare October 29, 2025 16:19

provokateurin requested changes Oct 29, 2025

View reviewed changes

CarlSchwan force-pushed the carl/cleanup-external-manager branch 4 times, most recently from ac27b7e to 71bf292 Compare October 30, 2025 16:54

CarlSchwan added 9 commits November 4, 2025 11:13

refactor(external-share): Cleanup OCA\FIles_Sharing\External\Manager

fdcacbe

- Port away from Files::buildNotExistingFileName - Use IUser and IGroup instead of plain string Signed-off-by: Carl Schwan <[email protected]>

refactor(OC_Helper): remove buildNotExistingFileNameForView

8a931b5

Move the functionality in the last place it is used OC\Files\Node\Folder Signed-off-by: Carl Schwan <[email protected]>

fix(sharing): Adapt Hooks to new API

8bf9e06

Signed-off-by: Carl Schwan <[email protected]>

fix: Revert change to the cloud integration

451a211

This might fixes the test. Signed-off-by: Carl Schwan <[email protected]>

refactor: use DI-injected logger instead of Server::get

d0a87d0

Signed-off-by: Carl Schwan <[email protected]>

perf(external-sharing): Port to Entity and SnowflakeId

43c258b

This removes all the read after write and we don't need to queries all the time the same share in the same request anymore. Signed-off-by: Carl Schwan <[email protected]>

fix: Remove auto increment from share_external

3c91f3a

Signed-off-by: Carl Schwan <[email protected]>

fixup! perf(external-sharing): Port to Entity and SnowflakeId

fa2091e

fixup! perf(external-sharing): Port to Entity and SnowflakeId

e3cb21d

CarlSchwan force-pushed the carl/cleanup-external-manager branch from 71bf292 to 0312cee Compare November 20, 2025 13:42

fixup! perf(external-sharing): Port to Entity and SnowflakeId

d6852c9

CarlSchwan force-pushed the carl/cleanup-external-manager branch from 0312cee to d6852c9 Compare November 20, 2025 14:36

Uh oh!

perf(external-share): Port to Entity and use snowflake Ids #55369

Are you sure you want to change the base?

perf(external-share): Port to Entity and use snowflake Ids #55369

Uh oh!

Conversation

CarlSchwan commented Sep 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

TODO

Checklist

Uh oh!

Uh oh!

Uh oh!

come-nc commented Sep 28, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

icewind1991 Sep 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

icewind1991 Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

CarlSchwan Oct 1, 2025

Choose a reason for hiding this comment

Uh oh!

come-nc Oct 1, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

provokateurin Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

CarlSchwan Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Altahrim Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

provokateurin Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

CarlSchwan commented Sep 28, 2025 •

edited

Loading

icewind1991 Sep 30, 2025 •

edited

Loading