Merge ../10.2-window-funcs-r12 into 10.2

MariaDB · Apr 11, 2016 · b532be9 · b532be9
2 parents a4c8198 + 0f62eee
commit b532be9
Show file tree

Hide file tree

Showing 95 changed files with 11,757 additions and 2,819 deletions.
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
@@ -109,6 +109,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/table_cache.cc ../sql/mf_iocache_encr.cc
            ../sql/item_inetfunc.cc
            ../sql/wsrep_dummy.cc ../sql/encryption.cc
+           ../sql/item_windowfunc.cc ../sql/sql_window.cc
            ../sql/sql_cte.cc
            ${GEN_SOURCES}
            ${MYSYS_LIBWRAP_SOURCE}

diff --git a/mysql-test/r/analyze_format_json.result b/mysql-test/r/analyze_format_json.result
@@ -492,8 +492,9 @@ ANALYZE
     "select_id": 1,
     "r_loops": 1,
     "volatile parameter": "REPLACED",
-    "having_condition": "(TOP > a)",
+    "having_condition": "(TOP > t2.a)",
     "filesort": {
+      "sort_key": "t2.a",
       "r_loops": 1,
       "volatile parameter": "REPLACED",
       "r_used_priority_queue": false,
@@ -523,6 +524,7 @@ ANALYZE
     "r_loops": 1,
     "volatile parameter": "REPLACED",
     "filesort": {
+      "sort_key": "t2.a",
       "r_loops": 1,
       "volatile parameter": "REPLACED",
       "r_used_priority_queue": false,
@@ -563,6 +565,7 @@ ANALYZE
     "r_loops": 1,
     "volatile parameter": "REPLACED",
     "filesort": {
+      "sort_key": "t2.a",
       "r_loops": 1,
       "volatile parameter": "REPLACED",
       "r_used_priority_queue": false,
@@ -684,18 +687,20 @@ ANALYZE
     "r_loops": 1,
     "volatile parameter": "REPLACED",
     "filesort": {
+      "sort_key": "group_concat(t3.f3 separator ',')",
       "r_loops": 1,
       "volatile parameter": "REPLACED",
       "r_used_priority_queue": false,
       "r_output_rows": 0,
       "volatile parameter": "REPLACED",
-      "filesort": {
-        "r_loops": 1,
-        "volatile parameter": "REPLACED",
-        "r_used_priority_queue": false,
-        "r_output_rows": 0,
-        "volatile parameter": "REPLACED",
-        "temporary_table": {
+      "temporary_table": {
+        "filesort": {
+          "sort_key": "(subquery#2)",
+          "r_loops": 1,
+          "volatile parameter": "REPLACED",
+          "r_used_priority_queue": false,
+          "r_output_rows": 0,
+          "volatile parameter": "REPLACED",
           "temporary_table": {
             "table": {
               "table_name": "t2",

diff --git a/mysql-test/r/analyze_stmt_orderby.result b/mysql-test/r/analyze_stmt_orderby.result
@@ -172,8 +172,8 @@ EXPLAIN
   "query_block": {
     "select_id": 1,
     "filesort": {
+      "sort_key": "t2.b",
       "temporary_table": {
-        "function": "buffer",
         "table": {
           "table_name": "t0",
           "access_type": "ALL",
@@ -205,6 +205,7 @@ ANALYZE
     "r_loops": 1,
     "r_total_time_ms": "REPLACED",
     "filesort": {
+      "sort_key": "t2.b",
       "r_loops": 1,
       "r_total_time_ms": "REPLACED",
       "r_limit": 4,
@@ -257,6 +258,7 @@ EXPLAIN
     "select_id": 1,
     "read_sorted_file": {
       "filesort": {
+        "sort_key": "t0.a",
         "table": {
           "table_name": "t0",
           "access_type": "ALL",
@@ -290,6 +292,7 @@ ANALYZE
     "read_sorted_file": {
       "r_rows": 10,
       "filesort": {
+        "sort_key": "t0.a",
         "r_loops": 1,
         "r_total_time_ms": "REPLACED",
         "r_used_priority_queue": false,
@@ -346,6 +349,7 @@ ANALYZE
     "r_loops": 1,
     "r_total_time_ms": "REPLACED",
     "filesort": {
+      "sort_key": "t2.c",
       "r_loops": 1,
       "r_total_time_ms": "REPLACED",
       "r_used_priority_queue": false,
@@ -455,18 +459,20 @@ ANALYZE
     "r_loops": 1,
     "r_total_time_ms": "REPLACED",
     "filesort": {
+      "sort_key": "count(distinct t5.b)",
       "r_loops": 1,
       "r_total_time_ms": "REPLACED",
       "r_limit": 1,
       "r_used_priority_queue": true,
       "r_output_rows": 2,
-      "filesort": {
-        "r_loops": 1,
-        "r_total_time_ms": "REPLACED",
-        "r_used_priority_queue": false,
-        "r_output_rows": 6,
-        "r_buffer_size": "REPLACED",
-        "temporary_table": {
+      "temporary_table": {
+        "filesort": {
+          "sort_key": "t5.a",
+          "r_loops": 1,
+          "r_total_time_ms": "REPLACED",
+          "r_used_priority_queue": false,
+          "r_output_rows": 6,
+          "r_buffer_size": "REPLACED",
           "temporary_table": {
             "table": {
               "table_name": "t6",
@@ -511,26 +517,31 @@ EXPLAIN
   "query_block": {
     "select_id": 1,
     "filesort": {
+      "sort_key": "count(distinct t5.b)",
       "temporary_table": {
-        "function": "buffer",
-        "table": {
-          "table_name": "t6",
-          "access_type": "ALL",
-          "rows": 5,
-          "filtered": 100,
-          "attached_condition": "((t6.b > 0) and (t6.a <= 5))"
-        },
-        "block-nl-join": {
-          "table": {
-            "table_name": "t5",
-            "access_type": "ALL",
-            "rows": 7,
-            "filtered": 100
-          },
-          "buffer_type": "flat",
-          "buffer_size": "256Kb",
-          "join_type": "BNL",
-          "attached_condition": "(t5.a = t6.a)"
+        "filesort": {
+          "sort_key": "t5.a",
+          "temporary_table": {
+            "table": {
+              "table_name": "t6",
+              "access_type": "ALL",
+              "rows": 5,
+              "filtered": 100,
+              "attached_condition": "((t6.b > 0) and (t6.a <= 5))"
+            },
+            "block-nl-join": {
+              "table": {
+                "table_name": "t5",
+                "access_type": "ALL",
+                "rows": 7,
+                "filtered": 100
+              },
+              "buffer_type": "flat",
+              "buffer_size": "256Kb",
+              "join_type": "BNL",
+              "attached_condition": "(t5.a = t6.a)"
+            }
+          }
         }
       }
     }

diff --git a/mysql-test/r/derived_opt.result b/mysql-test/r/derived_opt.result
@@ -231,8 +231,8 @@ CREATE VIEW v1 AS SELECT a, MIN(b) AS b FROM t2 GROUP BY a;
 EXPLAIN
 SELECT * FROM v1, t1 WHERE v1.b=t1.a  ORDER BY v1.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	Using filesort
-1	PRIMARY	<derived2>	ref	key0	key0	5	const	1	Using where
+1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	
+1	PRIMARY	<derived2>	ref	key0	key0	5	const	1	Using where; Using filesort
 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	10	Using temporary; Using filesort
 SELECT * FROM v1, t1 WHERE v1.b=t1.a  ORDER BY v1.a;
 a	b	a

diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result
@@ -175,7 +175,7 @@ explain SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	4	Using where; Using temporary
 1	SIMPLE	t3	ref	a	a	5	test.t1.b	2	Using index
-1	SIMPLE	t2	index	a	a	4	NULL	5	Using where; Using index; Distinct; Using join buffer (flat, BNL join)
+1	SIMPLE	t2	index	a	a	4	NULL	5	Using where; Using index; Using join buffer (flat, BNL join)
 SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a;
 a
 1
@@ -302,11 +302,11 @@ WHERE
 AND ((t1.id=j_lj_t3.id AND t3_lj.id IS NULL) OR (t1.id=t3.id AND t3.idx=2));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	id	id	4	NULL	2	Using index; Using temporary
-1	SIMPLE	t2	index	id	id	8	NULL	1	Using index; Distinct; Using join buffer (flat, BNL join)
-1	SIMPLE	t3	index	id	id	8	NULL	1	Using index; Distinct; Using join buffer (flat, BNL join)
-1	SIMPLE	j_lj_t2	index	id	id	4	NULL	2	Using where; Using index; Distinct; Using join buffer (flat, BNL join)
-1	SIMPLE	t2_lj	ref	id	id	4	test.j_lj_t2.id	1	Using where; Using index; Distinct
-1	SIMPLE	j_lj_t3	index	id	id	4	NULL	2	Using where; Using index; Distinct; Using join buffer (flat, BNL join)
+1	SIMPLE	t2	index	id	id	8	NULL	1	Using index; Using join buffer (flat, BNL join)
+1	SIMPLE	t3	index	id	id	8	NULL	1	Using index; Using join buffer (flat, BNL join)
+1	SIMPLE	j_lj_t2	index	id	id	4	NULL	2	Using where; Using index; Using join buffer (flat, BNL join)
+1	SIMPLE	t2_lj	ref	id	id	4	test.j_lj_t2.id	1	Using where; Using index
+1	SIMPLE	j_lj_t3	index	id	id	4	NULL	2	Using where; Using index; Using join buffer (flat, BNL join)
 1	SIMPLE	t3_lj	ref	id	id	4	test.j_lj_t3.id	1	Using where; Using index; Distinct
 SELECT DISTINCT
 t1.id
@@ -518,7 +518,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1_1	ALL	NULL	NULL	NULL	NULL	3	Using temporary
-1	SIMPLE	t1_2	index	NULL	PRIMARY	4	NULL	3	Using index; Distinct; Using join buffer (flat, BNL join)
+1	SIMPLE	t1_2	index	NULL	PRIMARY	4	NULL	3	Using index; Using join buffer (flat, BNL join)
 EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2
 WHERE t1_1.a = t1_2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -916,8 +916,8 @@ SELECT STRAIGHT_JOIN DISTINCT t1.id  FROM
 t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	96	100.00	Using where; Using temporary
-1	PRIMARY	<derived2>	ref	key0	key0	5	test.t1.i1	9	100.00	Using where; Distinct
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where; Distinct; Using join buffer (flat, BNL join)
+1	PRIMARY	<derived2>	ref	key0	key0	5	test.t1.i1	9	100.00	Using where
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where; Using join buffer (flat, BNL join)
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	96	100.00	
 Warnings:
 Note	1003	select straight_join distinct `test`.`t1`.`id` AS `id` from `test`.`t1` join `test`.`v1` join `test`.`t2` where ((`test`.`t2`.`i` = `v1`.`id`) and (`v1`.`i1` = `test`.`t1`.`i1`) and (`v1`.`id` <> 3))

diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result
@@ -486,8 +486,8 @@ EXPLAIN
         "query_block": {
           "select_id": 2,
           "filesort": {
+            "sort_key": "t1.a",
             "temporary_table": {
-              "function": "buffer",
               "table": {
                 "table_name": "t1",
                 "access_type": "ALL",
@@ -530,8 +530,8 @@ EXPLAIN
         "query_block": {
           "select_id": 2,
           "filesort": {
+            "sort_key": "t1.a",
             "temporary_table": {
-              "function": "buffer",
               "table": {
                 "table_name": "t1",
                 "access_type": "ALL",
@@ -576,7 +576,6 @@ EXPLAIN
         "query_block": {
           "select_id": 2,
           "temporary_table": {
-            "function": "buffer",
             "table": {
               "table_name": "t1",
               "access_type": "ALL",
@@ -1132,8 +1131,8 @@ EXPLAIN
     "select_id": 1,
     "having_condition": "(TOP > t2.a)",
     "filesort": {
+      "sort_key": "t2.a",
       "temporary_table": {
-        "function": "buffer",
         "table": {
           "table_name": "t2",
           "access_type": "ALL",
@@ -1151,8 +1150,8 @@ EXPLAIN
   "query_block": {
     "select_id": 1,
     "filesort": {
+      "sort_key": "t2.a",
       "temporary_table": {
-        "function": "buffer",
         "table": {
           "table_name": "t2",
           "access_type": "ALL",
@@ -1181,8 +1180,8 @@ EXPLAIN
   "query_block": {
     "select_id": 1,
     "filesort": {
+      "sort_key": "t2.a",
       "temporary_table": {
-        "function": "buffer",
         "table": {
           "table_name": "t2",
           "access_type": "ALL",
@@ -1380,7 +1379,6 @@ EXPLAIN
   "query_block": {
     "select_id": 1,
     "temporary_table": {
-      "function": "buffer",
       "table": {
         "table_name": "t1",
         "access_type": "ALL",

diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
@@ -1519,7 +1519,7 @@ SELECT MAX(pk) as max, i
 FROM t1
 ORDER BY max;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	
 
 # Only 11 is correct for collumn i in this result
 SELECT MAX(pk) as max, i

diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
@@ -1346,12 +1346,43 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR JOIN (PRIMARY,i2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	144	
+#
+#  For this explain, the query plan is weird: if we are using 
+#  the primary key for reasons other than doing grouping, can't
+#  GROUP BY code take advantage of this?  Well, currently it doesnt:
 EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (PRIMARY,i2) GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	144	Using index
+1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	144	Using index; Using filesort
+#  Here's a proof it is really doing sorting:
+flush status;
+SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (PRIMARY,i2) GROUP BY a;
+show status like 'Sort_%';
+Variable_name	Value
+Sort_merge_passes	0
+Sort_priority_queue_sorts	0
+Sort_range	0
+Sort_rows	144
+Sort_scan	1
+# Proof ends.
+# 
+#  For this explain, the query plan is weird: if we are using 
+#  the primary key for reasons other than doing sorting, can't
+#  ORDER BY code take advantage of this?  Well, currently it doesnt:
 EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (PRIMARY,i2) ORDER BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	144	Using index
+1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	144	Using index; Using filesort
+#  Here's a proof it is really doing sorting:
+flush status;
+SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (PRIMARY,i2) ORDER BY a;
+show status like 'Sort_%';
+Variable_name	Value
+Sort_merge_passes	0
+Sort_priority_queue_sorts	0
+Sort_range	0
+Sort_rows	144
+Sort_scan	1
+# Proof ends.
+# 
 SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (PRIMARY,i2) ORDER BY a;
 a
 1

diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result
@@ -470,10 +470,9 @@ WHERE table2.f1 = 2
 GROUP BY table1.f1, table2.f2
 HAVING (table2.f2 = 8 AND table1.f1 >= 6);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	table2	const	PRIMARY	PRIMARY	4	const	1	100.00	Using filesort
-1	SIMPLE	table1	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible HAVING noticed after reading const tables
 Warnings:
-Note	1003	select `test`.`table1`.`f1` AS `f1`,7 AS `f2` from `test`.`t1` `table1` join `test`.`t1` `table2` where (`test`.`table1`.`f3` = 9) group by `test`.`table1`.`f1`,7 having ((7 = 8) and (`test`.`table1`.`f1` >= 6))
+Note	1003	select `test`.`table1`.`f1` AS `f1`,7 AS `f2` from `test`.`t1` `table1` join `test`.`t1` `table2` where (`test`.`table1`.`f3` = 9) group by `test`.`table1`.`f1`,7 having 0
 EXPLAIN EXTENDED
 SELECT table1.f1, table2.f2
 FROM t1 AS table1
@@ -482,10 +481,9 @@ WHERE table2.f1 = 2
 GROUP BY table1.f1, table2.f2
 HAVING (table2.f2 = 8);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	table2	const	PRIMARY	PRIMARY	4	const	1	100.00	Using filesort
-1	SIMPLE	table1	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible HAVING noticed after reading const tables
 Warnings:
-Note	1003	select `test`.`table1`.`f1` AS `f1`,7 AS `f2` from `test`.`t1` `table1` join `test`.`t1` `table2` where (`test`.`table1`.`f3` = 9) group by `test`.`table1`.`f1`,7 having (7 = 8)
+Note	1003	select `test`.`table1`.`f1` AS `f1`,7 AS `f2` from `test`.`t1` `table1` join `test`.`t1` `table2` where (`test`.`table1`.`f3` = 9) group by `test`.`table1`.`f1`,7 having 0
 DROP TABLE t1;
 #
 # Bug#52336 Segfault / crash in 5.1 copy_fields (param=0x9872980) at sql_select.cc:15355

diff --git a/mysql-test/r/join_cache.result b/mysql-test/r/join_cache.result
@@ -5412,9 +5412,9 @@ WHERE t2.c IN (SELECT c FROM t3,t4 WHERE t4.a < 10) AND
 t2.a BETWEEN 4 and 5
 ORDER BY t2.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	Using filesort
+1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	
 1	PRIMARY	t3	system	NULL	NULL	NULL	NULL	1	
-1	PRIMARY	t2	range	a,c	a	5	NULL	1	Using index condition; Using where
+1	PRIMARY	t2	range	a,c	a	5	NULL	1	Using index condition; Using where; Using filesort
 1	PRIMARY	t4	ref	c	c	5	test.t2.c	2	Using where; Start temporary; End temporary
 SELECT * FROM t1,t2
 WHERE t2.c IN (SELECT c FROM t3,t4 WHERE t4.a < 10) AND