Use the defined func()->count() instead of manual counting by nickvergessen · Pull Request #11942 · nextcloud/server

nickvergessen · 2018-10-19T14:48:11Z

Now there are only 2 "functions" left which are both called twice and don't have a wrapper:

GREATEST
COUNT(DISTINCT …)

Not sure if it's worth the effort.

icewind1991 · 2018-10-19T17:44:33Z

lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php


-	public function count($input) {
-		return new QueryFunction('COUNT(' . $this->helper->quoteColumnName($input) . ')');
+	public function count($count, $alias = '') {


wouldn't alias work by just using selectAlias($qb->func()->count(...), 'alias')

Yeah, i added it here because its done quite often

having it here doesn't make sense to me though, since for the caller it's not any easier (the only difference is where you place the )) and it's duplicating code/functionality

I'm fine with this here. It also reduces function nesting.

MorrisJobke

Code looks good 👍

MorrisJobke · 2018-11-06T17:24:22Z

@icewind1991 @rullzer Any comments on this one?

icewind1991

fine with me

MorrisJobke · 2018-11-07T14:53:46Z

Yay PHPunit tests fail 😢 I should have checked that earlier

MorrisJobke · 2018-11-07T14:55:24Z

Yay PHPunit tests fail 😢 I should have checked that earlier

Ah - disk was just full -> let's do another round: https://drone.nextcloud.com/nextcloud/server/12482

MorrisJobke · 2018-11-07T15:36:45Z

This causes the same "Disk is full" errors 😨

nickvergessen · 2018-11-07T18:28:54Z

strange, let me investigate

nickvergessen · 2018-11-07T19:04:45Z

lib/private/Comments/Manager.php

-				$qb->createFunction('COUNT(' . $qb->getColumnName('c.id') . ')'),
-				'num_ids'
-			)
+			->addSelect($qb->func()->count('c.id', 'num_ids'))


@MorrisJobke the problem was select here instead of addSelect which caused a lot of spam with missing index fileId across tests

MorrisJobke · 2018-11-08T08:53:23Z

Still this one:

Test\SystemTag\SystemTagObjectMapperTest::testHaveTagAllMatches

Doctrine\DBAL\Exception\InvalidFieldNameException: An exception occurred while executing 'SELECT COUNT(`1`) FROM `oc_systemtag_object_mapping` WHERE (`objectid` IN (?)) AND (`objecttype` = ?) AND (`systemtagid` = ?)' with params ["1", "testtype", "1"]:


SQLSTATE[42S22]: Column not found: 1054 Unknown column '1' in 'field list'

...

nickvergessen · 2018-11-08T11:21:29Z

fixed

MorrisJobke · 2018-11-08T14:31:40Z

Fails on Postgres https://drone.nextcloud.com/nextcloud/server/12537/167:

1) Test\SystemTag\SystemTagObjectMapperTest::testHaveTagAllMatches
Doctrine\DBAL\Exception\DriverException: An exception occurred while executing 'SELECT COUNT(?) FROM "oc_systemtag_object_mapping" WHERE ("objectid" IN (?)) AND ("objecttype" = ?) AND ("systemtagid" = ?)' with params [1, "1", "testtype", "1"]:

SQLSTATE[42P18]: Indeterminate datatype: 7 ERROR:  could not determine data type of parameter $1

/drone/src/github.com/nextcloud/server/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Driver/AbstractPostgreSQLDriver.php:92
/drone/src/github.com/nextcloud/server/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/DBALException.php:128
/drone/src/github.com/nextcloud/server/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php:855
/drone/src/github.com/nextcloud/server/lib/private/DB/Connection.php:195
/drone/src/github.com/nextcloud/server/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Query/QueryBuilder.php:206
/drone/src/github.com/nextcloud/server/lib/private/DB/QueryBuilder/QueryBuilder.php:214
/drone/src/github.com/nextcloud/server/lib/private/SystemTag/SystemTagObjectMapper.php:231
/drone/src/github.com/nextcloud/server/tests/lib/SystemTag/SystemTagObjectMapperTest.php:291

Signed-off-by: Joas Schilling <coding@schilljs.com>

MorrisJobke

Looks good 👍

nickvergessen added 3. to review Waiting for reviews technical debt labels Oct 19, 2018

nickvergessen added this to the Nextcloud 15 milestone Oct 19, 2018

nickvergessen requested review from MorrisJobke, icewind1991 and rullzer October 19, 2018 14:48

icewind1991 reviewed Oct 19, 2018

View reviewed changes

MorrisJobke approved these changes Nov 5, 2018

View reviewed changes

MorrisJobke mentioned this pull request Nov 6, 2018

15.0.0 beta 1 #12310

Merged

29 tasks

icewind1991 approved these changes Nov 7, 2018

View reviewed changes

MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 7, 2018

MorrisJobke added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Nov 7, 2018

nickvergessen force-pushed the techdebt/noid/use-count-function branch 2 times, most recently from 08ee437 to 7365078 Compare November 7, 2018 19:02

nickvergessen commented Nov 7, 2018

View reviewed changes

nickvergessen added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Nov 7, 2018

nickvergessen force-pushed the techdebt/noid/use-count-function branch from 7365078 to 82fb91b Compare November 8, 2018 11:21

MorrisJobke mentioned this pull request Nov 8, 2018

15.0.0 Beta 2 #12355

Merged

24 tasks

MorrisJobke added the 2. developing Work in progress label Nov 8, 2018

MorrisJobke removed the 4. to release Ready to be released and/or waiting for tests to finish label Nov 8, 2018

Use the defined func()->count() instead of manual counting

bb352fb

Signed-off-by: Joas Schilling <coding@schilljs.com>

nickvergessen force-pushed the techdebt/noid/use-count-function branch from 82fb91b to bb352fb Compare November 8, 2018 14:44

MorrisJobke approved these changes Nov 12, 2018

View reviewed changes

MorrisJobke merged commit fd8eecc into master Nov 12, 2018

MorrisJobke deleted the techdebt/noid/use-count-function branch November 12, 2018 16:44

Uh oh!

Conversation

nickvergessen commented Oct 19, 2018

Uh oh!

icewind1991 Oct 19, 2018

Choose a reason for hiding this comment

Uh oh!

nickvergessen Oct 19, 2018

Choose a reason for hiding this comment

Uh oh!

icewind1991 Oct 23, 2018

Choose a reason for hiding this comment

Uh oh!

MorrisJobke Nov 5, 2018

Choose a reason for hiding this comment

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Nov 6, 2018

Uh oh!

icewind1991 left a comment

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Nov 7, 2018

Uh oh!

MorrisJobke commented Nov 7, 2018

Uh oh!

MorrisJobke commented Nov 7, 2018

Uh oh!

nickvergessen commented Nov 7, 2018

Uh oh!

nickvergessen Nov 7, 2018

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Nov 8, 2018

Uh oh!

nickvergessen commented Nov 8, 2018

Uh oh!

MorrisJobke commented Nov 8, 2018

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants