summaryrefslogtreecommitdiff
path: root/sql/opt_trace.h
diff options
context:
space:
mode:
authorVarun Gupta <varun.gupta@mariadb.com>2019-02-18 17:11:20 +0530
committerVarun Gupta <varun.gupta@mariadb.com>2019-02-18 17:11:20 +0530
commit9cb55143ac78c8c0dc4781883bd24ee9284dbbce (patch)
treeaf18e55a055186fd988f536cf349484a6c3a2e26 /sql/opt_trace.h
parent7d2138d4a4788b8979c13e995d357097b0372ae2 (diff)
downloadmariadb-git-9cb55143ac78c8c0dc4781883bd24ee9284dbbce.tar.gz
Minor cleanup in the optimizer trace code.
More test coverage added for the optimizer trace.
Diffstat (limited to 'sql/opt_trace.h')
-rw-r--r--sql/opt_trace.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/sql/opt_trace.h b/sql/opt_trace.h
index 0e2d0146a49..52318bc6b7f 100644
--- a/sql/opt_trace.h
+++ b/sql/opt_trace.h
@@ -193,9 +193,16 @@ void opt_trace_disable_if_no_stored_proc_func_access(THD *thd, sp_head *sp);
*/
int fill_optimizer_trace_info(THD *thd, TABLE_LIST *tables, Item *);
-#define OPT_TRACE_TRANSFORM(writer, object_level0, object_level1, \
+#define OPT_TRACE_TRANSFORM(thd, object_level0, object_level1, \
select_number, from, to) \
- Json_writer_object object_level0(writer); \
- Json_writer_object object_level1(writer, "transformation"); \
+ Json_writer_object object_level0(thd); \
+ Json_writer_object object_level1(thd, "transformation"); \
object_level1.add_select_number(select_number).add("from", from).add("to", to);
-#endif \ No newline at end of file
+
+#define OPT_TRACE_VIEWS_TRANSFORM(thd, object_level0, object_level1, \
+ derived, name, select_number, algorithm) \
+ Json_writer_object trace_wrapper(thd); \
+ Json_writer_object trace_derived(thd, derived); \
+ trace_derived.add("table", name).add_select_number(select_number) \
+ .add("algorithm", algorithm);
+#endif