tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8921 from creative-commoners/pulls/4.3/threshold-count-in-sql

Browse Source 
FIX Calculate threshold condition with SQL rather than PHP
This commit is contained in:
Robbie Averill 2019-04-21 01:25:24 +12:00 committed by GitHub
commit 523456ae09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ORM/FieldType/DBForeignKey.php
View File

@ -87,12 +87,29 @@ class DBForeignKey extends DBInt
// Add the count of the list to a cache for subsequent calls // Add the count of the list to a cache for subsequent calls
if (!isset(static::$foreignListCache[$hasOneClass])) { if (!isset(static::$foreignListCache[$hasOneClass])) {
// Let the DB do the threshold check as it will be faster - depending on the SQL engine it might only have
// to count indexes
$dataQuery = $list->dataQuery()->getFinalisedQuery();
// Clear order-by as it's not relevant for counts
$dataQuery->setOrderBy(false);
// Remove distinct. Applying distinct shouldn't be required provided relations are not applied.
$dataQuery->setDistinct(false);
$dataQuery->setSelect(['over_threshold' => 'count(*) > ' . (int) $threshold]);
$result = $dataQuery->execute()->column('over_threshold');
// Checking for 't' supports PostgreSQL before silverstripe/postgresql@2.2
$overThreshold = !empty($result) && ($result[0] === 't' || (int) $result[0] === 1);
static::$foreignListCache[$hasOneClass] = [ static::$foreignListCache[$hasOneClass] = [
'count' => $list->count(), 'overThreshold' => $overThreshold,
]; ];
} }
if (static::$foreignListCache[$hasOneClass]['count'] < $threshold) { $overThreshold = static::$foreignListCache[$hasOneClass]['overThreshold'];
if (!$overThreshold) {
// Add the mapped list for the cache // Add the mapped list for the cache
if (!isset(static::$foreignListCache[$hasOneClass]['map'])) { if (!isset(static::$foreignListCache[$hasOneClass]['map'])) {
static::$foreignListCache[$hasOneClass]['map'] = $list->map('ID', $titleField); static::$foreignListCache[$hasOneClass]['map'] = $list->map('ID', $titleField);