Skip to content

[stable22] Lighter SQL requests and compat with Oracle #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
backportbot-nextcloud wants to merge 9 commits into from
Closed

[stable22] Lighter SQL requests and compat with Oracle #955

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
714f761
fully importing mspt
ArtificialOwl Mar 8, 2022
2b7dc3a
switching import to Tools\
ArtificialOwl Mar 8, 2022
869ea01
population will be stored as settings
ArtificialOwl Mar 8, 2022
8ac231d
removing useless GROUP BY and DISTRINCT
ArtificialOwl Mar 8, 2022
b39e6de
instance can be empty string
ArtificialOwl Mar 8, 2022
3918230
cs-fix
ArtificialOwl Mar 9, 2022
c309af3
Use dependency injection
CarlSchwan Mar 11, 2022
791ba89
Remove autoloading of 3rdparty libraries
CarlSchwan Mar 11, 2022
c7aed50
cs-fix
ArtificialOwl Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
population will be stored as settings 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot
ArtificialOwl authored and backportbot[bot] committed Mar 11, 2022
commit 869ea018a2fbe931684f53fa6599fd7e87b0df36
8 changes: 0 additions & 8 deletions lib/Db/CircleRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,6 @@ public function getCircles(?IFederatedUser $initiator, CircleProbe $probe): arra
$qb->limitToRemoteInstance(CoreQueryBuilder::CIRCLE, $probe->getFilterRemoteInstance(), false);
}

if ($probe->showDetail(BasicProbe::DETAILS_POPULATION)) {
$qb->countMembers(CoreQueryBuilder::CIRCLE);
}

$qb->chunk($probe->getItemsOffset(), $probe->getItemsLimit());

return $this->getItemsFromRequest($qb);
Expand Down Expand Up @@ -275,10 +271,6 @@ public function getCircle(
$qb->limitToRemoteInstance(CoreQueryBuilder::CIRCLE, $probe->getFilterRemoteInstance(), false);
}

if ($probe->showDetail(BasicProbe::DETAILS_POPULATION)) {
$qb->countMembers(CoreQueryBuilder::CIRCLE);
}

return $this->getItemFromRequest($qb);
}

Expand Down
26 changes: 0 additions & 26 deletions lib/Db/CoreQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,32 +695,6 @@ public function filterDirectMembership(string $aliasMember, Member $member): voi
}


/**
* @param string $alias
*/
public function countMembers(string $alias): void {
if ($this->getType() !== QueryBuilder::SELECT) {
return;
}

try {
$aliasMemberCount = $this->generateAlias($alias, self::MEMBER_COUNT, $options);
} catch (RequestBuilderException $e) {
return;
}

$expr = $this->expr();
$this->selectAlias(
$this->createFunction('COUNT(`' . $aliasMemberCount . '`.`member_id`)'),
(($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'population'
);
$this->leftJoin(
$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMemberCount,
$expr->eq($alias . '.unique_id', $aliasMemberCount . '.circle_id')
);
}


/**
* @param string $alias
* @param IFederatedUser|null $initiator
Expand Down