Commit 9d9d7582 authored by unknown's avatar unknown
Browse files

added support for 'show status like 'Ndb%'' 

added number_of_replicas printout in show table status


mysql-test/r/ndb_alter_table.result:
  added number_of_replicas to show table status printout
mysql-test/r/ndb_autodiscover.result:
  added number_of_replicas to show table status printout
ndb/include/ndbapi/NdbDictionary.hpp:
  added get method for replica count
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  added get method of node id
ndb/src/ndbapi/NdbDictionary.cpp:
  added get method for replica count
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added get method of node id
parent e1e34b51

mysql-test/r/ndb_alter_table.result

+4 −4
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null, 
col6 int not null, to_be_deleted int)  ENGINE=ndbcluster;

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	10	Dynamic	0	0	0	0	0	0	1	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	ndbcluster	10	Dynamic	0	0	0	0	0	0	1	NULL	NULL	NULL	latin1_swedish_ci	NULL		number_of_replicas: 2

SET SQL_MODE=NO_AUTO_VALUE_ON_ZERO;

insert into t1 values

(0,4,3,5,"PENDING",1,7),(NULL,4,3,5,"PENDING",1,7),(31,4,3,5,"PENDING",1,7), (7,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7), (100,4,3,5,"PENDING",1,7), (99,4,3,5,"PENDING",1,7), (8,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7);

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	10	Dynamic	9	96	131072	0	0	0	101	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	ndbcluster	10	Dynamic	9	96	131072	0	0	0	101	NULL	NULL	NULL	latin1_swedish_ci	NULL		number_of_replicas: 2

select * from t1 order by col1;

col1	col2	col3	col4	col5	col6	to_be_deleted

0	4	3	5	PENDING	1	7
@@ -60,7 +60,7 @@ change column col2 fourth varchar(30) not null after col3, 
modify column col6 int not null first;

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	10	Dynamic	9	152	131072	0	0	0	102	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	ndbcluster	10	Dynamic	9	152	131072	0	0	0	102	NULL	NULL	NULL	latin1_swedish_ci	NULL		number_of_replicas: 2

select * from t1 order by col1;

col6	col1	col3	fourth	col4	col4_5	col5	col7	col8

1	0	3	4	5		PENDING		0000-00-00 00:00:00
@@ -75,7 +75,7 @@ col6 col1 col3 fourth col4 col4_5 col5 col7 col8 
insert into t1 values (2, NULL,4,3,5,99,"PENDING","EXTRA",'2004-01-01 00:00:00');

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	10	Dynamic	10	152	131072	0	0	0	103	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	ndbcluster	10	Dynamic	10	152	131072	0	0	0	103	NULL	NULL	NULL	latin1_swedish_ci	NULL		number_of_replicas: 2

select * from t1 order by col1;

col6	col1	col3	fourth	col4	col4_5	col5	col7	col8

1	0	3	4	5		PENDING		0000-00-00 00:00:00

mysql-test/r/ndb_autodiscover.result

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ flush tables; 
show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t6	MyISAM	9	Fixed	1	260	#	#	#	0	NULL	#	#	NULL	#	NULL		

t7	ndbcluster	9	Fixed	1	276	#	#	#	0	NULL	#	#	NULL	#	NULL		

t7	ndbcluster	9	Fixed	1	276	#	#	#	0	NULL	#	#	NULL	#	NULL		number_of_replicas: 2

show status like 'handler_discover%';

Variable_name	Value

Handler_discover	2

ndb/include/ndbapi/NdbDictionary.hpp

+2 −0
Original line number Diff line number Diff line
@@ -715,6 +715,8 @@ public: 


    int getRowSizeInBytes() const ;

    int createTableInDb(Ndb*, bool existingEqualIsOk = true) const ;



    int getReplicaCount() const ;

#endif



  private:

ndb/include/ndbapi/ndb_cluster_connection.hpp

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public: 
  void set_optimized_node_selection(int val);



  unsigned no_db_nodes();

  unsigned node_id();

#endif



private:

ndb/src/ndbapi/NdbDictionary.cpp

+5 −0
Original line number Diff line number Diff line
@@ -432,6 +432,11 @@ NdbDictionary::Table::getRowSizeInBytes() const { 
  return sz * 4;

}



int

NdbDictionary::Table::getReplicaCount() const {  

  return m_impl.m_replicaCount;

}



int

NdbDictionary::Table::createTableInDb(Ndb* pNdb, bool equalOk) const {  

  const NdbDictionary::Table * pTab =