Added type tags to operations (576a856e) · Commits · Software / OSDI20 Artifacts / mariadb

ndb/include/ndbapi/NdbIndexOperation.hpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,11 @@ public:
		*/
		int deleteTuple();

		/**
		* Get index object for this operation
		*/
		const NdbDictionary::Index * getIndex() const;

		#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
		/**
		* Define the NdbIndexOperation to be a standard operation of type

ndb/include/ndbapi/NdbOperation.hpp

+45 −2

Original line number	Diff line number	Diff line
		@@ -55,6 +55,29 @@ public:
		* @{
		*/

		/**
		* Different access types (supported by sub-classes of NdbOperation)
		*/

		enum Type {
		PrimaryKeyAccess ///< Read, insert, update, or delete using pk
		#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
		= 0 // NdbOperation
		#endif
		,UniqueIndexAccess ///< Read, update, or delete using unique index
		#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
		= 1 // NdbIndexOperation
		#endif
		,TableScan ///< Full table scan
		#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
		= 2 // NdbScanOperation
		#endif
		,OrderedIndexScan ///< Ordered index scan
		#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
		= 3 // NdbIndexScanOperation
		#endif
		};

		/**
		* Lock when performing read
		*/
		@@ -715,6 +738,11 @@ public:
		*/
		const NdbDictionary::Table * getTable() const;

		/**
		* Get the type of access for this operation
		*/
		const Type getType() const;

		/ @} *******************************************************************/

		#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
		@@ -768,7 +796,7 @@ protected:
		int init(const class NdbTableImpl, NdbTransaction aCon);
		void initInterpreter();

		NdbOperation(Ndb* aNdb);
		NdbOperation(Ndb* aNdb, Type aType = PrimaryKeyAccess);
		virtual ~NdbOperation();
		void next(NdbOperation*); // Set next pointer
		NdbOperation* next(); // Get next pointer
		@@ -881,6 +909,8 @@ protected:
		* These are the private variables that are defined in the operation objects.
		*****************************************************************************/

		Type m_type;

		NdbReceiver theReceiver;

		NdbError theError; // Errorcode
		@@ -1043,6 +1073,19 @@ NdbOperation::getFirstRecAttr() const
		return theReceiver.theFirstRecAttr;
		}

		/******************************************************************************
		Type getType()

		Return Value Return the Type.
		Remark: Gets type of access.
		******************************************************************************/
		inline
		const NdbOperation::Type
		NdbOperation::getType() const
		{
		return m_type;
		}

		/******************************************************************************
		OperationStatus Status();

ndb/include/ndbapi/NdbScanOperation.hpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,8 @@ public:
		int restart(bool forceSend = false);

		protected:
		NdbScanOperation(Ndb* aNdb);
		NdbScanOperation(Ndb* aNdb,
		NdbOperation::Type aType = NdbOperation::TableScan);
		virtual ~NdbScanOperation();

		int nextResultImpl(bool fetchAllowed = true, bool forceSend = false);

ndb/src/ndbapi/NdbIndexOperation.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@
		#include <signaldata/IndxAttrInfo.hpp>

		NdbIndexOperation::NdbIndexOperation(Ndb* aNdb) :
		NdbOperation(aNdb),
		NdbOperation(aNdb, NdbOperation::UniqueIndexAccess),
		m_theIndex(NULL)
		{
		m_tcReqGSN = GSN_TCINDXREQ;
		@@ -164,6 +164,12 @@ int NdbIndexOperation::interpretedDeleteTuple()
		return NdbOperation::interpretedDeleteTuple();
		}

		const NdbDictionary::Index*
		NdbIndexOperation::getIndex() const
		{
		return m_theIndex;
		}

		int
		NdbIndexOperation::prepareSend(Uint32 aTC_ConnectPtr, Uint64 aTransactionId)
		{

ndb/src/ndbapi/NdbOperation.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,8 @@
		* aTable: Pointers to the Table object
		* Remark: Creat an object of NdbOperation.
		****************************************************************************/
		NdbOperation::NdbOperation(Ndb* aNdb) :
		NdbOperation::NdbOperation(Ndb* aNdb, NdbOperation::Type aType) :
		m_type(aType),
		theReceiver(aNdb),
		theErrorLine(0),
		theNdb(aNdb),