Merge pull request #1592 from rpv-tomsk/mysql-plugin-sort

mysql plugin: Split 'mysql_sort' type into several types.

diff --git a/src/mysql.c b/src/mysql.c
index 8a16920..3850745 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -895,8 +895,15 @@ static int mysql_read (user_data_t *ud)
                }
                else if (strncmp (key, "Sort_", strlen ("Sort_")) == 0)
                {
-                       counter_submit ("mysql_sort", key + strlen ("Sort_"),
-                                       val, db);
+                       if (strcmp (key, "Sort_merge_passes") == 0)
+                               counter_submit ("mysql_sort_merge_passes", NULL, val, db);
+                       else if (strcmp (key, "Sort_rows") == 0)
+                               counter_submit ("mysql_sort_rows", NULL, val, db);
+                       else if (strcmp (key, "Sort_range") == 0)
+                               counter_submit ("mysql_sort", "range", val, db);
+                       else if (strcmp (key, "Sort_scan") == 0)
+                               counter_submit ("mysql_sort", "scan", val, db);
+                       
                }
        }
        mysql_free_result (res); res = NULL;

diff --git a/src/types.db b/src/types.db
index d5034e9..0d81524 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -129,6 +129,8 @@ mysql_innodb_row_lock       value:DERIVE:0:U
 mysql_innodb_rows      value:DERIVE:0:U
 mysql_select           value:DERIVE:0:U
 mysql_sort             value:DERIVE:0:U
+mysql_sort_merge_passes        value:DERIVE:0:U
+mysql_sort_rows                value:DERIVE:0:U
 nfs_procedure          value:DERIVE:0:U
 nginx_connections      value:GAUGE:0:U
 nginx_requests         value:DERIVE:0:U