Skip to content

fix: don't needlessly contrain join when the left side is allow to be null #60970

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

Open
icewind1991 wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −4
Open

fix: don't needlessly contrain join when the left side is allow to be null #60970

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 33 additions & 4 deletions lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
class PartitionedQueryBuilder extends ShardedQueryBuilder {
/** @var array<string, PartitionQuery> $splitQueries */
private array $splitQueries = [];
/** @var list<PartitionSplit> */
/** @var array<string, PartitionSplit> */
private array $partitions = [];

/** @var array{'select': string|array, 'alias': ?string}[] */
Expand Down Expand Up @@ -180,7 +180,7 @@ private function applySelects(): void {
}

public function addPartition(PartitionSplit $partition): void {
$this->partitions[] = $partition;
$this->partitions[$partition->name] = $partition;
}

private function getPartition(string $table): ?PartitionSplit {
Expand Down Expand Up @@ -264,7 +264,7 @@ public function join($fromAlias, $join, $alias, $condition = null, $joinMode = P
if (!isset($this->splitQueries[$partitionName])) {
$newPartition = new PartitionSplit($partitionName, [$join]);
$newPartition->addAlias($join, $alias);
$this->partitions[] = $newPartition;
$this->partitions[$newPartition->name] = $newPartition;

$this->splitQueries[$partitionName] = new PartitionQuery(
$this->newQuery(),
Expand Down Expand Up @@ -349,11 +349,14 @@ public function andWhere(...$where) {
if ($where) {
foreach ($this->splitPredicatesByParts($where) as $alias => $predicates) {
if (isset($this->splitQueries[$alias])) {
$mergedPredicate = new CompositeExpression(CompositeExpression::TYPE_AND, $predicates);
// when there is a condition on a table being left-joined it starts to behave as if it's an inner join
// since any joined column that doesn't have the left part will not match the condition
// when there the condition is `$joinToColumn IS NULL` we instead mark the query as excluding the left half
if ($this->splitQueries[$alias]->joinMode === PartitionQuery::JOIN_MODE_LEFT) {
$this->splitQueries[$alias]->joinMode = PartitionQuery::JOIN_MODE_INNER;
if ($this->constraintsPartitionNotNull($mergedPredicate, $this->partitions[$alias])) {
$this->splitQueries[$alias]->joinMode = PartitionQuery::JOIN_MODE_INNER;
}

$column = $this->quoteHelper->quoteColumnName($this->splitQueries[$alias]->joinToColumn);
foreach ($predicates as $predicate) {
Expand All @@ -374,6 +377,32 @@ public function andWhere(...$where) {
return $this;
}

/**
* Check if any part of a predicates constraints any part of a partition to be not null
*
* @return bool
*/
private function constraintsPartitionNotNull($predicate, PartitionSplit $partition): bool {
if ($predicate instanceof CompositeExpression) {
if ($predicate->getType() === CompositeExpression::TYPE_OR) {
$all = true;
foreach ($predicate->getParts() as $part) {
$all = $all && $this->constraintsPartitionNotNull($part, $partition);
}
return $all;
} else {
foreach ($predicate->getParts() as $part) {
if ($this->constraintsPartitionNotNull($part, $partition)) {
return true;
}
}
return false;
}
} else {
return $partition->checkPredicateForTable($predicate) && !str_ends_with($predicate, 'IS NULL');
}
}

private function getPartitionForPredicate(string $predicate): ?PartitionSplit {
foreach ($this->partitions as $partition) {

Expand Down
Loading