use cache on dynamic group

fusioninventory · Feb 7, 2017 · 4db14a0 · 4db14a0
1 parent 9e367cd
commit 4db14a0
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 44 deletions.
diff --git a/inc/deploygroup.class.php b/inc/deploygroup.class.php
@@ -412,9 +412,10 @@ static function showCriteria(PluginFusioninventoryDeployGroup $item, $p) {
     * Get targets for the group
     *
     * @param integer $groups_id id of the group
+    * @param bool    $use_cache retrieve agents from cache or not (only for dynamic groups)
     * @return array list of computers
     */
-   static function getTargetsForGroup($groups_id) {
+   static function getTargetsForGroup($groups_id, $use_cache = false) {
       $group = new self();
       $group->getFromDB($groups_id);
 
@@ -426,7 +427,8 @@ static function getTargetsForGroup($groups_id) {
             $results[$tmpgroup['items_id']] = $tmpgroup['items_id'];
          }
       } else {
-         $results = PluginFusioninventoryDeployGroup_Dynamicdata::getTargetsByGroup($group);
+         $results = PluginFusioninventoryDeployGroup_Dynamicdata::getTargetsByGroup($group,
+                                                                                    $use_cache);
       }
       return $results;
    }

diff --git a/inc/deploygroup_dynamicdata.class.php b/inc/deploygroup_dynamicdata.class.php
@@ -190,27 +190,66 @@ static function getDatas($itemtype, $params, array $forcedisplay=array()) {
     *
     * @since 0.85+1.0
     *
-    * @param object $group PluginFusioninventoryDeployGroup instance
-    * @return array
+    * @param group the group object
+    * @param use_cache retrieve computers_id from cache (computers_id_cache field)
+    * @return an array of computer ids
     */
-   static function getTargetsByGroup(PluginFusioninventoryDeployGroup $group) {
-      $search_params = PluginFusioninventoryDeployGroup::getSearchParamsAsAnArray($group, false,true);
-      if (isset($search_params['metacriteria']) && empty($search_params['metacriteria'])) {
-         unset($search_params['metacriteria']);
-      }
-      $search_params['sort'] = '';
+   static function getTargetsByGroup(PluginFusioninventoryDeployGroup $group, $use_cache = false) {
+      $ids = array();
+
+      if (!$use_cache || !$ids = self::retrieveCache($group)) {
+         $search_params = PluginFusioninventoryDeployGroup::getSearchParamsAsAnArray($group, false,true);
+         if (isset($search_params['metacriteria']) && empty($search_params['metacriteria'])) {
+            unset($search_params['metacriteria']);
+         }
+
+         //force no sort (Search engine will sort by id) for better performance
+         $search_params['sort'] = '';
 
-      //Only retrieve computers IDs
-      $results = Search::prepareDatasForSearch('PluginFusioninventoryComputer', $search_params, array('2'));
-      Search::constructSQL($results);
-      $results['sql']['search'] = str_replace("`mainitemtype` = 'PluginFusioninventoryComputer'",
+         //Only retrieve computers IDs
+         $results = self::getDatas(
+            'PluginFusioninventoryComputer',
+            $search_params,
+            array('2')
+         );
+
+         $results = Search::prepareDatasForSearch('PluginFusioninventoryComputer', $search_params, array('2'));
+         Search::constructSQL($results);
+         $results['sql']['search'] = str_replace("`mainitemtype` = 'PluginFusioninventoryComputer'",
               "`mainitemtype` = 'Computer'", $results['sql']['search']);
-      Search::constructDatas($results);
+         Search::constructDatas($results);
 
-      $ids = array();
-      foreach ($results['data']['rows'] as $row) {
-         $ids[$row['id']] = $row['id'];
+         foreach ($results['data']['rows'] as $id => $row) {
+            $ids[$row['id']] = $row['id'];
+         }
+
+         //store results in cache (for reusing on agent communication)
+         self::storeCache($group, $ids);
+      }
+
+      return $ids;
+   }
+
+   static function storeCache(PluginFusioninventoryDeployGroup $group, $ids) {
+      global $DB;
+
+      $query = "UPDATE ".self::getTable()."
+                SET `computers_id_cache` = '".$DB->escape(json_encode($ids))."'
+                WHERE `plugin_fusioninventory_deploygroups_id` = '".$group->getID()."'";
+      return $DB->query($query);
+   }
+
+   static function retrieveCache(PluginFusioninventoryDeployGroup $group) {
+      global $DB;
+
+      $ids  = false;
+      $data = getAllDatasFromTable(self::getTable(),
+                                   "`plugin_fusioninventory_deploygroups_id` = '".$group->getID()."'");
+      if (count($data)) {
+         $first = array_shift($data);
+         $ids   = json_decode($first['computers_id_cache'], true);
       }
+
       return $ids;
    }
 }

diff --git a/inc/task.class.php b/inc/task.class.php
@@ -276,7 +276,7 @@ function getTaskjobstatesForAgent($agent_id, $methods = array(), $options=array(
             $actor_key = "".key($actor)."_".$actor[key($actor)];
             if (!isset($actors[$actor_key])) {
                $actors[$actor_key] = array();
-               foreach ($this->getAgentsFromActors(array($actor)) as $agent) {
+               foreach ($this->getAgentsFromActors(array($actor), true) as $agent) {
                   $actors[$actor_key][$agent] = true;
                }
             }
@@ -662,9 +662,10 @@ function prepareTaskjobs($methods = array()) {
     * corresponding itemtype classes.
     *
     * @param array $actors
+    * @param bool  $use_cache retrieve agents from cache or not
     * @return array list of agents
     */
-   public function getAgentsFromActors($actors = array()) {
+   public function getAgentsFromActors($actors = array(), $use_cache = false) {
       $agents = array();
       $computers = array();
       $computer = new Computer();
@@ -688,7 +689,7 @@ public function getAgentsFromActors($actors = array()) {
             case 'PluginFusioninventoryDeployGroup':
                $group_targets = $pfToolbox->executeAsFusioninventoryUser(
                   'PluginFusioninventoryDeployGroup::getTargetsForGroup',
-                  array($itemid)
+                  array($itemid, $use_cache)
                );
                foreach ($group_targets as $computerid) {
                   $computers[$computerid] = 1;

diff --git a/install/mysql/plugin_fusioninventory-empty.sql b/install/mysql/plugin_fusioninventory-empty.sql
@@ -915,6 +915,7 @@ CREATE TABLE `glpi_plugin_fusioninventory_deploygroups_dynamicdatas` (
   `plugin_fusioninventory_deploygroups_id` int(11) NOT NULL DEFAULT '0',
   `fields_array` text DEFAULT NULL,
   `can_update_group` tinyint(1) NOT NULL DEFAULT '0',
+  `computers_id_cache` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `plugin_fusioninventory_deploygroups_id` (`plugin_fusioninventory_deploygroups_id`),
   KEY `can_update_group` (`can_update_group`)

diff --git a/install/update.php b/install/update.php
@@ -894,25 +894,6 @@ function pluginFusioninventoryUpdate($current_version, $migrationname='Migration
                                'comment'=>'Wake agents ups'));
    }
 
-   /**
-   * Add field to manage which group can be refreshed by updatedynamictasks crontask
-   */
-   if (!FieldExists('glpi_plugin_fusioninventory_deploygroups_dynamicdatas', 'can_update_group')) {
-      $migration->addField('glpi_plugin_fusioninventory_deploygroups_dynamicdatas', 'can_update_group', 'bool');
-      $migration->addKey('glpi_plugin_fusioninventory_deploygroups_dynamicdatas', 'can_update_group');
-      $migration->migrationOneTable('glpi_plugin_fusioninventory_deploygroups_dynamicdatas');
-   }
-
-
-      //Change static & dynamic structure to fit the GLPI framework
-      $migration->changeField('glpi_plugin_fusioninventory_deploygroups_dynamicdatas',
-                              'groups_id',
-                              'plugin_fusioninventory_deploygroups_id', 'integer');
-      $migration->migrationOneTable('glpi_plugin_fusioninventory_deploygroups_dynamicdatas');
-      $migration->changeField('glpi_plugin_fusioninventory_deploygroups_staticdatas',
-                              'groups_id', 'plugin_fusioninventory_deploygroups_id', 'integer');
-      $migration->migrationOneTable('glpi_plugin_fusioninventory_deploygroups_staticdatas');
-
 
 
    // Fix software version in computers. see https://github.com/fusioninventory/fusioninventory-for-glpi/issues/1810
@@ -5534,7 +5515,7 @@ function do_deploygroup_migration($migration) {
          'type' => 'autoincrement',
          'value' => NULL
       ),
-      'groups_id' =>  array(
+      'plugin_fusioninventory_deploygroups_id' =>  array(
          'type' => 'integer',
          'value' => NULL
       ),
@@ -5552,11 +5533,12 @@ function do_deploygroup_migration($migration) {
    );
 
    $a_table['renamefields'] = array(
+      'groups_id' => 'plugin_fusioninventory_deploygroups_id',
    );
 
    $a_table['keys'] = array(
       array(
-         'field' => 'groups_id',
+         'field' => 'plugin_fusioninventory_deploygroups_id',
          'name' => '',
          'type' => 'KEY'
       ),
@@ -5589,25 +5571,39 @@ function do_deploygroup_migration($migration) {
          'type' => 'autoincrement',
          'value' => NULL
       ),
-      'groups_id' =>  array(
+      'plugin_fusioninventory_deploygroups_id' =>  array(
          'type' => 'integer',
          'value' => NULL
       ),
       'fields_array' =>  array(
          'type' => 'text',
          'value' => NULL
       ),
+      'can_update_group' =>  array(
+         'type' => 'bool',
+         'value' => 0
+      ),
+      'computers_id_cache' =>  array(
+         'type' => 'text',
+         'value' => NULL
+      ),
    );
 
    $a_table['oldfields'] = array(
    );
 
    $a_table['renamefields'] = array(
+      'groups_id' => 'plugin_fusioninventory_deploygroups_id',
    );
 
    $a_table['keys'] = array(
       array(
-         'field' => 'groups_id',
+         'field' => 'plugin_fusioninventory_deploygroups_id',
+         'name' => '',
+         'type' => 'KEY'
+      ),
+      array(
+         'field' => 'can_update_group',
          'name' => '',
          'type' => 'KEY'
       ),