Improvement of on-line discovery in injector thread (9e348383) · Commits · Software / OSDI20 Artifacts / mariadb

sql/ha_ndbcluster.cc

+8 −4

Original line number	Diff line number	Diff line
		@@ -519,6 +519,7 @@ void ha_ndbcluster::invalidate_dictionary_cache(bool global)
		{
		NDBINDEX index = (NDBINDEX ) m_index[i].index;
		NDBINDEX unique_index = (NDBINDEX ) m_index[i].unique_index;
		if (!index && !unique_index) continue;
		NDB_INDEX_TYPE idx_type= m_index[i].type;

		switch (idx_type) {
		@@ -1076,7 +1077,7 @@ int ha_ndbcluster::get_metadata(const char *path)
		m_table= (void *)tab;
		m_table_info= NULL; // Set in external lock

		DBUG_RETURN(open_indexes(ndb, table));
		DBUG_RETURN(open_indexes(ndb, table, FALSE));
		}

		static int fix_unique_index_attr_order(NDB_INDEX_DATA &data,
		@@ -1249,7 +1250,7 @@ int ha_ndbcluster::add_index_handle(THD thd, NDBDICT dict, KEY *key_info,
		/*
		Associate index handles for each index of a table
		*/
		int ha_ndbcluster::open_indexes(Ndb ndb, TABLE tab)
		int ha_ndbcluster::open_indexes(Ndb ndb, TABLE tab, bool ignore_error)
		{
		uint i;
		int error= 0;
		@@ -1263,6 +1264,9 @@ int ha_ndbcluster::open_indexes(Ndb ndb, TABLE tab)
		for (i= 0; i < tab->s->keys; i++, key_info++, key_name++)
		{
		if ((error= add_index_handle(thd, dict, key_info, *key_name, i)))
		if (ignore_error)
		m_index[i].index= m_index[i].unique_index= NULL;
		else
		break;
		}

		@@ -3699,7 +3703,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
		{
		m_table= (void *)tab;
		m_table_version = tab->getObjectVersion();
		if (!(my_errno= open_indexes(ndb, table)))
		if (!(my_errno= open_indexes(ndb, table, FALSE)))
		DBUG_RETURN(my_errno);
		}
		m_table_info= tab_info;

sql/ha_ndbcluster.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -691,6 +691,9 @@ static void set_tabname(const char pathname, char tabname);

		private:
		friend int ndbcluster_drop_database_impl(const char *path);
		friend int ndb_handle_schema_change(THD *thd,
		Ndb ndb, NdbEventOperation pOp,
		NDB_SHARE *share);
		int alter_table_name(const char *to);
		static int delete_table(ha_ndbcluster h, Ndb ndb,
		const char *path,
		@@ -708,7 +711,7 @@ static void set_tabname(const char pathname, char tabname);
		int create_indexes(Ndb ndb, TABLE tab);
		void clear_index(int i);
		void clear_indexes();
		int open_indexes(Ndb ndb, TABLE tab);
		int open_indexes(Ndb ndb, TABLE tab, bool ignore_error);
		void renumber_indexes(Ndb ndb, TABLE tab);
		int drop_indexes(Ndb ndb, TABLE tab);
		int add_index_handle(THD thd, NdbDictionary::Dictionary dict,

sql/ha_ndbcluster_binlog.cc

+102 −93

Original line number	Diff line number	Diff line
		@@ -233,37 +233,13 @@ static void run_query(THD thd, char buf, char *end,
		}
		}

		/*
		Initialize the binlog part of the NDB_SHARE
		*/
		void ndbcluster_binlog_init_share(NDB_SHARE share, TABLE _table)
		{
		THD *thd= current_thd;
		MEM_ROOT *mem_root= &share->mem_root;

		share->op= 0;
		share->table= 0;
		if (!ndb_binlog_running)
		{
		if (_table)
		{
		if (_table->s->primary_key == MAX_KEY)
		share->flags\|= NSF_HIDDEN_PK;
		if (_table->s->blob_fields != 0)
		share->flags\|= NSF_BLOB_FLAG;
		}
		else
		{
		share->flags\|= NSF_NO_BINLOG;
		}
		return;
		}
		while (1)
		int
		ndbcluster_binlog_open_table(THD thd, NDB_SHARE share,
		TABLE_SHARE table_share, TABLE table)
		{
		TABLE_SHARE *table_share=
		(TABLE_SHARE ) my_malloc(sizeof(table_share), MYF(MY_WME));
		TABLE table= (TABLE) my_malloc(sizeof(*table), MYF(MY_WME));
		int error;
		MEM_ROOT *mem_root= &share->mem_root;
		DBUG_ENTER("ndbcluster_binlog_open_table");

		init_tmp_table_share(table_share, share->db, 0, share->table_name,
		share->key);
		@@ -276,7 +252,7 @@ void ndbcluster_binlog_init_share(NDB_SHARE share, TABLE _table)
		table_share= 0;
		my_free((gptr) table, MYF(0));
		table= 0;
		break;
		DBUG_RETURN(error);
		}
		if ((error= open_table_from_share(thd, table_share, "", 0,
		(uint) READ_ALL, 0, table, FALSE)))
		@@ -288,7 +264,7 @@ void ndbcluster_binlog_init_share(NDB_SHARE share, TABLE _table)
		table_share= 0;
		my_free((gptr) table, MYF(0));
		table= 0;
		break;
		DBUG_RETURN(error);
		}
		assign_new_table_id(table);
		if (!table->record[1] \|\| table->record[1] == table->record[0])
		@@ -318,6 +294,44 @@ void ndbcluster_binlog_init_share(NDB_SHARE share, TABLE _table)
		share->ndb_value[1]= (NdbValue*)
		alloc_root(mem_root, sizeof(NdbValue) * table->s->fields
		+1 /extra for hidden key/);

		DBUG_RETURN(0);
		}


		/*
		Initialize the binlog part of the NDB_SHARE
		*/
		void ndbcluster_binlog_init_share(NDB_SHARE share, TABLE _table)
		{
		THD *thd= current_thd;
		MEM_ROOT *mem_root= &share->mem_root;

		share->op= 0;
		share->table= 0;
		if (!ndb_binlog_running)
		{
		if (_table)
		{
		if (_table->s->primary_key == MAX_KEY)
		share->flags\|= NSF_HIDDEN_PK;
		if (_table->s->blob_fields != 0)
		share->flags\|= NSF_BLOB_FLAG;
		}
		else
		{
		share->flags\|= NSF_NO_BINLOG;
		}
		return;
		}
		while (1)
		{
		int error;
		TABLE_SHARE *table_share=
		(TABLE_SHARE ) my_malloc(sizeof(table_share), MYF(MY_WME));
		TABLE table= (TABLE) my_malloc(sizeof(*table), MYF(MY_WME));
		if ((error= ndbcluster_binlog_open_table(thd, share, table_share, table)))
		break;
		{
		int i, no_nodes= g_ndb_cluster_connection->no_db_nodes();
		share->subscriber_bitmap= (MY_BITMAP*)
		@@ -651,10 +665,10 @@ static int ndbcluster_create_apply_status_table(THD *thd)
		if so, remove it since there is none in Ndb
		*/
		{
		strxnmov(buf, sizeof(buf),
		mysql_data_home,
		"/" NDB_REP_DB "/" NDB_APPLY_TABLE,
		reg_ext, NullS);
		build_table_filename(buf, sizeof(buf),
		NDB_REP_DB,
		NDB_APPLY_TABLE,
		reg_ext);
		unpack_filename(buf,buf);
		my_delete(buf, MYF(0));
		}
		@@ -703,10 +717,10 @@ static int ndbcluster_create_schema_table(THD *thd)
		if so, remove it since there is none in Ndb
		*/
		{
		strxnmov(buf, sizeof(buf),
		mysql_data_home,
		"/" NDB_REP_DB "/" NDB_SCHEMA_TABLE,
		reg_ext, NullS);
		build_table_filename(buf, sizeof(buf),
		NDB_REP_DB,
		NDB_SCHEMA_TABLE,
		reg_ext);
		unpack_filename(buf,buf);
		my_delete(buf, MYF(0));
		}
		@@ -1287,7 +1301,8 @@ ndbcluster_update_slock(THD *thd,
		/*
		Handle _non_ data events from the storage nodes
		*/
		static int
		//static int
		int
		ndb_handle_schema_change(THD thd, Ndb ndb, NdbEventOperation *pOp,
		NDB_SHARE *share)
		{
		@@ -1299,29 +1314,19 @@ ndb_handle_schema_change(THD thd, Ndb ndb, NdbEventOperation *pOp,
		pOp->tableFrmChanged());

		if (pOp->getEventType() != NDBEVENT::TE_CLUSTER_FAILURE &&
		pOp->getReqNodeId() != g_ndb_cluster_connection->node_id())
		(uint) pOp->getReqNodeId() != g_ndb_cluster_connection->node_id())
		{
		NDBDICT *dict= ndb->getDictionary();
		NdbDictionary::Dictionary::List index_list;
		TABLE_SHARE *table_share= share->table->s; //share->table_share;
		TABLE* table= share->table;

		ndb->setDatabaseName(dbname);
		// Invalidating indexes
		if (! dict->listIndexes(index_list, tabname))
		{
		for (unsigned i = 0; i < index_list.count; i++) {
		NdbDictionary::Dictionary::List::Element& index=
		index_list.elements[i];
		DBUG_PRINT("info", ("Invalidating index %s.%s",
		index.database, index.name));
		dict->invalidateIndex(index.name, tabname);
		}
		}
		// Invalidate table
		ha_ndbcluster::invalidate_dictionary_cache(share->table->s,
		ndb,
		dbname,
		tabname,
		TRUE);
		/*
		Invalidate table and all it's indexes
		*/
		ha_ndbcluster table_handler(table_share);
		table_handler.set_dbname(share->key);
		table_handler.set_tabname(share->key);
		table_handler.open_indexes(ndb, table, TRUE);
		table_handler.invalidate_dictionary_cache(TRUE);

		if (online_alter_table)
		{
		@@ -1329,20 +1334,17 @@ ndb_handle_schema_change(THD thd, Ndb ndb, NdbEventOperation *pOp,
		const void data= 0, pack_data= 0;
		uint length, pack_length;
		int error;
		NDBDICT *dict= ndb->getDictionary();
		const NDBTAB *altered_table= pOp->getTable();

		DBUG_PRINT("info", ("Detected frm change of table %s.%s",
		dbname, tabname));
		const NDBTAB *altered_table= pOp->getEvent()->getTable();
		bool remote_event=
		pOp->getReqNodeId() != g_ndb_cluster_connection->node_id();
		strxnmov(key, FN_LEN-1, mysql_data_home, "/",
		dbname, "/", tabname, NullS);
		build_table_filename(key, FN_LEN-1, dbname, tabname, NullS);
		/*
		If the frm of the altered table is different than the one on
		disk then overwrite it with the new table definition
		*/
		if (remote_event &&
		readfrm(key, &data, &length) == 0 &&
		if (readfrm(key, &data, &length) == 0 &&
		packfrm(data, length, &pack_data, &pack_length) == 0 &&
		cmp_frm(altered_table, pack_data, pack_length))
		{
		@@ -1359,6 +1361,12 @@ ndb_handle_schema_change(THD thd, Ndb ndb, NdbEventOperation *pOp,
		}
		pthread_mutex_unlock(&LOCK_open);
		close_cached_tables((THD) 0, 0, (TABLE_LIST) 0);
		/*
		if ((error= ndbcluster_binlog_open_table(thd, share,
		table_share, table)))
		sql_print_information("NDB: Failed to re-open table %s.%s",
		dbname, tabname);
		*/
		}
		}
		remote_drop_table= 1;
		@@ -1838,6 +1846,7 @@ int ndbcluster_create_binlog_setup(Ndb ndb, const char key,
		/* Handle any trailing share */
		NDB_SHARE share= (NDB_SHARE) hash_search(&ndbcluster_open_tables,
		(byte*) key, key_len);

		if (share && share_may_exist)
		{
		if (share->flags & NSF_NO_BINLOG \|\|

storage/ndb/include/kernel/ndb_limits.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@
		#define MAX_FRAGMENT_DATA_BYTES (4+(2 * 8 * MAX_REPLICAS * MAX_NDB_NODES))
		#define MAX_NDB_PARTITIONS 1024
		#define MAX_RANGE_DATA (131072+MAX_NDB_PARTITIONS) //0.5 MByte of list data
		#define MAX_WORDS_META_FILE 16382

		#define MIN_ATTRBUF ((MAX_ATTRIBUTES_IN_TABLE/24) + 1)
		/*

storage/ndb/include/kernel/signaldata/AlterTable.hpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ class AlterTableReq {
		friend class NdbEventOperationImpl;
		friend class NdbDictInterface;
		friend class Dbdict;
		friend class Suma;

		/**
		* For printing