From 4f898b9b36c20ad0959b0a3a2c1569a3ca32b6f6 Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Mon, 7 Aug 2023 10:49:13 -0400 Subject: [PATCH 1/2] optimize calendar search query see https://github.com/nextcloud/calendar/issues/4758 Signed-off-by: Jamie McClelland --- apps/dav/lib/CalDAV/CalDavBackend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index f0fd29852bb6b..8b1e3ac6ea9ef 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -1826,7 +1826,7 @@ public function search(array $calendarInfo, $pattern, array $searchProperties, // only return public items for shared calendars for now if (isset($calendarInfo['{http://owncloud.org/ns}owner-principal']) === false || $calendarInfo['principaluri'] !== $calendarInfo['{http://owncloud.org/ns}owner-principal']) { - $innerQuery->andWhere($innerQuery->expr()->eq('c.classification', + $outerQuery->andWhere($outerQuery->expr()->eq('c.classification', $outerQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC))); } From 1bc8feb33223a8e154aa4c877828fefb85042eec Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Mon, 7 Aug 2023 13:35:08 -0400 Subject: [PATCH 2/2] ensure outerquery ->where() function doesn't clobber earier ->andWhere() Signed-off-by: Jamie McClelland --- apps/dav/lib/CalDAV/CalDavBackend.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 8b1e3ac6ea9ef..8df8bbb7d03e0 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -1824,6 +1824,10 @@ public function search(array $calendarInfo, $pattern, array $searchProperties, ->andWhere($innerQuery->expr()->eq('op.calendartype', $outerQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR))); + $outerQuery->select('c.id', 'c.calendardata', 'c.componenttype', 'c.uid', 'c.uri') + ->from('calendarobjects', 'c') + ->where($outerQuery->expr()->isNull('deleted_at')); + // only return public items for shared calendars for now if (isset($calendarInfo['{http://owncloud.org/ns}owner-principal']) === false || $calendarInfo['principaluri'] !== $calendarInfo['{http://owncloud.org/ns}owner-principal']) { $outerQuery->andWhere($outerQuery->expr()->eq('c.classification', @@ -1845,10 +1849,6 @@ public function search(array $calendarInfo, $pattern, array $searchProperties, $this->db->escapeLikeParameter($pattern) . '%'))); } - $outerQuery->select('c.id', 'c.calendardata', 'c.componenttype', 'c.uid', 'c.uri') - ->from('calendarobjects', 'c') - ->where($outerQuery->expr()->isNull('deleted_at')); - if (isset($options['timerange'])) { if (isset($options['timerange']['start']) && $options['timerange']['start'] instanceof DateTimeInterface) { $outerQuery->andWhere($outerQuery->expr()->gt('lastoccurence',