Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2041 05/10/06 23:36:50 stewart@stripped +2 -0
WL#2076 Extra ndbd statistics
use the INFORMATION_SCHEMA.TABLESPACES, DATAFILES, LOGFILE_GROUPS and LOGFILES
in the ndb_basic_disk test.
mysql-test/t/ndb_basic_disk.test
1.8 05/10/06 23:36:46 stewart@stripped +45 -0
check the state of the datafiles, undofiles etc via selecting from INFORMATION_SCHEMA
mysql-test/r/ndb_basic_disk.result
1.5 05/10/06 23:36:46 stewart@stripped +138 -0
update result with results of selecting from applicable INFORMATION_SCEHMA tables.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: stewart
# Host: willster.(none)
# Root: /home/stewart/Documents/MySQL/5.1/ndb-dd
--- 1.4/mysql-test/r/ndb_basic_disk.result 2005-10-05 04:54:09 +10:00
+++ 1.5/mysql-test/r/ndb_basic_disk.result 2005-10-06 23:36:46 +10:00
@@ -1,28 +1,130 @@
DROP TABLE IF EXISTS t1;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+NAME ENGINE VERSION EXTENT_SIZE DEFAULT_LOGFILE_GROUP
+select * from INFORMATION_SCHEMA.DATAFILES;
+NAME ENGINE CLUSTER_NODE PATH SIZE FREE TABLESPACE
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+NAME ENGINE VERSION UNDOBUFFER_SIZE FREE_WORDS
+select * from INFORMATION_SCHEMA.LOGFILES;
+NAME ENGINE CLUSTER_NODE TYPE PATH SIZE LOGFILE_GROUP
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=NDB;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+NAME ENGINE VERSION EXTENT_SIZE DEFAULT_LOGFILE_GROUP
+select * from INFORMATION_SCHEMA.DATAFILES;
+NAME ENGINE CLUSTER_NODE PATH SIZE FREE TABLESPACE
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+NAME ENGINE VERSION UNDOBUFFER_SIZE FREE_WORDS
+lg1 NDB 1 1048576 4184068
+select * from INFORMATION_SCHEMA.LOGFILES;
+NAME ENGINE CLUSTER_NODE TYPE PATH SIZE LOGFILE_GROUP
+undofile.dat NDB 1 UNDO undofile.dat 16777216 lg1
+undofile.dat NDB 2 UNDO undofile.dat 16777216 lg1
alter logfile group lg1
add undofile 'undofile02.dat'
initial_size 4M engine=ndb;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+NAME ENGINE VERSION EXTENT_SIZE DEFAULT_LOGFILE_GROUP
+select * from INFORMATION_SCHEMA.DATAFILES;
+NAME ENGINE CLUSTER_NODE PATH SIZE FREE TABLESPACE
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+NAME ENGINE VERSION UNDOBUFFER_SIZE FREE_WORDS
+lg1 NDB 1 1048576 5223944
+select * from INFORMATION_SCHEMA.LOGFILES;
+NAME ENGINE CLUSTER_NODE TYPE PATH SIZE LOGFILE_GROUP
+undofile.dat NDB 1 UNDO undofile.dat 16777216 lg1
+undofile.dat NDB 2 UNDO undofile.dat 16777216 lg1
+undofile02.dat NDB 1 UNDO undofile02.dat 4194304 lg1
+undofile02.dat NDB 2 UNDO undofile02.dat 4194304 lg1
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE 12M
ENGINE NDB;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+NAME ENGINE VERSION EXTENT_SIZE DEFAULT_LOGFILE_GROUP
+ts1 NDB 1 1048576 lg1
+select * from INFORMATION_SCHEMA.DATAFILES;
+NAME ENGINE CLUSTER_NODE PATH SIZE FREE TABLESPACE
+datafile.dat NDB 1 datafile.dat 12582912 11534336 ts1
+datafile.dat NDB 2 datafile.dat 12582912 11534336 ts1
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+NAME ENGINE VERSION UNDOBUFFER_SIZE FREE_WORDS
+lg1 NDB 1 1048576 5223944
+select * from INFORMATION_SCHEMA.LOGFILES;
+NAME ENGINE CLUSTER_NODE TYPE PATH SIZE LOGFILE_GROUP
+undofile.dat NDB 1 UNDO undofile.dat 16777216 lg1
+undofile.dat NDB 2 UNDO undofile.dat 16777216 lg1
+undofile02.dat NDB 1 UNDO undofile02.dat 4194304 lg1
+undofile02.dat NDB 2 UNDO undofile02.dat 4194304 lg1
alter tablespace ts1
add datafile 'datafile02.dat'
initial_size 4M engine=ndb;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+NAME ENGINE VERSION EXTENT_SIZE DEFAULT_LOGFILE_GROUP
+ts1 NDB 1 1048576 lg1
+select * from INFORMATION_SCHEMA.DATAFILES;
+NAME ENGINE CLUSTER_NODE PATH SIZE FREE TABLESPACE
+datafile02.dat NDB 1 datafile02.dat 4194304 3145728 ts1
+datafile02.dat NDB 2 datafile02.dat 4194304 3145728 ts1
+datafile.dat NDB 1 datafile.dat 12582912 11534336 ts1
+datafile.dat NDB 2 datafile.dat 12582912 11534336 ts1
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+NAME ENGINE VERSION UNDOBUFFER_SIZE FREE_WORDS
+lg1 NDB 1 1048576 5223944
+select * from INFORMATION_SCHEMA.LOGFILES;
+NAME ENGINE CLUSTER_NODE TYPE PATH SIZE LOGFILE_GROUP
+undofile.dat NDB 1 UNDO undofile.dat 16777216 lg1
+undofile.dat NDB 2 UNDO undofile.dat 16777216 lg1
+undofile02.dat NDB 1 UNDO undofile02.dat 4194304 lg1
+undofile02.dat NDB 2 UNDO undofile02.dat 4194304 lg1
CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
tablespace ts1 storage disk
engine ndb;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+NAME ENGINE VERSION EXTENT_SIZE DEFAULT_LOGFILE_GROUP
+ts1 NDB 1 1048576 lg1
+select * from INFORMATION_SCHEMA.DATAFILES;
+NAME ENGINE CLUSTER_NODE PATH SIZE FREE TABLESPACE
+datafile02.dat NDB 1 datafile02.dat 4194304 3145728 ts1
+datafile02.dat NDB 2 datafile02.dat 4194304 3145728 ts1
+datafile.dat NDB 1 datafile.dat 12582912 11534336 ts1
+datafile.dat NDB 2 datafile.dat 12582912 11534336 ts1
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+NAME ENGINE VERSION UNDOBUFFER_SIZE FREE_WORDS
+lg1 NDB 1 1048576 5223942
+select * from INFORMATION_SCHEMA.LOGFILES;
+NAME ENGINE CLUSTER_NODE TYPE PATH SIZE LOGFILE_GROUP
+undofile.dat NDB 1 UNDO undofile.dat 16777216 lg1
+undofile.dat NDB 2 UNDO undofile.dat 16777216 lg1
+undofile02.dat NDB 1 UNDO undofile02.dat 4194304 lg1
+undofile02.dat NDB 2 UNDO undofile02.dat 4194304 lg1
INSERT INTO t1 VALUES (0, 0, 0);
SELECT * FROM t1;
pk1 b c
0 0 0
+select * from INFORMATION_SCHEMA.TABLESPACES;
+NAME ENGINE VERSION EXTENT_SIZE DEFAULT_LOGFILE_GROUP
+ts1 NDB 1 1048576 lg1
+select * from INFORMATION_SCHEMA.DATAFILES;
+NAME ENGINE CLUSTER_NODE PATH SIZE FREE TABLESPACE
+datafile02.dat NDB 1 datafile02.dat 4194304 2097152 ts1
+datafile02.dat NDB 2 datafile02.dat 4194304 2097152 ts1
+datafile.dat NDB 1 datafile.dat 12582912 11534336 ts1
+datafile.dat NDB 2 datafile.dat 12582912 11534336 ts1
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+NAME ENGINE VERSION UNDOBUFFER_SIZE FREE_WORDS
+lg1 NDB 1 1048576 5223939
+select * from INFORMATION_SCHEMA.LOGFILES;
+NAME ENGINE CLUSTER_NODE TYPE PATH SIZE LOGFILE_GROUP
+undofile.dat NDB 1 UNDO undofile.dat 16777216 lg1
+undofile.dat NDB 2 UNDO undofile.dat 16777216 lg1
+undofile02.dat NDB 1 UNDO undofile02.dat 4194304 lg1
+undofile02.dat NDB 2 UNDO undofile02.dat 4194304 lg1
INSERT INTO t1 VALUES
(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10),
@@ -127,6 +229,24 @@
SELECT COUNT(*) FROM t1;
COUNT(*)
501
+select * from INFORMATION_SCHEMA.TABLESPACES;
+NAME ENGINE VERSION EXTENT_SIZE DEFAULT_LOGFILE_GROUP
+ts1 NDB 1 1048576 lg1
+select * from INFORMATION_SCHEMA.DATAFILES;
+NAME ENGINE CLUSTER_NODE PATH SIZE FREE TABLESPACE
+datafile02.dat NDB 1 datafile02.dat 4194304 1048576 ts1
+datafile02.dat NDB 2 datafile02.dat 4194304 1048576 ts1
+datafile.dat NDB 1 datafile.dat 12582912 11534336 ts1
+datafile.dat NDB 2 datafile.dat 12582912 11534336 ts1
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+NAME ENGINE VERSION UNDOBUFFER_SIZE FREE_WORDS
+lg1 NDB 1 1048576 5221905
+select * from INFORMATION_SCHEMA.LOGFILES;
+NAME ENGINE CLUSTER_NODE TYPE PATH SIZE LOGFILE_GROUP
+undofile.dat NDB 1 UNDO undofile.dat 16777216 lg1
+undofile.dat NDB 2 UNDO undofile.dat 16777216 lg1
+undofile02.dat NDB 1 UNDO undofile02.dat 4194304 lg1
+undofile02.dat NDB 2 UNDO undofile02.dat 4194304 lg1
CREATE LOGFILE GROUP lg2
ADD UNDOFILE 'x.dat'
INITIAL_SIZE 10y
@@ -155,6 +275,24 @@
engine=ndb;
ERROR HY000: The size number was correct but we don't allow the digit part to be more than 2 billion
DROP TABLE t1;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+NAME ENGINE VERSION EXTENT_SIZE DEFAULT_LOGFILE_GROUP
+ts1 NDB 1 1048576 lg1
+select * from INFORMATION_SCHEMA.DATAFILES;
+NAME ENGINE CLUSTER_NODE PATH SIZE FREE TABLESPACE
+datafile02.dat NDB 1 datafile02.dat 4194304 3145728 ts1
+datafile02.dat NDB 2 datafile02.dat 4194304 3145728 ts1
+datafile.dat NDB 1 datafile.dat 12582912 11534336 ts1
+datafile.dat NDB 2 datafile.dat 12582912 11534336 ts1
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+NAME ENGINE VERSION UNDOBUFFER_SIZE FREE_WORDS
+lg1 NDB 1 1048576 5221905
+select * from INFORMATION_SCHEMA.LOGFILES;
+NAME ENGINE CLUSTER_NODE TYPE PATH SIZE LOGFILE_GROUP
+undofile.dat NDB 1 UNDO undofile.dat 16777216 lg1
+undofile.dat NDB 2 UNDO undofile.dat 16777216 lg1
+undofile02.dat NDB 1 UNDO undofile02.dat 4194304 lg1
+undofile02.dat NDB 2 UNDO undofile02.dat 4194304 lg1
create table t1 (a int primary key, b char(4) not null, c char(4) not null, key(b)) tablespace ts1 storage disk engine ndb;
insert into t1 values (1,'1','1'), (2,'2','2'), (3,'3','3');
begin;
--- 1.7/mysql-test/t/ndb_basic_disk.test 2005-10-05 04:54:09 +10:00
+++ 1.8/mysql-test/t/ndb_basic_disk.test 2005-10-06 23:36:46 +10:00
@@ -8,6 +8,11 @@
# Basic test of disk tables for NDB
#
+select * from INFORMATION_SCHEMA.TABLESPACES;
+select * from INFORMATION_SCHEMA.DATAFILES;
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+select * from INFORMATION_SCHEMA.LOGFILES;
+
#
# Start by creating a logfile group
#
@@ -18,10 +23,20 @@
UNDO_BUFFER_SIZE = 1M
ENGINE=NDB;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+select * from INFORMATION_SCHEMA.DATAFILES;
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+select * from INFORMATION_SCHEMA.LOGFILES;
+
alter logfile group lg1
add undofile 'undofile02.dat'
initial_size 4M engine=ndb;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+select * from INFORMATION_SCHEMA.DATAFILES;
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+select * from INFORMATION_SCHEMA.LOGFILES;
+
#
# Create a tablespace connected to the logfile group
#
@@ -32,10 +47,20 @@
INITIAL_SIZE 12M
ENGINE NDB;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+select * from INFORMATION_SCHEMA.DATAFILES;
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+select * from INFORMATION_SCHEMA.LOGFILES;
+
alter tablespace ts1
add datafile 'datafile02.dat'
initial_size 4M engine=ndb;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+select * from INFORMATION_SCHEMA.DATAFILES;
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+select * from INFORMATION_SCHEMA.LOGFILES;
+
#
# Create a table using this tablespace
#
@@ -45,9 +70,19 @@
tablespace ts1 storage disk
engine ndb;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+select * from INFORMATION_SCHEMA.DATAFILES;
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+select * from INFORMATION_SCHEMA.LOGFILES;
+
INSERT INTO t1 VALUES (0, 0, 0);
SELECT * FROM t1;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+select * from INFORMATION_SCHEMA.DATAFILES;
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+select * from INFORMATION_SCHEMA.LOGFILES;
+
INSERT INTO t1 VALUES
(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10),
@@ -152,6 +187,11 @@
SELECT COUNT(*) FROM t1;
+select * from INFORMATION_SCHEMA.TABLESPACES;
+select * from INFORMATION_SCHEMA.DATAFILES;
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+select * from INFORMATION_SCHEMA.LOGFILES;
+
#
# Test error cases with size numbers
#
@@ -186,6 +226,11 @@
engine=ndb;
DROP TABLE t1;
+
+select * from INFORMATION_SCHEMA.TABLESPACES;
+select * from INFORMATION_SCHEMA.DATAFILES;
+select * from INFORMATION_SCHEMA.LOGFILE_GROUPS;
+select * from INFORMATION_SCHEMA.LOGFILES;
# Test update of mm/dd part
create table t1 (a int primary key, b char(4) not null, c char(4) not null, key(b)) tablespace ts1 storage disk engine ndb;
| Thread |
|---|
| • bk commit into 5.1 tree (stewart:1.2041) | Stewart Smith | 6 Oct |
