Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PLAT-9869: Avoid long query time by adding partner id to the criteria when querying ui conf #8430

Merged
merged 5 commits into from May 16, 2019
Merged

PLAT-9869: Avoid long query time by adding partner id to the criteria when querying ui conf #8430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6510ca1
PLAT-9869: Avoid long query time by adding partner id to the criteria…
yossipapi May 16, 2019
80849b6
PLAT-9869: Move basic code to kmcUtils
yossipapi May 16, 2019
ca394ed
PLAT-9869: Move basic code to kmcUtils
yossipapi May 16, 2019
e992cdc
PLAT-9869: Move basic code to kmcUtils
yossipapi May 16, 2019
bc5a820
PLAT-9869: Move basic code to kmcUtils
yossipapi May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 3 additions & 15 deletions alpha/apps/kaltura/modules/kmc/actions/kmc1Action.class.php
View file
Open in desktop
Expand Up @@ -136,13 +136,7 @@ public function execute ( )

function getJWPlayerUIConfs()
{
$c = new Criteria();
$c->addAnd ( uiConfPeer::DISPLAY_IN_SEARCH , mySearchUtils::DISPLAY_IN_SEARCH_KALTURA_NETWORK , Criteria::GREATER_EQUAL );
$c->addAnd ( uiConfPeer::STATUS , uiConf::UI_CONF_STATUS_READY );
$c->addAnd ( uiConfPeer::OBJ_TYPE , uiConf::UI_CONF_TYPE_WIDGET );
$c->addAnd ( uiConfPeer::TAGS, 'jwplayer', Criteria::LIKE);
$c->addAscendingOrderByColumn(uiConfPeer::ID);

$c = kmcUtils::getDefaultTagAndObjectTypeCriteria('jwplayer', uiConf::UI_CONF_TYPE_WIDGET);
$jwPlayers = uiConfPeer::doSelect($c);

$conf_players = array();
Expand All @@ -168,15 +162,9 @@ function getJWPlayerUIConfs()
return $conf_players;
}

function getJWPlaylistUIConfs()
function getJWPlaylistUIConfs($partnerId = null)
{
$c = new Criteria();
$c->addAnd ( uiConfPeer::DISPLAY_IN_SEARCH , mySearchUtils::DISPLAY_IN_SEARCH_KALTURA_NETWORK , Criteria::GREATER_EQUAL );
$c->addAnd ( uiConfPeer::STATUS , uiConf::UI_CONF_STATUS_READY );
$c->addAnd ( uiConfPeer::OBJ_TYPE , uiConf::UI_CONF_TYPE_WIDGET );
$c->addAnd ( uiConfPeer::TAGS, 'jwplaylist', Criteria::LIKE);
$c->addAscendingOrderByColumn(uiConfPeer::ID);

$c = kmcUtils::getDefaultTagAndObjectTypeCriteria('jwplaylist', uiConf::UI_CONF_TYPE_WIDGET, $partnerId);
$jwPlaylists = uiConfPeer::doSelect($c);

$conf_playlist = array();
Expand Down
40 changes: 4 additions & 36 deletions alpha/apps/kaltura/modules/kmc/actions/kmc2Action.class.php
View file
Open in desktop
Expand Up @@ -141,42 +141,10 @@ public function execute ( )
$this->kmc_rna_version = 'v1.1.3';
$this->kmc_dashboard_version = 'v1.0.10';

$this->jw_uiconfs_array = kmcUtils::getJWPlayerUIConfs();
$this->jw_uiconf_playlist = kmcUtils::getJWPlaylistUIConfs();
$this->advanced_editor = $this->getAdvancedEditorUiConf();
$this->simple_editor = $this->getSimpleEditorUiConf();
}

private function getAdvancedEditorUiConf()
{
$c = new Criteria();
$c->addAnd( uiConfPeer::DISPLAY_IN_SEARCH , mySearchUtils::DISPLAY_IN_SEARCH_KALTURA_NETWORK , Criteria::GREATER_EQUAL );
$c->addAnd ( uiConfPeer::STATUS , uiConf::UI_CONF_STATUS_READY );
$c->addAnd ( uiConfPeer::OBJ_TYPE , uiConf::UI_CONF_TYPE_ADVANCED_EDITOR );
$c->addAnd ( uiConfPeer::TAGS, 'andromeda_kae_for_kmc', Criteria::LIKE);
$c->addAscendingOrderByColumn(uiConfPeer::ID);

$uiConf = uiConfPeer::doSelectOne($c);
if ($uiConf)
return $uiConf->getId();
else
return -1;
}

private function getSimpleEditorUiConf()
{
$c = new Criteria();
$c->addAnd( uiConfPeer::DISPLAY_IN_SEARCH , mySearchUtils::DISPLAY_IN_SEARCH_KALTURA_NETWORK , Criteria::GREATER_EQUAL );
$c->addAnd ( uiConfPeer::STATUS , uiConf::UI_CONF_STATUS_READY );
$c->addAnd ( uiConfPeer::OBJ_TYPE , uiConf::UI_CONF_TYPE_EDITOR );
$c->addAnd ( uiConfPeer::TAGS, 'andromeda_kse_for_kmc', Criteria::LIKE);
$c->addAscendingOrderByColumn(uiConfPeer::ID);

$uiConf = uiConfPeer::doSelectOne($c);
if ($uiConf)
return $uiConf->getId();
else
return -1;
$this->jw_uiconfs_array = kmcUtils::getJWPlayerUIConfs($this->partner_id);
$this->jw_uiconf_playlist = kmcUtils::getJWPlaylistUIConfs($this->partner_id);
$this->advanced_editor = kmcUtils::getUiConfByTagAndObjectType('andromeda_kae_for_kmc', uiConf::UI_CONF_TYPE_ADVANCED_EDITOR, $this->partner_id);
$this->simple_editor = kmcUtils::getUiConfByTagAndObjectType('andromeda_kse_for_kmc', uiConf::UI_CONF_TYPE_EDITOR, $this->partner_id);
}

private function getCritria ( )
Expand Down
4 changes: 2 additions & 2 deletions alpha/apps/kaltura/modules/kmc/actions/kmc3Action.class.php
View file
Open in desktop
Expand Up @@ -203,8 +203,8 @@ public function execute ( )
}

/** jw uiconfs **/
$this->jw_uiconfs_array = kmcUtils::getJWPlayerUIConfs();
$this->jw_uiconf_playlist = kmcUtils::getJWPlaylistUIConfs();
$this->jw_uiconfs_array = kmcUtils::getJWPlayerUIConfs($this->partner_id);
$this->jw_uiconf_playlist = kmcUtils::getJWPlaylistUIConfs($this->partner_id);

/** 508 uicinfs **/
if($partner->getKmcVersion() == self::CURRENT_KMC_VERSION && $partner->getEnable508Players())
Expand Down
67 changes: 35 additions & 32 deletions alpha/apps/kaltura/modules/kmc/lib/kmcUtils.class.php
View file
Open in desktop
@@ -1,15 +1,9 @@
<?php
class kmcUtils
{
public static function getJWPlayerUIConfs()
public static function getJWPlayerUIConfs($partnerId = null)
{
$c = new Criteria();
$c->addAnd( uiConfPeer::DISPLAY_IN_SEARCH , mySearchUtils::DISPLAY_IN_SEARCH_KALTURA_NETWORK , Criteria::GREATER_EQUAL );
$c->addAnd ( uiConfPeer::STATUS , uiConf::UI_CONF_STATUS_READY );
$c->addAnd ( uiConfPeer::OBJ_TYPE , uiConf::UI_CONF_TYPE_WIDGET );
$c->addAnd ( uiConfPeer::TAGS, 'jwplayer', Criteria::LIKE);
$c->addAscendingOrderByColumn(uiConfPeer::ID);

$c = self::getDefaultTagAndObjectTypeCriteria('jwplayer', uiConf::UI_CONF_TYPE_WIDGET, $partnerId);
$jwPlayers = uiConfPeer::doSelect($c);

$conf_players = array();
Expand All @@ -36,15 +30,9 @@ public static function getJWPlayerUIConfs()
return $conf_players;
}

public static function getJWPlaylistUIConfs()
public static function getJWPlaylistUIConfs($partnerId = null)
{
$c = new Criteria();
$c->addAnd( uiConfPeer::DISPLAY_IN_SEARCH , mySearchUtils::DISPLAY_IN_SEARCH_KALTURA_NETWORK , Criteria::GREATER_EQUAL );
$c->addAnd ( uiConfPeer::STATUS , uiConf::UI_CONF_STATUS_READY );
$c->addAnd ( uiConfPeer::OBJ_TYPE , uiConf::UI_CONF_TYPE_WIDGET );
$c->addAnd ( uiConfPeer::TAGS, 'jwplaylist', Criteria::LIKE);
$c->addAscendingOrderByColumn(uiConfPeer::ID);

$c = self::getDefaultTagAndObjectTypeCriteria('jwplaylist', uiConf::UI_CONF_TYPE_WIDGET, $partnerId);
$jwPlaylists = uiConfPeer::doSelect($c);

$conf_playlist = array();
Expand Down Expand Up @@ -174,14 +162,7 @@ public static function getPlayerUiconfsByTag( $tag = null )
}

// implement query to get uiconfs from DB
$c = new Criteria();
$c->addAnd( uiConfPeer::DISPLAY_IN_SEARCH , mySearchUtils::DISPLAY_IN_SEARCH_KALTURA_NETWORK , Criteria::GREATER_EQUAL );
$c->addAnd ( uiConfPeer::PARTNER_ID, 0 );
$c->addAnd ( uiConfPeer::STATUS , uiConf::UI_CONF_STATUS_READY );
$c->addAnd ( uiConfPeer::OBJ_TYPE , uiConf::UI_CONF_TYPE_KDP3);
$c->addAnd ( uiConfPeer::TAGS, $tag, Criteria::LIKE);
$c->addAscendingOrderByColumn(uiConfPeer::ID);

$c = self::getDefaultTagAndObjectTypeCriteria($tag, uiConf::UI_CONF_TYPE_KDP3);
$players = uiConfPeer::doSelect($c);

$conf_players = array();
Expand All @@ -203,13 +184,7 @@ public static function getSilverLightPlayerUiConfs($tag)
{
$confs = array();
// implement query to get uiconfs from DB
$c = new Criteria();
$c->addAnd( uiConfPeer::DISPLAY_IN_SEARCH , mySearchUtils::DISPLAY_IN_SEARCH_KALTURA_NETWORK , Criteria::GREATER_EQUAL );
$c->addAnd ( uiConfPeer::STATUS , uiConf::UI_CONF_STATUS_READY );
$c->addAnd ( uiConfPeer::OBJ_TYPE , uiConf::UI_CONF_TYPE_SLP );
$c->addAnd ( uiConfPeer::TAGS, $tag, Criteria::LIKE);
$c->addAscendingOrderByColumn(uiConfPeer::ID);

$c = self::getDefaultTagAndObjectTypeCriteria($tag, uiConf::UI_CONF_TYPE_SLP);
$slPlayers = uiConfPeer::doSelect($c);

$conf_players = array();
Expand Down Expand Up @@ -292,5 +267,33 @@ public static function getWhitelabelData( Partner $partner, $param = null )
}
return null;
}


public static function getUiConfByTagAndObjectType($tag, $objectType, $partnerId = null)
{
$c = self::getDefaultTagAndObjectTypeCriteria($tag, $objectType, $partnerId);
$uiConf = uiConfPeer::doSelectOne($c);

return $uiConf ? $uiConf->getId() : -1;
}

public static function getDefaultTagAndObjectTypeCriteria($tag, $objectType, $partnerId = null)
{
$c = new Criteria();
$c->addAnd( uiConfPeer::DISPLAY_IN_SEARCH , mySearchUtils::DISPLAY_IN_SEARCH_KALTURA_NETWORK , Criteria::GREATER_EQUAL );
$c->addAnd ( uiConfPeer::STATUS , uiConf::UI_CONF_STATUS_READY );
$c->addAnd ( uiConfPeer::OBJ_TYPE , $objectType );
$c->addAnd ( uiConfPeer::TAGS, $tag, Criteria::LIKE);
if($partnerId)
{
$c->addAnd ( uiConfPeer::PARTNER_ID, array_map('strval', array($partnerId, PartnerPeer::GLOBAL_PARTNER)), Criteria::IN );
}
else
{
$c->addAnd ( uiConfPeer::PARTNER_ID, PartnerPeer::GLOBAL_PARTNER );
}

$c->addAscendingOrderByColumn(uiConfPeer::ID);

return $c;
}
}