Adapt to SystemTags optimizations on server #1770

blizzz · 2023-05-02T16:47:26Z

Essentially, the tags overview fetches all info from systemtags-current, which contains all necessary data. Only on tags details view, files are actually being requested per REPORT.

No visual changes.

Did not ship compiled assets yet as WIP.

Requires

Fixes #1728

package.json

src/store/systemtags.js

blizzz · 2023-05-12T11:35:12Z

The second yet open server PR is not mandatory as it is backwards compatible.

lib/Controller/PageController.php

marcelklehr · 2023-05-16T13:04:41Z

Testing this with master I get a 500 server error:

{"reqId":"VTll6Zviei2RiWJpKGWw","level":3,"time":"2023-05-16T13:02:58+00:00","remoteAddr":"192.168.21.5","user":"admin","app":"webdav","method":"PROPFIND","url":"/remote.php/dav/systemtags-assigned/image/","message":"OCA\\DAV\\SystemTag\\SystemTagNode::setNumberOfFiles(): Argument #1 ($numberOfFiles) must be of type int, string given, called in /var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php on line 102","userAgent":"Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/113.0","version":"27.0.0.3","exception":{"Exception":"TypeError","Message":"OCA\\DAV\\SystemTag\\SystemTagNode::setNumberOfFiles(): Argument #1 ($numberOfFiles) must be of type int, string given, called in /var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php on line 102","Code":0,"Trace":[{"file":"/var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php","line":102,"function":"setNumberOfFiles","class":"OCA\\DAV\\SystemTag\\SystemTagNode","type":"->","args":["7"]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Tree.php","line":200,"function":"getChildren","class":"OCA\\DAV\\SystemTag\\SystemTagsInUseCollection","type":"->","args":[]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":900,"function":"getChildren","class":"Sabre\\DAV\\Tree","type":"->","args":["systemtags-assigned/image"]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":982,"function":"generatePathNodes","class":"Sabre\\DAV\\Server","type":"->","args":[["Sabre\\DAV\\PropFind"],[["Sabre\\DAV\\PropFind"],["OCA\\DAV\\SystemTag\\SystemTagsInUseCollection"]]]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":1662,"function":"getPropertiesIteratorForPath","class":"Sabre\\DAV\\Server","type":"->","args":["systemtags-assigned/image",["{http://owncloud.org/ns}id","{http://owncloud.org/ns}display-name","{http://owncloud.org/ns}user-visible","{http://owncloud.org/ns}user-assignable","{http://owncloud.org/ns}can-assign","And 2 more entries, set log level to debug to see all entries"],1]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":1647,"function":"writeMultiStatus","class":"Sabre\\DAV\\Server","type":"->","args":[["Sabre\\Xml\\Writer",[],"/remote.php/dav/",["d","s","oc","nc"],[]],["Generator"],false]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/CorePlugin.php","line":346,"function":"generateMultiStatus","class":"Sabre\\DAV\\Server","type":"->","args":[["Generator"],false]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/event/lib/WildcardEmitterTrait.php","line":89,"function":"httpPropFind","class":"Sabre\\DAV\\CorePlugin","type":"->","args":[["Sabre\\HTTP\\Request"],["Sabre\\HTTP\\Response"]]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":472,"function":"emit","class":"Sabre\\DAV\\Server","type":"->","args":["method:PROPFIND",[["Sabre\\HTTP\\Request"],["Sabre\\HTTP\\Response"]]]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":253,"function":"invokeMethod","class":"Sabre\\DAV\\Server","type":"->","args":[["Sabre\\HTTP\\Request"],["Sabre\\HTTP\\Response"]]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":321,"function":"start","class":"Sabre\\DAV\\Server","type":"->","args":[]},{"file":"/var/www/html/apps/dav/lib/Server.php","line":364,"function":"exec","class":"Sabre\\DAV\\Server","type":"->","args":[]},{"file":"/var/www/html/apps/dav/appinfo/v2/remote.php","line":35,"function":"exec","class":"OCA\\DAV\\Server","type":"->","args":[]},{"file":"/var/www/html/remote.php","line":172,"args":["/var/www/html/apps/dav/appinfo/v2/remote.php"],"function":"require_once"}],"File":"/var/www/html/apps/dav/lib/SystemTag/SystemTagNode.php","Line":190,"message":"OCA\\DAV\\SystemTag\\SystemTagNode::setNumberOfFiles(): Argument #1 ($numberOfFiles) must be of type int, string given, called in /var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php on line 102","exception":{},"CustomMessage":"OCA\\DAV\\SystemTag\\SystemTagNode::setNumberOfFiles(): Argument #1 ($numberOfFiles) must be of type int, string given, called in /var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php on line 102"}}

artonge

Nitpick, else nice :)

src/utils/fileUtils.js

juliushaertl · 2023-06-28T05:58:39Z

Remaining server PR was merged

blizzz · 2023-06-28T08:49:02Z

Remaining server PR was merged

Aye, this PR is next in row of that system tag series on my list :)

Essentially, the tags overview fetches all info from systemtags-current, which contains all necessary data. Only on tags details view, files are actually being requested per REPORT. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

blizzz · 2023-06-28T19:16:54Z

addressed both remarks, rebased and rebuild

P.S.: and satisfied linter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

blizzz · 2023-06-28T19:39:49Z

Testing this with master I get a 500 server error:

{"reqId":"VTll6Zviei2RiWJpKGWw","level":3,"time":"2023-05-16T13:02:58+00:00","remoteAddr":"192.168.21.5","user":"admin","app":"webdav","method":"PROPFIND","url":"/remote.php/dav/systemtags-assigned/image/","message":"OCA\\DAV\\SystemTag\\SystemTagNode::setNumberOfFiles(): Argument #1 ($numberOfFiles) must be of type int, string given, called in /var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php on line 102","userAgent":"Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/113.0","version":"27.0.0.3","exception":{"Exception":"TypeError","Message":"OCA\\DAV\\SystemTag\\SystemTagNode::setNumberOfFiles(): Argument #1 ($numberOfFiles) must be of type int, string given, called in /var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php on line 102","Code":0,"Trace":[{"file":"/var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php","line":102,"function":"setNumberOfFiles","class":"OCA\\DAV\\SystemTag\\SystemTagNode","type":"->","args":["7"]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Tree.php","line":200,"function":"getChildren","class":"OCA\\DAV\\SystemTag\\SystemTagsInUseCollection","type":"->","args":[]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":900,"function":"getChildren","class":"Sabre\\DAV\\Tree","type":"->","args":["systemtags-assigned/image"]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":982,"function":"generatePathNodes","class":"Sabre\\DAV\\Server","type":"->","args":[["Sabre\\DAV\\PropFind"],[["Sabre\\DAV\\PropFind"],["OCA\\DAV\\SystemTag\\SystemTagsInUseCollection"]]]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":1662,"function":"getPropertiesIteratorForPath","class":"Sabre\\DAV\\Server","type":"->","args":["systemtags-assigned/image",["{http://owncloud.org/ns}id","{http://owncloud.org/ns}display-name","{http://owncloud.org/ns}user-visible","{http://owncloud.org/ns}user-assignable","{http://owncloud.org/ns}can-assign","And 2 more entries, set log level to debug to see all entries"],1]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":1647,"function":"writeMultiStatus","class":"Sabre\\DAV\\Server","type":"->","args":[["Sabre\\Xml\\Writer",[],"/remote.php/dav/",["d","s","oc","nc"],[]],["Generator"],false]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/CorePlugin.php","line":346,"function":"generateMultiStatus","class":"Sabre\\DAV\\Server","type":"->","args":[["Generator"],false]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/event/lib/WildcardEmitterTrait.php","line":89,"function":"httpPropFind","class":"Sabre\\DAV\\CorePlugin","type":"->","args":[["Sabre\\HTTP\\Request"],["Sabre\\HTTP\\Response"]]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":472,"function":"emit","class":"Sabre\\DAV\\Server","type":"->","args":["method:PROPFIND",[["Sabre\\HTTP\\Request"],["Sabre\\HTTP\\Response"]]]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":253,"function":"invokeMethod","class":"Sabre\\DAV\\Server","type":"->","args":[["Sabre\\HTTP\\Request"],["Sabre\\HTTP\\Response"]]},{"file":"/var/www/html/apps-extra/photos/vendor/sabre/dav/lib/DAV/Server.php","line":321,"function":"start","class":"Sabre\\DAV\\Server","type":"->","args":[]},{"file":"/var/www/html/apps/dav/lib/Server.php","line":364,"function":"exec","class":"Sabre\\DAV\\Server","type":"->","args":[]},{"file":"/var/www/html/apps/dav/appinfo/v2/remote.php","line":35,"function":"exec","class":"OCA\\DAV\\Server","type":"->","args":[]},{"file":"/var/www/html/remote.php","line":172,"args":["/var/www/html/apps/dav/appinfo/v2/remote.php"],"function":"require_once"}],"File":"/var/www/html/apps/dav/lib/SystemTag/SystemTagNode.php","Line":190,"message":"OCA\\DAV\\SystemTag\\SystemTagNode::setNumberOfFiles(): Argument #1 ($numberOfFiles) must be of type int, string given, called in /var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php on line 102","exception":{},"CustomMessage":"OCA\\DAV\\SystemTag\\SystemTagNode::setNumberOfFiles(): Argument #1 ($numberOfFiles) must be of type int, string given, called in /var/www/html/apps/dav/lib/SystemTag/SystemTagsInUseCollection.php on line 102"}}

Cannot reproduce this with latest master.

marcelklehr

🚢

blizzz · 2023-07-07T11:35:18Z

/backport 49bc8fa a1a5cc1 0f77d3e 7a7fb0d to stable27

marcelklehr · 2023-07-07T11:37:44Z

/backport 49bc8fa a1a5cc1,0f77d3e34f2763422de081d4f38611100b41a7e5,7a7fb0dae5935622bb9466e8fe5ccaaee7469c5a to stable27

marcelklehr · 2023-07-07T11:38:14Z

/backport 49bc8fa,a1a5cc15fb7e3aeacef68c3cfdfc1685f6cb4d1a,0f77d3e34f2763422de081d4,38611100b41a7e5,7a7fb0dae5935622bb9466e8fe5ccaaee7469c5a to stable27

backportbot-nextcloud · 2023-07-07T11:38:57Z

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

blizzz · 2023-07-07T11:43:39Z

In other words

blizzz added this to the Nextcloud 27 milestone May 2, 2023

blizzz requested a review from marcelklehr May 2, 2023 16:47

blizzz commented May 2, 2023

View reviewed changes

package.json Outdated Show resolved Hide resolved

skjnldsv mentioned this pull request May 3, 2023

27.0.0 beta 1 nextcloud/server#38038

Merged

marcelklehr reviewed May 3, 2023

View reviewed changes

src/store/systemtags.js Outdated Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

This was referenced May 9, 2023

27.0.0 beta 2 nextcloud/server#38137

Closed

27.0.0 beta 2 nextcloud/server#38139

Merged

skjnldsv modified the milestones: Nextcloud 27, Nextcloud 28 May 9, 2023

blizzz force-pushed the enh/noid/systemtags-perf branch from 4c59ffc to ffddb90 Compare May 12, 2023 10:38

This comment was marked as resolved.

Sign in to view

blizzz marked this pull request as ready for review May 12, 2023 11:34

blizzz added the 3. to review Waiting for reviews label May 12, 2023

blizzz force-pushed the enh/noid/systemtags-perf branch from ffddb90 to b7ac1fe Compare May 16, 2023 11:57

blizzz requested review from artonge, skjnldsv and marcelklehr May 16, 2023 11:58

marcelklehr reviewed May 16, 2023

View reviewed changes

lib/Controller/PageController.php Show resolved Hide resolved

artonge approved these changes May 16, 2023

View reviewed changes

src/utils/fileUtils.js Outdated Show resolved Hide resolved

blizzz added 2. developing Work in progress and removed 3. to review Waiting for reviews labels May 19, 2023

blizzz added 3 commits June 28, 2023 21:12

Adapt to SystemTags optimizations on server

49bc8fa

Essentially, the tags overview fetches all info from systemtags-current, which contains all necessary data. Only on tags details view, files are actually being requested per REPORT. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix: remove now unneeded tags-count initial state

a1a5cc1

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

chore: satisfy linter

0f77d3e

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

blizzz force-pushed the enh/noid/systemtags-perf branch from b7ac1fe to ec7be4a Compare June 28, 2023 19:16

blizzz added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 28, 2023

blizzz added 2 commits June 28, 2023 21:21

style: cleanup and remove duplicated code

7a7fb0d

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

build: js assets

56f71fb

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

blizzz force-pushed the enh/noid/systemtags-perf branch from ec7be4a to 56f71fb Compare June 28, 2023 19:21

blizzz requested a review from marcelklehr June 28, 2023 19:39

juliushaertl mentioned this pull request Jun 29, 2023

/tags view performance #1728

Closed

3 tasks

marcelklehr approved these changes Jun 30, 2023

View reviewed changes

blizzz merged commit 06a2b99 into master Jun 30, 2023
25 checks passed

blizzz deleted the enh/noid/systemtags-perf branch June 30, 2023 12:17

backportbot-nextcloud bot added the backport-request Pending backport by the backport-bot label Jul 7, 2023

This was referenced Jul 7, 2023

[stable27] Adapt to SystemTags optimizations on server #1925

Merged

[stable26] Adapt to SystemTags optimizations on server #1927

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adapt to SystemTags optimizations on server #1770

Adapt to SystemTags optimizations on server #1770

blizzz commented May 2, 2023 •

edited by juliushaertl

This comment was marked as resolved.

This comment was marked as resolved.

blizzz commented May 12, 2023

marcelklehr commented May 16, 2023 •

edited

artonge left a comment

juliushaertl commented Jun 28, 2023

blizzz commented Jun 28, 2023 •

edited

blizzz commented Jun 28, 2023 •

edited

blizzz commented Jun 28, 2023

marcelklehr left a comment

blizzz commented Jul 7, 2023

marcelklehr commented Jul 7, 2023

marcelklehr commented Jul 7, 2023

backportbot-nextcloud bot commented Jul 7, 2023

blizzz commented Jul 7, 2023 •

edited

Adapt to SystemTags optimizations on server #1770

Adapt to SystemTags optimizations on server #1770

Conversation

blizzz commented May 2, 2023 • edited by juliushaertl

This comment was marked as resolved.

This comment was marked as resolved.

blizzz commented May 12, 2023

marcelklehr commented May 16, 2023 • edited

artonge left a comment

Choose a reason for hiding this comment

juliushaertl commented Jun 28, 2023

blizzz commented Jun 28, 2023 • edited

blizzz commented Jun 28, 2023 • edited

blizzz commented Jun 28, 2023

marcelklehr left a comment

Choose a reason for hiding this comment

blizzz commented Jul 7, 2023

marcelklehr commented Jul 7, 2023

marcelklehr commented Jul 7, 2023

backportbot-nextcloud bot commented Jul 7, 2023

blizzz commented Jul 7, 2023 • edited

blizzz commented May 2, 2023 •

edited by juliushaertl

marcelklehr commented May 16, 2023 •

edited

blizzz commented Jun 28, 2023 •

edited

blizzz commented Jun 28, 2023 •

edited

blizzz commented Jul 7, 2023 •

edited