composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2555 action_rule performance

Browse Source 
* do not execute scope_oql that have no conditions
* pick the first result only
This commit is contained in:
Pierre Goiffon
2019-10-24 10:54:30 +02:00
parent 9aeba1df9b
commit 5c483efd15
4 changed files with 67 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
datamodels/2.x/itop-portal-base/portal/src/Helper/ContextManipulatorHelper.php
View File

@@ -22,19 +22,22 @@
namespace Combodo\iTop\Portal\Helper;
use ModuleDesign;
use BinaryExpression;
use Combodo\iTop\Portal\Brick\BrickCollection;
use Exception;
use DOMNodeList;
use DOMFormatException;
use Symfony\Component\Routing\RouterInterface;
use UserRights;
use CoreOqlMultipleResultsForbiddenException;
use CoreUnexpectedValue;
use DBObject;
use DBSearch;
use DBObjectSet;
use BinaryExpression;
use DOMFormatException;
use DOMNodeList;
use Exception;
use FieldExpression;
use IssueLog;
use ModuleDesign;
use ScalarExpression;
use Symfony\Component\Routing\RouterInterface;
use TrueExpression;
use UserRights;
/**
* Class ContextManipulatorHelper
@@ -342,6 +345,15 @@ class ContextManipulatorHelper
}
}
$oSearchRootCondition = $oSearch->GetCriteria();
if (($oSearchRootCondition === null) || ($oSearchRootCondition instanceof TrueExpression))
{
// N°2555 : disallow searches without any condition
$sErrMsg = "Portal query was stopped: action_rule '$sId' searches for '$sSearchClass' without any condition is forbidden";
IssueLog::Error($sErrMsg);
throw new CoreUnexpectedValue($sErrMsg);
}
// Checking for silos
$oScopeSearch = $this->oScopeValidator->GetScopeFilterForProfiles(UserRights::ListProfiles(), $sSearchClass,
UR_ACTION_READ);
@@ -351,27 +363,34 @@ class ContextManipulatorHelper
}
// Retrieving source object(s) and applying rules
$oSet = new DBObjectSet($oSearch, array(), $aSearchParams);
while ($oSourceObject = $oSet->Fetch())
try
{
// Changing behaviour to remove usage of ObjectCopier as its now being integrated in the core
// Old code : iTopObjectCopier::PrepareObject($aRule, $oObject, $oSourceObject);
// Presets
if (isset($aRule['preset']) && !empty($aRule['preset']))
{
$oObject->ExecActions($aRule['preset'], array('source' => $oSourceObject));
}
// Retrofits
if (isset($aRule['retrofit']) && !empty($aRule['retrofit']))
{
$oSourceObject->ExecActions($aRule['retrofit'], array('source' => $oObject));
}
$oSourceObject = $oSearch->GetFirstResult(true, array(), $aSearchParams);
}
catch (CoreOqlMultipleResultsForbiddenException $e)
{
// N°2555 : disallow searches returning more than 1 result
$sErrMsg = "Portal query was stopped: action_rule '$sId' gives more than 1 '$sSearchClass' result";
IssueLog::Error($sErrMsg);
throw new CoreUnexpectedValue($sErrMsg);
}
if ($oSourceObject === null)
{
continue;
}
// Presets
if (isset($aRule['preset']) && !empty($aRule['preset']))
{
$oObject->ExecActions($aRule['preset'], array('source' => $oSourceObject));
}
// Retrofits
if (isset($aRule['retrofit']) && !empty($aRule['retrofit']))
{
$oSourceObject->ExecActions($aRule['retrofit'], array('source' => $oObject));
}
}
else
{
// Changing behaviour to remove usage of ObjectCopier as its now being integrated in the core
// Old code : iTopObjectCopier::PrepareObject($aRule, $oObject, $oObject);
// Presets
if (isset($aRule['preset']) && !empty($aRule['preset']))
{