From: Jan Wedvik
Date: June 7 2011 12:26pm
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (jan.wedvik:3501)
List-Archive: http://lists.mysql.com/commits/138788
Message-Id: <20110607122607.AAC78223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8373506530916023216=="

--===============8373506530916023216==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///net/atum17/export/home/tmp/jw159207/mysql/repo/push-scan-scan/ based on revid:jan.wedvik@stripped

 3501 Jan Wedvik	2011-06-07
      This commit adds a regression test case for http://lists.mysql.com/commits/138760 (mysql-5.1-telco-7.0 revno 4441,
      bushy scan with pruning).

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
=== modified file 'mysql-test/suite/ndb/r/ndb_join_pushdown.result'
--- a/mysql-test/suite/ndb/r/ndb_join_pushdown.result	2011-05-26 15:13:05 +0000
+++ b/mysql-test/suite/ndb/r/ndb_join_pushdown.result	2011-06-07 12:26:02 +0000
@@ -2057,6 +2057,19 @@ left join tx as x2 on x1.c=x2.a and x1.d
 count(*)
 304
 drop table tx;
+alter table t1 partition by key(a);
+explain select count(*) from t1 
+join t1 as t2 on t2.a = t1.c 
+join t1 as t3 on t3.a = t1.c;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	16	Parent of 3 pushed join@1
+1	SIMPLE	t2	ref	PRIMARY	PRIMARY	4	test.t1.c	1	Child of 't1' in pushed join@1
+1	SIMPLE	t3	ref	PRIMARY	PRIMARY	4	test.t1.c	1	Child of 't1' in pushed join@1
+select count(*) from t1 
+join t1 as t2 on t2.a = t1.c 
+join t1 as t3 on t3.a = t1.c;
+count(*)
+208
 drop table t1;
 create table t1 (a int, b int, primary key(a) using hash) engine = ndb;
 insert into t1 values (1, 2);
@@ -5156,13 +5169,13 @@ and spj_counts_at_end.counter_name <> 'L
        and spj_counts_at_end.counter_name <> 'SCAN_BATCHES_RETURNED';
 counter_name	spj_counts_at_end.val - spj_counts_at_startup.val
 CONST_PRUNED_RANGE_SCANS_RECEIVED	6
-LOCAL_TABLE_SCANS_SENT	232
-PRUNED_RANGE_SCANS_RECEIVED	17
+LOCAL_TABLE_SCANS_SENT	234
+PRUNED_RANGE_SCANS_RECEIVED	21
 RANGE_SCANS_RECEIVED	720
 READS_NOT_FOUND	6616
 READS_RECEIVED	52
-SCAN_ROWS_RETURNED	94233
-TABLE_SCANS_RECEIVED	232
+SCAN_ROWS_RETURNED	94353
+TABLE_SCANS_RECEIVED	234
 select sum(spj_counts_at_end.val - spj_counts_at_startup.val) as 'LOCAL+REMOTE READS_SENT'
        from spj_counts_at_end, spj_counts_at_startup 
 where spj_counts_at_end.counter_name = spj_counts_at_startup.counter_name
@@ -5173,15 +5186,15 @@ LOCAL+REMOTE READS_SENT
 drop table spj_counts_at_startup;
 drop table spj_counts_at_end;
 scan_count
-2555
+2562
 pruned_scan_count
 8
 sorted_scan_count
 10
 pushed_queries_defined
-379
+381
 pushed_queries_dropped
 11
 pushed_queries_executed
-532
+533
 set ndb_join_pushdown = @save_ndb_join_pushdown;

=== modified file 'mysql-test/suite/ndb/t/ndb_join_pushdown.test'
--- a/mysql-test/suite/ndb/t/ndb_join_pushdown.test	2011-05-26 15:13:05 +0000
+++ b/mysql-test/suite/ndb/t/ndb_join_pushdown.test	2011-06-07 12:26:02 +0000
@@ -996,6 +996,17 @@ select count(*) from tx as x1 
   left join tx as x2 on x1.c=x2.a and x1.d=x2.d;
 
 drop table tx;
+
+# Test bushy join with pruned scan.
+alter table t1 partition by key(a);
+
+explain select count(*) from t1 
+  join t1 as t2 on t2.a = t1.c 
+  join t1 as t3 on t3.a = t1.c;
+select count(*) from t1 
+  join t1 as t2 on t2.a = t1.c 
+  join t1 as t3 on t3.a = t1.c;
+
 drop table t1;
 
 


--===============8373506530916023216==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jan.wedvik@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jan.wedvik@stripped
# target_branch: file:///net/atum17/export/home/tmp/jw159207/mysql\
#   /repo/push-scan-scan/
# testament_sha1: a6283021d8f2ffd8f4dac17992bb686c22faeffe
# timestamp: 2011-06-07 14:26:07 +0200
# source_branch: bzr+ssh://jwedvik@stripped/bzrroot\
#   /server/mysql-5.1-telco-7.0/
# base_revision_id: jan.wedvik@stripped\
#   4tbf91xpery7eif8
# 
# Begin bundle
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


--===============8373506530916023216==--