Merge lp:~vkolesnikov/pbxt/pbxt-bug-368692 into lp:pbxt

[Vladimir Kolesnikov]

=== modified file 'ChangeLog'
--- ChangeLog	2009-06-30 15:58:15 +0000
+++ ChangeLog	2009-07-02 12:13:58 +0000
@@ -3,6 +3,8 @@
 
 ------- 1.0.08 RC2 - 2009-06-30
 
+RN252: Fixed bug #368692: PBXT not reporting data size correctly in information_schema
+
 RN251: A Windows-specific test update, also removed false assertion that failed on Windows.
 
 RN250: Fixed a bug that caused recovery to fail when the transaction log ID exceeded 255. The problem was a checksum failed in the log record.

=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc	2009-06-23 16:07:06 +0000
+++ src/ha_pbxt.cc	2009-07-02 12:13:58 +0000
@@ -3478,7 +3478,7 @@
 		if (flag & HA_STATUS_VARIABLE) {
 			stats.deleted = ot->ot_table->tab_row_fnum;
 			stats.records = (ha_rows) (ot->ot_table->tab_row_eof_id - 1 - stats.deleted);
-			stats.data_file_length = ot->ot_table->tab_rec_eof_id;
+			stats.data_file_length = xt_rec_id_to_rec_offset(ot->ot_table, ot->ot_table->tab_rec_eof_id);
 			stats.index_file_length = xt_ind_node_to_offset(ot->ot_table, ot->ot_table->tab_ind_eof);
 			stats.delete_length = ot->ot_table->tab_rec_fnum * ot->ot_rec_size;
 			//check_time = info.check_time;

=== modified file 'src/table_xt.cc'
--- src/table_xt.cc	2009-06-30 08:41:57 +0000
+++ src/table_xt.cc	2009-07-02 12:13:58 +0000
@@ -1764,6 +1764,7 @@
 	u_llong					max_comp_rec_len = 0;
 	size_t					rec_size;
 	size_t					row_size;
+	u_llong					ext_data_len = 0;
 
 #if defined(DUMP_CHECK_TABLE) || defined(CHECK_TABLE_STATS)
 	printf("\nCHECK TABLE: %s\n", tab->tab_name->ps_path);
@@ -1863,6 +1864,7 @@
 				printf("record-X ");
 #endif
 				alloc_rec_count++;
+				ext_data_len += XT_GET_DISK_4(rec_buf->re_log_dat_siz_4);
 				row_size = XT_GET_DISK_4(rec_buf->re_log_dat_siz_4) + ot->ot_rec_size - XT_REC_EXT_HEADER_SIZE;
 				alloc_rec_bytes += row_size;
 				if (!min_comp_rec_len || row_size < min_comp_rec_len)
@@ -1918,6 +1920,9 @@
 	}
 	
 #ifdef CHECK_TABLE_STATS
+	if (!tab->tab_dic.dic_rec_fixed)
+		printf("Extendend data length   = %llu\n", ext_data_len);
+	
 	if (alloc_rec_count) {
 		printf("Minumum comp. rec. len. = %llu\n", (u_llong) min_comp_rec_len);
 		printf("Average comp. rec. len. = %llu\n", (u_llong) ((double) alloc_rec_bytes / (double) alloc_rec_count + (double) 0.5));

=== modified file 'test/mysql-test/r/pbxt_bugs.result'
--- test/mysql-test/r/pbxt_bugs.result	2009-06-12 15:27:28 +0000
+++ test/mysql-test/r/pbxt_bugs.result	2009-07-02 12:13:58 +0000
@@ -1274,3 +1274,35 @@
 c1
 1
 DROP TABLE t1;
+create table t1 (c1 int, c2 int, c3 int) engine = pbxt;
+insert into t1 values (1,2,3);
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
+DATA_LENGTH	INDEX_LENGTH
[phone]
+alter table t1 add index (c1);
+alter table t1 add index (c2);
+alter table t1 add index (c3);
+SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
+DATA_LENGTH	INDEX_LENGTH
[phone]
+drop table t1;
+create table t1 (c1 int, c2 int, c3 int, c4 varchar(255), c5 varchar(255)) engine = pbxt;
+insert into t1 values (1,2,3, repeat('a', 255), repeat('b', 255));
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
+DATA_LENGTH	INDEX_LENGTH
[phone]
+alter table t1 add index (c1);
+alter table t1 add index (c2);
+alter table t1 add index (c3);
+SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
+DATA_LENGTH	INDEX_LENGTH
[phone]
+drop table t1;

=== modified file 'test/mysql-test/t/pbxt_bugs.test'
--- test/mysql-test/t/pbxt_bugs.test	2009-06-12 15:27:28 +0000
+++ test/mysql-test/t/pbxt_bugs.test	2009-07-02 12:13:58 +0000
@@ -977,6 +977,34 @@
 SELECT * FROM t1;
 DROP TABLE t1;
 
+# bug 368692: PBXT not reporting data size correctly in information_schema
+
+create table t1 (c1 int, c2 int, c3 int) engine = pbxt;
+insert into t1 values (1,2,3);
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
+alter table t1 add index (c1);
+alter table t1 add index (c2);
+alter table t1 add index (c3);
+SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
+drop table t1;
+# for variable size records, only the fixed part size is currently reported, the rest can be seen in server console after running CHECK TABLE
+create table t1 (c1 int, c2 int, c3 int, c4 varchar(255), c5 varchar(255)) engine = pbxt;
+insert into t1 values (1,2,3, repeat('a', 255), repeat('b', 255));
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
+alter table t1 add index (c1);
+alter table t1 add index (c2);
+alter table t1 add index (c3);
+SELECT DATA_LENGTH, INDEX_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
+drop table t1;
+
 --disable_query_log
 
 DROP TABLE t2, t5;