mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Removed AttrType.hpp and moved the "internal" datatypes to their corresponding class.
Moved NdbSchemaCon and NdbSchemaOp out of the public NdbApi, it can however still be used by old test programs. Added print oof indexes to desc. ndb/BinDist.sh: Removed AttrType.hpp from BinDist.sh ndb/include/ndbapi/Ndb.hpp: Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi Removed AttrType.hpp ndb/include/ndbapi/NdbApi.hpp: Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi Removed AttrType.hpp ndb/include/ndbapi/NdbConnection.hpp: Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi Removed AttrType.hpp Moved internal types to the class where they are used ndb/include/ndbapi/NdbIndexOperation.hpp: Use limit from ndbapi_limit.h ndb/include/ndbapi/NdbOperation.hpp: Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi Removed AttrType.hpp Remove faulty comment about how many attributes a key is allowed to consist of Removed unused member variables ndb/include/ndbapi/NdbRecAttr.hpp: Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi Removed AttrType.hpp ndb/include/ndbapi/NdbSchemaCon.hpp: Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi Removed AttrType.hpp ndb/include/ndbapi/NdbSchemaOp.hpp: Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi Removed AttrType.hpp Moved all "old" datatypes here, so if a test program is still using old type, include NdbSchemaCon.hpp ndb/include/ndbapi/ndbapi_limits.h: Corrected limitations, added some from AttrTyp.hpp ndb/src/Makefile: Remove newtonapi from Makefile ndb/src/kernel/blocks/backup/restore/Restore.hpp: Removed AttrType Include NdbSchemaCon since restore uses old types ndb/src/kernel/blocks/backup/restore/main.cpp: Include NdbOut ndb/src/mgmsrv/MgmtSrvr.cpp: Remov AttrType.hpp ndb/src/ndbapi/ClusterMgr.cpp: Remov AttrType.hpp ndb/src/ndbapi/Ndb.cpp: Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi Removed AttrType.hpp Moved internal types to the class where they are used ndb/src/ndbapi/NdbApiSignal.cpp: Removed AttrType.hpp ndb/src/ndbapi/NdbApiSignal.hpp: Removed AttrType.hpp ndb/src/ndbapi/NdbConnection.cpp: Moved internal type s to the class where they belong ndb/src/ndbapi/NdbDictionaryImpl.cpp: RemovedAttrType.hpp Use limits from ndbapi_limits.h ndb/src/ndbapi/NdbEventOperationImpl.cpp: Removed AttrType.hpp Moved printRecAttr to end since it depends on old types and need to include "NdbSchemaCon", function will be rewritten and moved to NdbRecAttr. It's also useful from other places where an attribute has been read into an NdbRecAttr. ndb/src/ndbapi/NdbIndexOperation.cpp: Use limitations from ndbapi_limits.h Moved internal tyeps to the class where they belongs ndb/src/ndbapi/NdbOperation.cpp: Use limits from ndbapi_limits.h ndb/src/ndbapi/NdbOperationDefine.cpp: Remove AttrType.hpp ndb/src/ndbapi/NdbOperationExec.cpp: Moved internal tyeps to the class where they belongs ndb/src/ndbapi/NdbOperationInt.cpp: RemovedAttrType.hpp Use limits from ndbapi_limits.h ndb/src/ndbapi/NdbOperationScan.cpp: RemovedAttrType.hpp Use limits from ndbapi_limits.h ndb/src/ndbapi/NdbOperationSearch.cpp: Removed AttrType.hpp Use limits from ndbapi_limits.h ndb/src/ndbapi/NdbResultSet.cpp: Moved the "internal" types to corresponding class ndb/src/ndbapi/NdbSchemaCon.cpp: Updated not to be included in public NdbApi ndb/src/ndbapi/NdbSchemaOp.cpp: Updated not to be included in public NdbApi ndb/src/ndbapi/NdbUtil.hpp: Removed AttrType.hpp ndb/src/ndbapi/Ndbif.cpp: Removed AttrType.hpp Removed NdbSchemaCon and NdbSchemaOp from public NdbApi Moved "interal" types to their corresponding class ndb/src/ndbapi/Ndbinit.cpp: Removed NdbSchemaCon and NdbSchemaOp from public NdbApi ndb/src/ndbapi/Ndblist.cpp: Removed NdbSchemaCon and NdbSchemaOp from public NdbApi Moved "internal" types to their corresponding class ndb/src/ndbapi/TransporterFacade.cpp: Removed AttrType.hpp ndb/src/ndbapi/TransporterFacade.hpp: Removed AttrType.hpp Moved internal definition of how many Ndb objects to create to here ndb/test/include/NDBT_Table.hpp: Removed old NdbSchema* Added function to print information about an index ndb/test/ndbapi/acid/acid.cpp: This test program uses old NdbScheaCon.hpp ndb/test/ndbapi/flexAsynch/flexAsynch.cpp: This test program uses old NdbScheaCon.hpp ndb/test/ndbapi/flexScan/flexScan.cpp: This test program uses old NdbScheaCon.hpp ndb/test/ndbapi/interpreterInTup/interpreterInTup.cpp: This test program uses old NdbScheaCon.hpp ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp: This test program uses old NdbScheaCon.hpp ndb/test/ndbapi/ronja/initronja/initronja.cpp: This test program uses old NdbScheaCon.hpp ndb/test/ndbapi/telco/msa.cpp: This test program uses old NdbScheaCon.hpp ndb/test/ndbapi/testDataBuffers/testDataBuffers.cpp: This test program uses old NdbScheaCon.hpp ndb/test/ndbapi/testNdbApi/testNdbApi.cpp: Remove AttrType.hpp Define max number of Ndb objects test should "try" to create. ndb/test/ndbapi/testRestartGci/testRestartGci.cpp: Moved "internal" datatypes to corresponding class, in this case Ndb class ndb/test/src/NDBT_ResultRow.cpp: This test program uses old NdbScheaCon.hpp But should soon use "printer" from NdbRecAttr ndb/test/src/NDBT_Table.cpp: Print table info more SQL like ndb/test/src/UtilTransactions.cpp: When AttrType.hpp, this hidden bug was discovered. Using wrong enum types in switch. ndb/tools/desc/desc.cpp: Alos print info about indexes for a table
This commit is contained in:
unknown
@ -18,10 +18,9 @@
|
||||
#define NdbOperation_H
|
||||
|
||||
#include <ndb_types.h>
|
||||
|
||||
#include <AttrType.hpp>
|
||||
#include <NdbError.hpp>
|
||||
#include <NdbReceiver.hpp>
|
||||
#include "ndbapi_limits.h"
|
||||
#include "NdbError.hpp"
|
||||
#include "NdbReceiver.hpp"
|
||||
|
||||
class Ndb;
|
||||
class NdbApiSignal;
|
||||
@ -835,6 +834,22 @@ public:
|
||||
|
||||
/** @} *********************************************************************/
|
||||
|
||||
/**
|
||||
* Type of operation
|
||||
*/
|
||||
enum OperationType {
|
||||
ReadRequest = 0, ///< Read operation
|
||||
UpdateRequest = 1, ///< Update Operation
|
||||
InsertRequest = 2, ///< Insert Operation
|
||||
DeleteRequest = 3, ///< Delete Operation
|
||||
WriteRequest = 4, ///< Write Operation
|
||||
ReadExclusive = 5, ///< Read exclusive
|
||||
OpenScanRequest, ///< Scan Operation
|
||||
OpenRangeScanRequest, ///< Range scan operation
|
||||
NotDefined2, ///< Internal for debugging
|
||||
NotDefined ///< Internal for debugging
|
||||
};
|
||||
|
||||
protected:
|
||||
/******************************************************************************
|
||||
* These are the methods used to create and delete the NdbOperation objects.
|
||||
@ -865,11 +880,27 @@ protected:
|
||||
|
||||
NdbOperation* next(); // Get next pointer
|
||||
|
||||
enum OperationStatus{
|
||||
Init,
|
||||
OperationDefined,
|
||||
TupleKeyDefined,
|
||||
GetValue,
|
||||
SetValue,
|
||||
ExecInterpretedValue,
|
||||
SetValueInterpreted,
|
||||
FinalGetValue,
|
||||
SubroutineExec,
|
||||
SubroutineEnd,
|
||||
SetBound,
|
||||
WaitResponse,
|
||||
WaitCommitResponse,
|
||||
Finished,
|
||||
ReceiveFinished
|
||||
};
|
||||
|
||||
OperationStatus Status(); // Read the status information
|
||||
|
||||
void Status(OperationStatus); // Set the status information
|
||||
|
||||
OperationType RequestType();
|
||||
|
||||
void NdbCon(NdbConnection*); // Set reference to connection
|
||||
// object.
|
||||
@ -879,8 +910,6 @@ protected:
|
||||
// the operations object.
|
||||
void setStartIndicator();
|
||||
|
||||
void setCommitIndicator(CommitType aCommitType);
|
||||
|
||||
/******************************************************************************
|
||||
* The methods below is the execution part of the NdbOperation
|
||||
* class. This is where the NDB signals are sent and received. The
|
||||
@ -1013,18 +1042,13 @@ protected:
|
||||
Uint32 theCurrRecAI_Len; // The currently received length
|
||||
Uint32 theAI_ElementLen; // How many words long is this element
|
||||
Uint32* theCurrElemPtr; // The current pointer to the element
|
||||
//Uint32 theTableId; // Table id.
|
||||
//Uint32 theAccessTableId; // The id of table for initial access,
|
||||
// changed by NdbIndexOperation
|
||||
//Uint32 theSchemaVersion; // The schema version on the table.
|
||||
class NdbTableImpl* m_currentTable; // The current table
|
||||
class NdbTableImpl* m_accessTable;
|
||||
|
||||
// Set to TRUE when a tuple key attribute has been defined.
|
||||
// A tuple key is allowed to consist of 64 attributes.
|
||||
Uint32 theTupleKeyDefined[MAXNROFTUPLEKEY][3];
|
||||
Uint32 theTupleKeyDefined[NDB_MAX_NO_OF_ATTRIBUTES_IN_KEY][3];
|
||||
|
||||
Uint32 theTotalNrOfKeyWordInSignal; // The total number of
|
||||
Uint32 theTotalNrOfKeyWordInSignal; // The total number of
|
||||
// keyword in signal.
|
||||
|
||||
Uint32 theTupKeyLen; // Length of the tuple key in words
|
||||
@ -1094,16 +1118,6 @@ NdbOperation::setStartIndicator()
|
||||
theStartIndicator = 1;
|
||||
}
|
||||
|
||||
#if 0
|
||||
inline
|
||||
void
|
||||
NdbOperation::setCommitIndicator(CommitType aTypeOfCommit)
|
||||
{
|
||||
theCommitIndicator = 1;
|
||||
theCommitType = (Uint8)aTypeOfCommit;
|
||||
}
|
||||
#endif
|
||||
|
||||
inline
|
||||
int
|
||||
NdbOperation::getNdbErrorLine()
|
||||
@ -1145,7 +1159,7 @@ Parameters: aStatus: The status.
|
||||
Remark: Sets Operation status.
|
||||
******************************************************************************/
|
||||
inline
|
||||
OperationStatus
|
||||
NdbOperation::OperationStatus
|
||||
NdbOperation::Status()
|
||||
{
|
||||
return theStatus;
|
||||
@ -1178,18 +1192,6 @@ NdbOperation::NdbCon(NdbConnection* aNdbCon)
|
||||
theNdbCon = aNdbCon;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
OperationType RequestType();
|
||||
|
||||
Remark: Return the request typ of the operation..
|
||||
******************************************************************************/
|
||||
inline
|
||||
OperationType
|
||||
NdbOperation::RequestType()
|
||||
{
|
||||
return theOperationType;
|
||||
}
|
||||
|
||||
inline
|
||||
int
|
||||
NdbOperation::equal(const char* anAttrName, Int32 aPar)
|
||||
|
||||
Reference in New Issue
Block a user