From 2528a46dc284a22381efb051367eecbcf5bb56b7 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 3e360fb2e414d..98e85096b3bf7 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -1130,15 +1130,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 04ad3ba86396611c1fe53a66a41e72ed38dcda9a 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 --- apps/dav/lib/CardDAV/CardDavBackend.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 98e85096b3bf7..1c1754ff752f3 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -139,7 +139,7 @@ public function getAddressBooksForUserCount($principalUri) { ->from('addressbooks') ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri))); - $result = $query->execute(); + $result = $query->executeQuery(); $column = (int) $result->fetchOne(); $result->closeCursor(); return $column; @@ -1131,18 +1131,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'))); - $result = $query->execute(); + foreach (array_chunk($matches, 1000) as $matchesChunk) { + $query->setParameter('matches', $matchesChunk, IQueryBuilder::PARAM_INT_ARRAY); + $result = $query->executeQuery(); $cards = array_merge($cards, $result->fetchAll()); $result->closeCursor(); } - return array_map(function ($array) { $array['addressbookid'] = (int) $array['addressbookid']; $modified = false;