From: Ole John Aske
Date: December 6 2010 11:38am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3388) Bug#58750
List-Archive: http://lists.mysql.com/commits/126122
X-Bug: 58750
Message-Id: <20101206113828.0E75E222@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5349990638817051274=="

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

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:ole.john.aske@stripped

 3388 Ole John Aske	2010-12-06
      SPJ-scan-scan: Cherry picked fix for bug#58750.
      
       If ha_ndbcluster::read_range_first_to_buf() had to do a ::full_table_scan()
       on a UNIQUE_INDEX, the resulting ScanOperation was not properly closed at end
       of its lifetime. If lots of such operations is executed within the
       same transaction, we will eventually run out of operation or transaction objects.
       (Transaction objects is due to a dumnmy Hupp'ed transaction object is allocated as
       part of a ScanOperation)
      
       This fix ensures that ::close_scan() is called for any open cursors at start of
       ha_ndbcluster::read_range_first_to_buf().

    modified:
      mysql-test/suite/ndb/r/ndb_index_unique.result
      mysql-test/suite/ndb/t/ndb_index_unique.test
      sql/ha_ndbcluster.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_index_unique.result'
--- a/mysql-test/suite/ndb/r/ndb_index_unique.result	2010-11-14 14:16:10 +0000
+++ b/mysql-test/suite/ndb/r/ndb_index_unique.result	2010-12-06 11:38:21 +0000
@@ -889,3 +889,27 @@ a
 4
 set engine_condition_pushdown = @old_ecpd;
 drop table t1;
+create table t1 (pk int primary key, a int) engine=ndb;
+create table t2 (pk int primary key, uq int, a int, 
+unique key ix(uq,a) USING HASH) engine=ndb;
+Warnings:
+Warning	1121	Ndb does not support unique index on NULL valued attributes, index access with NULL value will become full table scan
+insert into t2 values
+(0,0,0), (1,1,0), (2,2,0), (3,3,0), (4,4,0),
+(5,5,1), (6,6,1), (7,7,1), (8,8,1), (9,9,1);
+insert into t1
+select
+t1.pk + t2.pk*10 + t3.pk*100 + t4.pk*1000, t1.a
+from
+t2 as t1, t2 as t2, t2 as t3, t2 as t4;
+explain
+SELECT STRAIGHT_JOIN count(*) FROM 
+t1 JOIN t2 ON t2.a=t1.a where t2.uq IS NULL;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	10000	
+1	SIMPLE	t2	ref	ix	ix	10	const,test.t1.a	1	Using where with pushed condition
+SELECT STRAIGHT_JOIN count(*) FROM 
+t1 JOIN t2 ON t2.a=t1.a where t2.uq IS NULL;
+count(*)
+0
+drop table t1,t2;

=== modified file 'mysql-test/suite/ndb/t/ndb_index_unique.test'
--- a/mysql-test/suite/ndb/t/ndb_index_unique.test	2010-11-14 14:16:10 +0000
+++ b/mysql-test/suite/ndb/t/ndb_index_unique.test	2010-12-06 11:38:21 +0000
@@ -514,4 +514,42 @@ set engine_condition_pushdown = @old_ecp
 
 drop table t1;
 
+#
+# Bug#58750: 'out of connection objects' due to missing close()
+# of prev. full_table_scan()
+#
+create table t1 (pk int primary key, a int) engine=ndb;
+create table t2 (pk int primary key, uq int, a int, 
+   unique key ix(uq,a) USING HASH) engine=ndb;
+
+insert into t2 values
+   (0,0,0), (1,1,0), (2,2,0), (3,3,0), (4,4,0),
+   (5,5,1), (6,6,1), (7,7,1), (8,8,1), (9,9,1);
+
+##
+# 10^4 cross product on t2 creates 10.000 rows:
+##
+insert into t1
+ select
+   t1.pk + t2.pk*10 + t3.pk*100 + t4.pk*1000, t1.a
+from
+  t2 as t1, t2 as t2, t2 as t3, t2 as t4;
+
+# Execute a 'scan(t1) join REF(t2) using ix'
+#  - Where condition 't2.uq IS NULL' in combination with 
+#    join cond. 't2.a=t1.a' will create the REF keys (NULL,t1.a).
+#    This will initiate a ::full_table_scan() which fails to
+#    close any open table scans.
+#  - Table scan(t1) will 'drive' the case above and eventually
+#    cause all ScanOperations / hupp'ed transactions to have been 
+#    consumed
+
+explain
+SELECT STRAIGHT_JOIN count(*) FROM 
+   t1 JOIN t2 ON t2.a=t1.a where t2.uq IS NULL;
+SELECT STRAIGHT_JOIN count(*) FROM 
+   t1 JOIN t2 ON t2.a=t1.a where t2.uq IS NULL;
+
+drop table t1,t2;
+
 # end of tests

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-12-01 22:00:42 +0000
+++ b/sql/ha_ndbcluster.cc	2010-12-06 11:38:21 +0000
@@ -5762,6 +5762,8 @@ int ha_ndbcluster::full_table_scan(const
 
     m_thd_ndb->m_scan_count++;
     m_thd_ndb->m_pruned_scan_count += (op->getPruned()? 1 : 0);
+
+    DBUG_ASSERT(m_active_cursor==NULL);
     m_active_cursor= op;
 
     if (uses_blob_value(table->read_set) &&
@@ -7671,6 +7673,9 @@ int ha_ndbcluster::read_range_first_to_b
   DBUG_ENTER("ha_ndbcluster::read_range_first_to_buf");
   DBUG_PRINT("enter", ("type: %d, sorted: %d, descending: %d", type, sorted, desc));
 
+  if (unlikely((error= close_scan())))
+    DBUG_RETURN(error);
+
   if (m_use_partition_pruning)
   {
     DBUG_ASSERT(!m_pushed_join);
@@ -7710,8 +7715,6 @@ int ha_ndbcluster::read_range_first_to_b
         start_key->length == key_info->key_length &&
         start_key->flag == HA_READ_KEY_EXACT)
     {
-      if ((error= close_scan()))
-        DBUG_RETURN(error);
       if (!m_thd_ndb->trans)
         if (unlikely(!start_transaction_key(active_index,
                                             start_key->key, error)))
@@ -7727,9 +7730,6 @@ int ha_ndbcluster::read_range_first_to_b
         start_key->flag == HA_READ_KEY_EXACT && 
         !check_null_in_key(key_info, start_key->key, start_key->length))
     {
-      if ((error= close_scan()))
-        DBUG_RETURN(error);
-
       if (!m_thd_ndb->trans)
         if (unlikely(!start_transaction_key(active_index,
                                             start_key->key, error)))


--===============5349990638817051274==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   sqapd2qqs28vz9y6
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: af621153ff832ee320e4085344a058b0053cea32
# timestamp: 2010-12-06 12:38:27 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0-spj/
# base_revision_id: ole.john.aske@stripped\
#   i2v00tjho8yxg7da
# 
# Begin bundle
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
0J2QVEMcD/4u5IpwoSD5Z/VI


--===============5349990638817051274==--