From 13366f48208348e3b33e042ca9809b619fcd08af Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Sat, 19 Feb 2022 13:26:03 +0100 Subject: [PATCH 1/2] Fix more than 1000 entries in queries exception in CardDavBackend Signed-off-by: Carl Schwan --- apps/dav/lib/CardDAV/CardDavBackend.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 0696fb2f5fb98..e622bb2b27753 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -1110,15 +1110,18 @@ private function searchByAddressBookIds(array $addressBookIds, return (int)$match['cardid']; }, $matches); - $query = $this->db->getQueryBuilder(); - $query->select('c.addressbookid', 'c.carddata', 'c.uri') - ->from($this->dbCardsTable, 'c') - ->where($query->expr()->in('c.id', $query->createNamedParameter($matches, IQueryBuilder::PARAM_INT_ARRAY))); + $cards = []; + foreach (array_chunk($matches, 1000) as $matche) { + $query = $this->db->getQueryBuilder(); + $query->select('c.addressbookid', 'c.carddata', 'c.uri') + ->from($this->dbCardsTable, 'c') + ->where($query->expr()->in('c.id', $query->createNamedParameter($matche, IQueryBuilder::PARAM_INT_ARRAY))); - $result = $query->execute(); - $cards = $result->fetchAll(); + $result = $query->execute(); + $cards = array_merge($cards, $result->fetchAll()); + $result->closeCursor(); + } - $result->closeCursor(); return array_map(function ($array) { $array['addressbookid'] = (int) $array['addressbookid']; From 8e69237b0d1c019ba14fd000f1b6823e864562be Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Thu, 10 Mar 2022 15:10:08 +0100 Subject: [PATCH 2/2] Don't recreate sql query each time Signed-off-by: Carl Schwan Signed-off-by: Christoph Wurst --- apps/dav/lib/CardDAV/CardDavBackend.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index e622bb2b27753..2082661d7ba93 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -1111,18 +1111,18 @@ private function searchByAddressBookIds(array $addressBookIds, }, $matches); $cards = []; - foreach (array_chunk($matches, 1000) as $matche) { - $query = $this->db->getQueryBuilder(); - $query->select('c.addressbookid', 'c.carddata', 'c.uri') - ->from($this->dbCardsTable, 'c') - ->where($query->expr()->in('c.id', $query->createNamedParameter($matche, IQueryBuilder::PARAM_INT_ARRAY))); + $query = $this->db->getQueryBuilder(); + $query->select('c.addressbookid', 'c.carddata', 'c.uri') + ->from($this->dbCardsTable, 'c') + ->where($query->expr()->in('c.id', $query->createParameter('matches'))); + foreach (array_chunk($matches, 1000) as $matchesChunk) { + $query->setParameter('matches', $matchesChunk, IQueryBuilder::PARAM_INT_ARRAY); $result = $query->execute(); $cards = array_merge($cards, $result->fetchAll()); $result->closeCursor(); } - return array_map(function ($array) { $array['addressbookid'] = (int) $array['addressbookid']; $modified = false;