Commit aa5dba42 authored by unknown's avatar unknown
Browse files

WL#2269 Enable query cache for NDB part 2 

-This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
fetches commit count from NDB at regular intervals. The major fix is to add a
list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
transaction and then "clearing" them in ndbcluster_commit.


mysql-test/r/ndb_cache2.result:
  Updated test cases for the ndb_util thread, more simultaneous tables and more tesst
mysql-test/t/ndb_cache2.test:
  Updated test cases for the ndb_util thread, more simultaneous tables and more advanced tesst
sql/ha_ndbcluster.cc:
  Add table changed during transaction to list of changed tables in Thd_ndb, this list is then used in ndbcluster_commit to invalidate the cached commit_count in share
  Fix so that ndb_util_thread uses milliseconds "sleeps"
  Changed so that ndb_commit_count uses the commit_count from share if available
sql/ha_ndbcluster.h:
  Add commit_count_lock to NBD_SHARE, use for detecting simultaneous attempts to update commit_count
  Add list of tables changed by transaction to Thd_ndb
  Change check_ndb_connection to take thd as argument, use current_thd as default
  Added m_rows_changed variable to keep track of if this handler has modified any records within the transaction
sql/set_var.cc:
  Change format of code
  Sort sys__ variables in aplha order
parent 87636012

mysql-test/r/ndb_cache2.result

+474 −44
Original line number Diff line number Diff line 
drop table if exists t1;

drop table if exists t1, t2, t3, t4, t5;

set GLOBAL query_cache_type=on;

set GLOBAL query_cache_size=1355776;

set GLOBAL ndb_cache_check_time=1;

set GLOBAL ndb_cache_check_time=100;

reset query cache;

flush status;

CREATE TABLE t1 ( pk int not null primary key,

a int, b int not null, c varchar(20)) ENGINE=ndbcluster;

CREATE TABLE t1 (

pk int not null primary key,

a1 int,

b1 int not null,

c1 varchar(20)

) ENGINE=ndb;

CREATE TABLE t2 (

pk int not null primary key,

a2 int,

b2 int not null

) ENGINE=ndb;

CREATE TABLE t3 (

pk int not null primary key,

a3 int,

b3 int not null,

c3 int not null,

d3 varchar(20)

) ENGINE=ndb;

CREATE TABLE t4 (

a4 int,

b4 int not null,

c4 char(20)

) ENGINE=ndbcluster;

CREATE TABLE t5 (

pk int not null primary key,

a5 int,

b5 int not null,

c5 varchar(255)

) ENGINE=ndbcluster;

insert into t1 value (1, 2, 3, 'First row');

insert into t2 value (1, 2, 3);

insert into t3 value (1, 2, 3, 4, '3 - First row');

insert into t4 value (2, 3, '4 - First row');

insert into t5 value (1, 2, 3, '5 - First row');

select * from t1;

pk	a	b	c

pk	a1	b1	c1

1	2	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value
@@ -20,14 +51,14 @@ show status like "Qcache_hits"; 
Variable_name	Value

Qcache_hits	0

select * from t1;

pk	a	b	c

pk	a1	b1	c1

1	2	3	First row

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

update t1 set a=3 where pk=1;

update t1 set a1=3 where pk=1;

select * from t1;

pk	a	b	c

pk	a1	b1	c1

1	3	3	First row

show status like "Qcache_inserts";

Variable_name	Value
@@ -38,7 +69,7 @@ Qcache_hits 1 
insert into t1 value (2, 7, 8, 'Second row');

insert into t1 value (4, 5, 6, 'Fourth row');

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

4	5	6	Fourth row

2	7	8	Second row

1	3	3	First row
@@ -49,15 +80,15 @@ show status like "Qcache_hits"; 
Variable_name	Value

Qcache_hits	1

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

4	5	6	Fourth row

2	7	8	Second row

1	3	3	First row

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	2

select * from t1 where b=3;

pk	a	b	c

select * from t1 where b1=3;

pk	a1	b1	c1

1	3	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value
@@ -65,44 +96,44 @@ Qcache_queries_in_cache 2 
show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	2

select * from t1 where b=3;

pk	a	b	c

select * from t1 where b1=3;

pk	a1	b1	c1

1	3	3	First row

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	3

delete from t1 where c='Fourth row';

delete from t1 where c1='Fourth row';

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

select * from t1 where b=3;

pk	a	b	c

select * from t1 where b1=3;

pk	a1	b1	c1

1	3	3	First row

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	3

use test;

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

2	7	8	Second row

1	3	3	First row

select * from t1 where b=3;

pk	a	b	c

select * from t1 where b1=3;

pk	a1	b1	c1

1	3	3	First row

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	4

update t1 set a=4 where b=3;

update t1 set a1=4 where b1=3;

use test;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

2	7	8	Second row

1	4	3	First row

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

2	7	8	Second row

1	4	3	First row

show status like "Qcache_inserts";
@@ -112,11 +143,11 @@ show status like "Qcache_hits"; 
Variable_name	Value

Qcache_hits	5

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

2	7	8	Second row

1	4	3	First row

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

2	7	8	Second row

1	4	3	First row

show status like "Qcache_queries_in_cache";
@@ -128,64 +159,463 @@ Qcache_inserts 7 
show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	7

select * from t2;

pk	a2	b2

1	2	3

select * from t3;

pk	a3	b3	c3	d3

1	2	3	4	3 - First row

select * from t4;

a4	b4	c4

2	3	4 - First row

select * from t5;

pk	a5	b5	c5

1	2	3	5 - First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

flush status;

begin;

update t1 set a=5 where pk=1;

update t1 set a1=5 where pk=1;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

Qcache_queries_in_cache	4

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	7

Qcache_inserts	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	7

Qcache_hits	0

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

2	7	8	Second row

1	4	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	1

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	8

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	7

Qcache_hits	0

commit;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	1

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	8

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	7

Qcache_hits	0

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

2	7	8	Second row

1	5	3	First row

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	9

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	7

Qcache_hits	0

select * from t1 order by pk desc;

pk	a	b	c

pk	a1	b1	c1

2	7	8	Second row

1	5	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	1

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

flush status;

begin;

update t1 set a1=6 where pk=1;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	4

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from t1 order by pk desc;

pk	a1	b1	c1

2	7	8	Second row

1	5	3	First row

select * from t1 order by pk desc;

pk	a1	b1	c1

2	7	8	Second row

1	5	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

select * from t1 order by pk desc;

pk	a1	b1	c1

2	7	8	Second row

1	6	3	First row

select * from t1 order by pk desc;

pk	a1	b1	c1

2	7	8	Second row

1	6	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

commit;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

select * from t1 order by pk desc;

pk	a1	b1	c1

2	7	8	Second row

1	6	3	First row

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

select * from t1 order by pk desc;

pk	a1	b1	c1

2	7	8	Second row

1	6	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	2

flush status;

begin;

insert into t1 set pk=5, a1=6, b1=3, c1="New row";

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	4

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from t1 where pk=5;

pk	a1	b1	c1

select * from t1 order by pk desc;

pk	a1	b1	c1

2	7	8	Second row

1	6	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	6

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from t1 where pk=5;

pk	a1	b1	c1

5	6	3	New row

select * from t1 where pk=5;

pk	a1	b1	c1

5	6	3	New row

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

2	7	8	Second row

1	6	3	First row

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

2	7	8	Second row

1	6	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	6

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

commit;

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

2	7	8	Second row

1	6	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	3

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

flush status;

begin;

delete from t1 where pk=2;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	4

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from t1 where pk=2;

pk	a1	b1	c1

2	7	8	Second row

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

2	7	8	Second row

1	6	3	First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	6

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from t1 where pk=2;

pk	a1	b1	c1

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	6	3	First row

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	6	3	First row

select * from t1 where pk=2;

pk	a1	b1	c1

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	6

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

commit;

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	6	3	First row

select * from t1 where pk=2;

pk	a1	b1	c1

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	6

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	4

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

flush status;

begin;

update t1 set a1=9 where pk=1;

update t2 set a2=9 where pk=1;

update t3 set a3=9 where pk=1;

update t4 set a4=9 where a4=2;

update t5 set a5=9 where pk=1;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	6	3	First row

select * from t2;

pk	a2	b2

1	2	3

select * from t3;

pk	a3	b3	c3	d3

1	2	3	4	3 - First row

select * from t4;

a4	b4	c4

2	3	4 - First row

select * from t5;

pk	a5	b5	c5

1	2	3	5 - First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	5

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	9	3	First row

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	9	3	First row

select * from t2;

pk	a2	b2

1	9	3

select * from t3;

pk	a3	b3	c3	d3

1	9	3	4	3 - First row

select * from t4;

a4	b4	c4

9	3	4 - First row

select * from t5;

pk	a5	b5	c5

1	9	3	5 - First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	5

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

commit;

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	9	3	First row

select * from t2;

pk	a2	b2

1	9	3

select * from t3;

pk	a3	b3	c3	d3

1	9	3	4	3 - First row

select * from t4;

a4	b4	c4

9	3	4 - First row

select * from t5;

pk	a5	b5	c5

1	9	3	5 - First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	10

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	9	3	First row

select * from t2;

pk	a2	b2

1	9	3

select * from t3;

pk	a3	b3	c3	d3

1	9	3	4	3 - First row

select * from t4;

a4	b4	c4

9	3	4 - First row

select * from t5;

pk	a5	b5	c5

1	9	3	5 - First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	10

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	5

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	9	3	First row

select * from t2;

pk	a2	b2

1	9	3

select * from t3;

pk	a3	b3	c3	d3

1	9	3	4	3 - First row

select * from t4;

a4	b4	c4

9	3	4 - First row

select * from t5;

pk	a5	b5	c5

1	9	3	5 - First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	10

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	10

select * from t1 order by pk desc;

pk	a1	b1	c1

5	6	3	New row

1	9	3	First row

select * from t2;

pk	a2	b2

1	9	3

select * from t3;

pk	a3	b3	c3	d3

1	9	3	4	3 - First row

select * from t4;

a4	b4	c4

9	3	4 - First row

select * from t5;

pk	a5	b5	c5

1	9	3	5 - First row

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	5

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	9

Qcache_inserts	10

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	8

drop table t1;

Qcache_hits	15

drop table t1, t2, t3, t4, t5;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

mysql-test/t/ndb_cache2.test

+257 −23
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
-- source include/have_ndb.inc



--disable_warnings

drop table if exists t1;

drop table if exists t1, t2, t3, t4, t5;

--enable_warnings
@@ -10,19 +10,47 @@ drop table if exists t1; 
set GLOBAL query_cache_type=on;

set GLOBAL query_cache_size=1355776;

# Turn on thread that will fetch commit count for open tables

set GLOBAL ndb_cache_check_time=1;

set GLOBAL ndb_cache_check_time=100;

reset query cache;

flush status;



# Wait for thread to wake up and start "working"

sleep 20; 



# Create test table in NDB

CREATE TABLE t1 ( pk int not null primary key,

 a int, b int not null, c varchar(20)) ENGINE=ndbcluster;

# Create test tables in NDB

CREATE TABLE t1 (

  pk int not null primary key,

  a1 int,

  b1 int not null,

  c1 varchar(20)

) ENGINE=ndb;

CREATE TABLE t2 (

  pk int not null primary key,

  a2 int,

  b2 int not null

) ENGINE=ndb;

CREATE TABLE t3 (

  pk int not null primary key,

  a3 int,

  b3 int not null,

  c3 int not null,

  d3 varchar(20)

) ENGINE=ndb;

CREATE TABLE t4 (

  a4 int,

  b4 int not null,

  c4 char(20)

) ENGINE=ndbcluster;

CREATE TABLE t5 (

  pk int not null primary key,

  a5 int,

  b5 int not null,

  c5 varchar(255)

) ENGINE=ndbcluster;

insert into t1 value (1, 2, 3, 'First row');

insert into t2 value (1, 2, 3);

insert into t3 value (1, 2, 3, 4, '3 - First row');

insert into t4 value (2, 3, '4 - First row');

insert into t5 value (1, 2, 3, '5 - First row');



# Perform one query which should be inerted in query cache

# Perform one query which should be inserted in query cache

select * from t1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";
@@ -33,7 +61,7 @@ select * from t1; 
show status like "Qcache_hits";



# Update the table and make sure the correct data is returned

update t1 set a=3 where pk=1;

update t1 set a1=3 where pk=1;

select * from t1;

show status like "Qcache_inserts";

show status like "Qcache_hits";
@@ -48,18 +76,18 @@ select * from t1 order by pk desc; 
show status like "Qcache_hits";



# Perform a "new" query and make sure the query cache is not hit

select * from t1 where b=3;

select * from t1 where b1=3;

show status like "Qcache_queries_in_cache";

show status like "Qcache_hits";



# Same query again...

select * from t1 where b=3;

select * from t1 where b1=3;

show status like "Qcache_hits";



# Delete from the table

delete from t1 where c='Fourth row';

delete from t1 where c1='Fourth row';

show status like "Qcache_queries_in_cache";

select * from t1 where b=3;

select * from t1 where b1=3;

show status like "Qcache_hits";



# Start another connection and check that the query cache is hit
@@ -67,11 +95,11 @@ connect (con1,localhost,root,,); 
connection con1;

use test;

select * from t1 order by pk desc;

select * from t1 where b=3;

select * from t1 where b1=3;

show status like "Qcache_hits";



# Update the table and switch to other connection

update t1 set a=4 where b=3;

update t1 set a1=4 where b1=3;

connect (con2,localhost,root,,);

connection con2;

use test;
@@ -87,37 +115,243 @@ show status like "Qcache_queries_in_cache"; 
show status like "Qcache_inserts";

show status like "Qcache_hits";



# Use transactions and make sure the query cache is not updated until

# transaction is commited

# Load all tables into cache

select * from t2;

select * from t3;

select * from t4;

select * from t5;

show status like "Qcache_queries_in_cache";



#####################################################################

# Start transaction and perform update

# Switch to other transaction and check that update does not show up

# Switch back and commit transaction

# Switch to other transaction and check that update shows up

#####################################################################

connection con1;

flush status;

begin;

update t1 set a1=5 where pk=1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con2;

select * from t1 order by pk desc;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con1;

commit;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con2;

select * from t1 order by pk desc;

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con1;

select * from t1 order by pk desc;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";



#####################################################################

# Start transaction and perform update

# Switch to other transaction and check that update does not show up

# Switch back, perform selects and commit transaction

# Switch to other transaction and check that update shows up

#####################################################################

connection con1;

flush status;

begin;

update t1 set a1=6 where pk=1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con2;

select * from t1 order by pk desc;

select * from t1 order by pk desc;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con1;

# The two queries below will not hit cache since transaction is ongoing

select * from t1 order by pk desc;

select * from t1 order by pk desc;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

commit;



show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con2;

select * from t1 order by pk desc;

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con1;

select * from t1 order by pk desc;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";



#####################################################################

# Start transaction and perform insert

# Switch to other transaction and check that insert does not show up

# Switch back, perform selects and commit transaction

# Switch to other transaction and check that update shows up

#####################################################################

connection con1;

flush status;

begin;

insert into t1 set pk=5, a1=6, b1=3, c1="New row";

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con2;

select * from t1 where pk=5;

select * from t1 order by pk desc;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con1;

# The below four queries will not be cached, trans is ongoing

select * from t1 where pk=5;

select * from t1 where pk=5;

select * from t1 order by pk desc;

select * from t1 order by pk desc;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

commit;



connection con2;

select * from t1 order by pk desc;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";



connection con1;



#####################################################################

# Start transaction and perform delete

# Switch to other transaction and check that delete does not show up

# Switch back, perform selects and commit transaction

# Switch to other transaction and check that update shows up

#####################################################################

connection con1;

flush status;

begin;

update t1 set a=5 where pk=1;

delete from t1 where pk=2;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con2;

select * from t1 where pk=2;

select * from t1 order by pk desc;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con1;

# The below four queries will not be cached, trans is ongoing

select * from t1 where pk=2;

select * from t1 order by pk desc;

select * from t1 order by pk desc;

select * from t1 where pk=2;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

commit;

# Sleep to let the query cache thread update commit count

sleep 10;



connection con2;

select * from t1 order by pk desc;

select * from t1 where pk=2;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";



connection con1;



#####################################################################

# Start a transaction which updates all tables

# Switch to other transaction and check updates does not show up

# Switch back, perform selects and commit transaction

# Switch to other transaction and check that update shows up

#####################################################################

flush status;

begin;

update t1 set a1=9 where pk=1;

update t2 set a2=9 where pk=1;

update t3 set a3=9 where pk=1;

update t4 set a4=9 where a4=2;

update t5 set a5=9 where pk=1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con2;

select * from t1 order by pk desc;

select * from t2;

select * from t3;

select * from t4;

select * from t5;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

connection con1;

# The below five queries will not be cached, trans is ongoing

select * from t1 order by pk desc;

select * from t1 order by pk desc;

select * from t2;

select * from t3;

select * from t4;

select * from t5;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

commit;



connection con2;

select * from t1 order by pk desc;

select * from t2;

select * from t3;

select * from t4;

select * from t5;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";



connection con1;

select * from t1 order by pk desc;

select * from t2;

select * from t3;

select * from t4;

select * from t5;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from t1 order by pk desc;

select * from t2;

select * from t3;

select * from t4;

select * from t5;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";



connection con2;

select * from t1 order by pk desc;

select * from t2;

select * from t3;

select * from t4;

select * from t5;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";



drop table t1;

drop table t1, t2, t3, t4, t5;



# There should be no queries in cache, when tables have been dropped

show status like "Qcache_queries_in_cache";



SET GLOBAL query_cache_size=0;

sql/ha_ndbcluster.cc

+208 −92

File changed.

Preview size limit exceeded, changes collapsed.

sql/ha_ndbcluster.h

+4 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ typedef struct st_ndbcluster_share { 
  pthread_mutex_t mutex;

  char *table_name;

  uint table_name_length,use_count;

  uint commit_count_lock;

  ulonglong commit_count;

} NDB_SHARE;
@@ -77,6 +78,7 @@ class Thd_ndb { 
  NdbTransaction *all;

  NdbTransaction *stmt;

  int error;

  List<NDB_SHARE> changed_tables;

};



class ha_ndbcluster: public handler
@@ -226,7 +228,7 @@ class ha_ndbcluster: public handler 
  char *update_table_comment(const char * comment);



 private:

  int check_ndb_connection();

  int check_ndb_connection(THD* thd= current_thd);



  NdbTransaction *m_active_trans;

  NdbScanOperation *m_active_cursor;
@@ -250,6 +252,7 @@ class ha_ndbcluster: public handler 
  ha_rows m_rows_to_insert;

  ha_rows m_rows_inserted;

  ha_rows m_bulk_insert_rows;

  ha_rows m_rows_changed;

  bool m_bulk_insert_not_flushed;

  ha_rows m_ops_pending;

  bool m_skip_auto_increment;

sql/set_var.cc

+4 −4
Original line number Diff line number Diff line
@@ -413,7 +413,8 @@ sys_var_thd_bool 
sys_ndb_use_exact_count("ndb_use_exact_count", &SV::ndb_use_exact_count);

sys_var_thd_bool

sys_ndb_use_transactions("ndb_use_transactions", &SV::ndb_use_transactions);

sys_var_long_ptr sys_ndb_cache_check_time("ndb_cache_check_time", &ndb_cache_check_time);

sys_var_long_ptr

sys_ndb_cache_check_time("ndb_cache_check_time", &ndb_cache_check_time);

#endif



/* Time/date/datetime formats */
@@ -686,10 +687,10 @@ sys_var *sys_variables[]= 
#endif  

#ifdef HAVE_NDBCLUSTER_DB

  &sys_ndb_autoincrement_prefetch_sz,

  &sys_ndb_cache_check_time,

  &sys_ndb_force_send,

  &sys_ndb_use_exact_count,

  &sys_ndb_use_transactions,

  &sys_ndb_cache_check_time,

#endif

  &sys_unique_checks,

  &sys_updatable_views_with_limit,
@@ -1276,7 +1277,6 @@ static int check_max_delayed_threads(THD *thd, set_var *var) 
  return 0;

}





static void fix_max_connections(THD *thd, enum_var_type type)

{

#ifndef EMBEDDED_LIBRARY