From a553cfd581146924763a814eb4939e884c55bf76 Mon Sep 17 00:00:00 2001 From: Nadav Harnik Date: Wed, 30 Jan 2019 11:38:41 +0200 Subject: [PATCH 1/2] playsviews - fix default value + add optimization to executePlaylist --- alpha/apps/kaltura/lib/myPlaylistUtils.class.php | 6 +++++- alpha/lib/model/entry.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/alpha/apps/kaltura/lib/myPlaylistUtils.class.php b/alpha/apps/kaltura/lib/myPlaylistUtils.class.php index 41c3d02cfcd..d624df8e306 100644 --- a/alpha/apps/kaltura/lib/myPlaylistUtils.class.php +++ b/alpha/apps/kaltura/lib/myPlaylistUtils.class.php @@ -194,7 +194,11 @@ public static function executePlaylist ( $partner_id , $playlist , $filter = nu // Clear the context for next time self::$playlistContext = null; - + if ($entryObjectsArray) + { + entryPeer::fetchPlaysViewsData($entryObjectsArray); + } + return $entryObjectsArray; } diff --git a/alpha/lib/model/entry.php b/alpha/lib/model/entry.php index 15fb4086107..036fa73d6f9 100644 --- a/alpha/lib/model/entry.php +++ b/alpha/lib/model/entry.php @@ -4209,7 +4209,7 @@ protected function getValueFromPlaysViewsData($key) { return $this->playsViewsData[$key]; } - return null; + return 0; } public function getPlays() From a284098f227d236642f385176665adc12e396ab8 Mon Sep 17 00:00:00 2001 From: Nadav Harnik Date: Wed, 30 Jan 2019 12:43:44 +0200 Subject: [PATCH 2/2] code review fix --- alpha/apps/kaltura/lib/myPlaylistUtils.class.php | 5 +---- alpha/lib/model/entryPeer.php | 12 +++++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/alpha/apps/kaltura/lib/myPlaylistUtils.class.php b/alpha/apps/kaltura/lib/myPlaylistUtils.class.php index d624df8e306..f419069997a 100644 --- a/alpha/apps/kaltura/lib/myPlaylistUtils.class.php +++ b/alpha/apps/kaltura/lib/myPlaylistUtils.class.php @@ -194,10 +194,7 @@ public static function executePlaylist ( $partner_id , $playlist , $filter = nu // Clear the context for next time self::$playlistContext = null; - if ($entryObjectsArray) - { - entryPeer::fetchPlaysViewsData($entryObjectsArray); - } + entryPeer::fetchPlaysViewsData($entryObjectsArray); return $entryObjectsArray; } diff --git a/alpha/lib/model/entryPeer.php b/alpha/lib/model/entryPeer.php index a76ad087b02..a0da8c0823c 100644 --- a/alpha/lib/model/entryPeer.php +++ b/alpha/lib/model/entryPeer.php @@ -863,10 +863,15 @@ public static function filterEntriesByPartnerOrKalturaNetwork(array $entryIds, $ public static function fetchPlaysViewsData($entries) { + if (!$entries) + { + return; + } + $cache = kCacheManager::getSingleLayerCache(kCacheManager::CACHE_TYPE_PLAYS_VIEWS); if (!$cache) { - return $entries; + return; } $keys = array(); @@ -879,6 +884,11 @@ public static function fetchPlaysViewsData($entries) $keys[] = entry::PLAYSVIEWS_CACHE_KEY_PREFIX . $entry->getId(); } + if (!$keys) + { + return; + } + $data = $cache->multiGet($keys); foreach ($entries as $entry) {