MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event (3449ca1a) · Commits · Software / OSDI20 Artifacts / mariadb

storage/ndb/src/ndbapi/NdbDictionary.cpp

+1 −18

Original line number	Diff line number	Diff line
		@@ -922,24 +922,7 @@ int NdbDictionary::Event::getNoOfEventColumns() const
		const NdbDictionary::Column *
		NdbDictionary::Event::getEventColumn(unsigned no) const
		{
		if (m_impl.m_columns.size())
		{
		if (no < m_impl.m_columns.size())
		{
		return m_impl.m_columns[no];
		}
		}
		else if (m_impl.m_attrIds.size())
		{
		if (no < m_impl.m_attrIds.size())
		{
		NdbTableImpl* tab= m_impl.m_tableImpl;
		if (tab == 0)
		return 0;
		return tab->getColumn(m_impl.m_attrIds[no]);
		}
		}
		return 0;
		return m_impl.getEventColumn(no);
		}

		void NdbDictionary::Event::mergeEvents(bool flag)

+23 −0

Original line number	Diff line number	Diff line
		@@ -1178,6 +1178,29 @@ int NdbEventImpl::getNoOfEventColumns() const
		return m_attrIds.size() + m_columns.size();
		}

		const NdbDictionary::Column *
		NdbEventImpl::getEventColumn(unsigned no) const
		{
		if (m_columns.size())
		{
		if (no < m_columns.size())
		{
		return m_columns[no];
		}
		}
		else if (m_attrIds.size())
		{
		if (no < m_attrIds.size())
		{
		NdbTableImpl* tab= m_tableImpl;
		if (tab == 0)
		return 0;
		return tab->getColumn(m_attrIds[no]);
		}
		}
		return 0;
		}

		/**
		* NdbDictionaryImpl
		*/

+1 −0

Original line number	Diff line number	Diff line
		@@ -287,6 +287,7 @@ public:
		void setReport(NdbDictionary::Event::EventReport r);
		NdbDictionary::Event::EventReport getReport() const;
		int getNoOfEventColumns() const;
		const NdbDictionary::Column * getEventColumn(unsigned no) const;

		void print() {
		ndbout_c("NdbEventImpl: id=%d, key=%d",