mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +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,7 +18,6 @@
|
||||
#define NdbConnection_H
|
||||
|
||||
#include <ndb_types.h>
|
||||
#include <AttrType.hpp>
|
||||
#include <NdbError.hpp>
|
||||
|
||||
class NdbConnection;
|
||||
@ -40,6 +39,35 @@ class NdbScanReceiver;
|
||||
*/
|
||||
typedef void (* NdbAsynchCallback)(int, NdbConnection*, void*);
|
||||
|
||||
/**
|
||||
* Commit type of transaction
|
||||
*/
|
||||
enum AbortOption {
|
||||
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
||||
CommitIfFailFree = 0,
|
||||
CommitAsMuchAsPossible = 2, ///< Commit transaction with as many
|
||||
TryCommit = 0, ///< <i>Missing explanation</i>
|
||||
#endif
|
||||
AbortOnError = 0, ///< Abort transaction on failed operation
|
||||
IgnoreError = 2 ///< Transaction continues on failed operation
|
||||
};
|
||||
|
||||
typedef AbortOption CommitType;
|
||||
|
||||
|
||||
/**
|
||||
* Execution type of transaction
|
||||
*/
|
||||
enum ExecType {
|
||||
NoExecTypeDef = -1, ///< Erroneous type (Used for debugging only)
|
||||
Prepare, ///< <i>Missing explanation</i>
|
||||
NoCommit, ///< Execute the transaction as far as it has
|
||||
///< been defined, but do not yet commit it
|
||||
Commit, ///< Execute and try to commit the transaction
|
||||
Rollback ///< Rollback transaction
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class NdbConnection
|
||||
* @brief Represents a transaction.
|
||||
@ -419,6 +447,14 @@ public:
|
||||
* @return The commit status of the transaction, i.e. one of
|
||||
* { NotStarted, Started, TimeOut, Committed, Aborted, NeedAbort }
|
||||
*/
|
||||
enum CommitStatusType {
|
||||
NotStarted, ///< Transaction not yet started
|
||||
Started, ///< <i>Missing explanation</i>
|
||||
Committed, ///< Transaction has been committed
|
||||
Aborted, ///< Transaction has been aborted
|
||||
NeedAbort ///< <i>Missing explanation</i>
|
||||
};
|
||||
|
||||
CommitStatusType commitStatus();
|
||||
|
||||
/** @} *********************************************************************/
|
||||
@ -515,8 +551,17 @@ private:
|
||||
Uint32 getBuddyConPtr(); // Gets Buddy Con Ptr
|
||||
NdbConnection* next(); // Returns the next pointer
|
||||
void next(NdbConnection*); // Sets the next pointer
|
||||
ConStatusType Status(); // Read the status information
|
||||
void Status(ConStatusType); // Set the status information
|
||||
|
||||
enum ConStatusType {
|
||||
NotConnected,
|
||||
Connecting,
|
||||
Connected,
|
||||
DisConnecting,
|
||||
ConnectFailure
|
||||
};
|
||||
ConStatusType Status(); // Read the status information
|
||||
void Status(ConStatusType); // Set the status information
|
||||
|
||||
Uint32 get_send_size(); // Get size to send
|
||||
void set_send_size(Uint32); // Set size to send;
|
||||
|
||||
@ -595,6 +640,18 @@ private:
|
||||
Uint32 theId;
|
||||
|
||||
// Keeps track of what the send method should do.
|
||||
enum SendStatusType {
|
||||
NotInit,
|
||||
InitState,
|
||||
sendOperations,
|
||||
sendCompleted,
|
||||
sendCOMMITstate,
|
||||
sendABORT,
|
||||
sendABORTfail,
|
||||
sendTC_ROLLBACK,
|
||||
sendTC_COMMIT,
|
||||
sendTC_OP
|
||||
};
|
||||
SendStatusType theSendStatus;
|
||||
NdbAsynchCallback theCallbackFunction; // Pointer to the callback function
|
||||
void* theCallbackObject; // The callback object pointer
|
||||
@ -628,12 +685,18 @@ private:
|
||||
Uint64 theTransactionId; // theTransactionId of the transaction
|
||||
Uint32 theGlobalCheckpointId; // The gloabl checkpoint identity of the transaction
|
||||
ConStatusType theStatus; // The status of the connection
|
||||
|
||||
CompletionStatus theCompletionStatus; // The Completion status of the transaction
|
||||
enum CompletionStatus {
|
||||
NotCompleted,
|
||||
CompletedSuccess,
|
||||
CompletedFailure,
|
||||
DefinitionFailure
|
||||
} theCompletionStatus; // The Completion status of the transaction
|
||||
CommitStatusType theCommitStatus; // The commit status of the transaction
|
||||
Uint32 theMagicNumber; // Magic Number to verify correct object
|
||||
|
||||
Uint32 thePriority; // Transaction Priority
|
||||
|
||||
enum ReturnType { ReturnSuccess, ReturnFailure };
|
||||
ReturnType theReturnStatus; // Did we have any read/update/delete failing
|
||||
// to find the tuple.
|
||||
bool theTransactionIsStarted;
|
||||
@ -641,7 +704,12 @@ private:
|
||||
bool theSimpleState;
|
||||
Uint8 m_abortOption; // Type of commit
|
||||
|
||||
ListState theListState;
|
||||
enum ListState {
|
||||
NotInList,
|
||||
InPreparedList,
|
||||
InSendList,
|
||||
InCompletedList
|
||||
} theListState;
|
||||
|
||||
Uint32 theDBnode; // The database node we are connected to
|
||||
Uint32 theNodeSequence; // The sequence no of the db node
|
||||
@ -830,7 +898,7 @@ Parameters: aStatus: The status.
|
||||
Remark: Sets Connect status.
|
||||
******************************************************************************/
|
||||
inline
|
||||
ConStatusType
|
||||
NdbConnection::ConStatusType
|
||||
NdbConnection::Status()
|
||||
{
|
||||
return theStatus;
|
||||
@ -849,6 +917,7 @@ NdbConnection::Status( ConStatusType aStatus )
|
||||
theStatus = aStatus;
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
void setGCI();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user