From 5fbe8a1f9d0c80ff150148de386747a159e94ea8 Mon Sep 17 00:00:00 2001
From: lyvivian0077 <lyvivian0077@users.noreply.github.com>
Date: Sat, 11 Apr 2020 18:12:09 +0900
Subject: [PATCH] mysql_info: Add parameter for __collect method (#136)

* [Add] Add parameter for __collect method

Add parameter for `__collect` method

By default the class `MySQL_Info` get all MySQL instance information,
add  parameter for `__collect` to  get only what wants to know(information)

Feature Pull Request

lib/ansible/modules/database/mysql/mysql_info.py

* typo

* [add] add changelog

- bugfixes:
  - mysql_info - add parameter for __collect to get only what are wanted (https://github.com/ansible-collections/community.general/pull/136).
---
 .../fragments/mysql_info_add_parameter.yml    |  2 +
 plugins/modules/database/mysql/mysql_info.py  | 40 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 changelogs/fragments/mysql_info_add_parameter.yml

diff --git a/changelogs/fragments/mysql_info_add_parameter.yml b/changelogs/fragments/mysql_info_add_parameter.yml
new file mode 100644
index 0000000000..ebb5d49b5b
--- /dev/null
+++ b/changelogs/fragments/mysql_info_add_parameter.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- mysql_info - add parameter for __collect to get only what are wanted (https://github.com/ansible-collections/community.general/pull/136).
diff --git a/plugins/modules/database/mysql/mysql_info.py b/plugins/modules/database/mysql/mysql_info.py
index 281ac60b86..2a408975db 100644
--- a/plugins/modules/database/mysql/mysql_info.py
+++ b/plugins/modules/database/mysql/mysql_info.py
@@ -257,7 +257,6 @@ class MySQL_Info(object):
             filter_ (list): List of collected subsets (e.g., databases, users, etc.),
                 when it is empty, return all available information.
         """
-        self.__collect(exclude_fields, return_empty_dbs)
 
         inc_list = []
         exc_list = []
@@ -277,11 +276,16 @@ class MySQL_Info(object):
                     inc_list.append(fi)
 
             if inc_list:
+                self.__collect(exclude_fields, return_empty_dbs, set(inc_list))
+
                 for i in self.info:
                     if i in inc_list:
                         partial_info[i] = self.info[i]
 
             else:
+                not_in_exc_list = list(set(self.info) - set(exc_list))
+                self.__collect(exclude_fields, return_empty_dbs, set(not_in_exc_list))
+
                 for i in self.info:
                     if i not in exc_list:
                         partial_info[i] = self.info[i]
@@ -289,18 +293,34 @@ class MySQL_Info(object):
             return partial_info
 
         else:
+            self.__collect(exclude_fields, return_empty_dbs, set(self.info))
             return self.info
 
-    def __collect(self, exclude_fields, return_empty_dbs):
+    def __collect(self, exclude_fields, return_empty_dbs, wanted):
         """Collect all possible subsets."""
-        self.__get_databases(exclude_fields, return_empty_dbs)
-        self.__get_global_variables()
-        self.__get_global_status()
-        self.__get_engines()
-        self.__get_users()
-        self.__get_master_status()
-        self.__get_slave_status()
-        self.__get_slaves()
+        if 'version' in wanted or 'settings' in wanted:
+            self.__get_global_variables()
+
+        if 'databases' in wanted:
+            self.__get_databases(exclude_fields, return_empty_dbs)
+
+        if 'global_status' in wanted:
+            self.__get_global_status()
+
+        if 'engines' in wanted:
+            self.__get_engines()
+
+        if 'users' in wanted:
+            self.__get_users()
+
+        if 'master_status' in wanted:
+            self.__get_master_status()
+
+        if 'slave_status' in wanted:
+            self.__get_slave_status()
+
+        if 'slave_hosts' in wanted:
+            self.__get_slaves()
 
     def __get_engines(self):
         """Get storage engines info."""