transactd 1.2.0 → 2.0.0

data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.h

@@ -14,8 +14,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 
@@ -27,10 +27,10 @@
 extern int g_tableNmaeLower;
 
 namespace bzs
-{	
+{
 namespace db
 {
-	class blobBuffer;
+class blobBuffer;
 namespace protocol
 {
 namespace tdap
@@ -40,103 +40,109 @@ namespace mysql
 
 class ReadRecordsHandler;
 struct extRequest;
+struct extRequestSeeks;
 
-#define  FOR_SQL true
+#define FOR_SQL true
 
-std::string getDatabaseName(const request& req, bool forSql=false);
-std::string getTableName(const request& req, bool forSql=false);
+std::string getDatabaseName(const request& req, bool forSql = false);
+std::string getTableName(const request& req, bool forSql = false);
 short_td errorCode(int ha_error);
 bool isMetaDb(const request& req);
 
 class dbExecuter : public engine::mysql::dbManager
 {
-	ReadRecordsHandler* m_readHandler;
-	blobBuffer*  m_blobBuffer;
-
-	void connect(request& req);
-	void releaseDatabase(request& req, int op);
-	std::string makeSQLcreateTable(const request& req);
-	inline void doCreateTable(request& req);
-	inline void doOpenTable(request& req);
-	inline void doSeekKey(request& req, int op);
-	inline void doMoveFirst(request& req);
-	inline void doMoveKey(request& req, int op);
-	inline int  doReadMultiWithSeek(request& req, int op, char* resultBuffer, size_t& size, netsvc::server::buffers* optionalData);
-	inline int  doReadMulti(request& req, int op, char* resultBuffer, size_t& size, netsvc::server::buffers* optionalData);
-	inline void doStepRead(request& req, int op);
-
-
-	inline void doInsert(request& req);
-	inline void doUpdate(request& req);
-	inline void doUpdateKey(request& req);
-	inline void doDelete(request& req);
-	inline void doDeleteKey(request& req);
-	inline void doInsertBulk(request& req);
-	inline void doStat(request& req);
-	inline short seekEach(extRequest* ereq);
+    ReadRecordsHandler* m_readHandler;
+    blobBuffer* m_blobBuffer;
+
+    void connect(request& req);
+    void releaseDatabase(request& req, int op);
+    std::string makeSQLcreateTable(const request& req);
+    inline void doCreateTable(request& req);
+    inline void doOpenTable(request& req);
+    inline void doSeekKey(request& req, int op);
+    inline void doMoveFirst(request& req);
+    inline void doMoveKey(request& req, int op);
+    inline int doReadMultiWithSeek(request& req, int op,
+                                   netsvc::server::netWriter* nw);
+    inline int doReadMulti(request& req, int op, netsvc::server::netWriter* nw);
+    inline void doStepRead(request& req, int op);
+
+    inline void doInsert(request& req);
+    inline void doUpdate(request& req);
+    inline void doUpdateKey(request& req);
+    inline void doDelete(request& req);
+    inline void doDeleteKey(request& req);
+    inline void doInsertBulk(request& req);
+    inline void doStat(request& req);
+    inline short seekEach(extRequestSeeks* ereq, bool noBookMark);
+
 public:
-	dbExecuter();
-	~dbExecuter();
-	int commandExec(request& req, char* result, size_t& size, netsvc::server::buffers* optionalData);
-	int errorCode(int ha_error);
-	short_td errorCodeSht(int ha_error){return (short_td)errorCode(ha_error);};
-	
+    dbExecuter();
+    ~dbExecuter();
+    int commandExec(request& req, netsvc::server::netWriter* nw);
+    int errorCode(int ha_error);
+    short_td errorCodeSht(int ha_error)
+    {
+        return (short_td)errorCode(ha_error);
+    };
 };
 
 /** Command dispatcher for connectionManager
  */
 class connMgrExecuter
 {
-	request& m_req;
-	__int64 m_modHandle;
+    request& m_req;
+    __int64 m_modHandle;
+
 public:
-	connMgrExecuter(request& req, unsigned __int64 parent);
-	int read(char* buf, size_t& size);
-	int disconnectOne(char* buf, size_t& size);
-	int disconnectAll(char* buf, size_t& size);
-	int commandExec(char* buf, size_t& size);
+    connMgrExecuter(request& req, unsigned __int64 parent);
+    int read(char* buf, size_t& size);
+    int disconnectOne(char* buf, size_t& size);
+    int disconnectAll(char* buf, size_t& size);
+    int commandExec(netsvc::server::netWriter* nw);
 };
 
-class commandExecuter :  public ICommandExecuter, public engine::mysql::igetDatabases
+class commandExecuter : public ICommandExecuter,
+                        public engine::mysql::igetDatabases
 {
-	mutable request m_req;
-	boost::shared_ptr<dbExecuter> m_dbExec;
+    mutable request m_req;
+    boost::shared_ptr<dbExecuter> m_dbExec;
+
+    int readStatistics(char* buf, size_t& size);
+    int cmdStatistics(char* buf, size_t& size);
+    unsigned __int64 m_modHandle;
 
-	int readStatistics(char* buf, size_t& size);
-	int cmdStatistics(char* buf, size_t& size);
-	unsigned __int64 m_modHandle;
 public:
-	commandExecuter(__int64 parent);
-	~commandExecuter();
-	size_t perseRequestEnd(const char* p, size_t size, bool& comp)const;
-
-	size_t getAcceptMessage(char* message, size_t size)
-	{
-		strcpy_s(message, size, "200 OK\n");
-		return strlen(message);
-	}
-
-	bool parse(const char* p, size_t size);
-
-	int execute(char* resultBuffer, size_t& size, netsvc::server::buffers* optionalData)
-	{
-		if (m_req.op == TD_STASTISTICS)
-			return connMgrExecuter(m_req, m_modHandle).commandExec(resultBuffer, size);
-		return m_dbExec->commandExec(m_req, resultBuffer, size, optionalData);
-	}
-	
-	bool isShutDown(){return m_dbExec->isShutDown();}
-	
-	void cleanup(){};
-	
-	const engine::mysql::databases& dbs() const{return m_dbExec->dbs();};
-};
+    commandExecuter(__int64 parent);
+    ~commandExecuter();
+    size_t perseRequestEnd(const char* p, size_t size, bool& comp) const;
+
+    size_t getAcceptMessage(char* message, size_t size)
+    {
+        strcpy_s(message, size, "200 OK\n");
+        return strlen(message);
+    }
 
-}//namespace mysql
-}//namespace tdap
-}//namespace protocol
-}//namespace db
-}//namespace bzs
+    bool parse(const char* p, size_t size);
+
+    int execute(netsvc::server::netWriter* nw)
+    {
+        if (m_req.op == TD_STASTISTICS)
+            return connMgrExecuter(m_req, m_modHandle).commandExec(nw);
+        return m_dbExec->commandExec(m_req, nw);
+    }
+
+    bool isShutDown() { return m_dbExec->isShutDown(); }
+
+    void cleanup(){};
+
+    const engine::mysql::databases& dbs() const { return m_dbExec->dbs(); };
+};
 
-#endif //BZS_DB_PROTOCOL_TDAP_MYSQL_TDAPCOMMANDEXECUTER_H
+} // namespace mysql
+} // namespace tdap
+} // namespace protocol
+} // namespace db
+} // namespace bzs
 
+#endif // BZS_DB_PROTOCOL_TDAP_MYSQL_TDAPCOMMANDEXECUTER_H

data/source/bzs/db/protocol/tdap/tdapRequest.h

@@ -1,23 +1,23 @@
 #ifndef BZS_DB_PROTOCOL_TDAP_TDAPREQUSET_H
 #define BZS_DB_PROTOCOL_TDAP_TDAPREQUSET_H
-/*=================================================================
-   Copyright (C) 2013 BizStation Corp All rights reserved.
+/* =================================================================
+ Copyright (C) 2013 BizStation Corp All rights reserved.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
-=================================================================*/
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ ================================================================= */
 
 #include <bzs/db/protocol/tdap/tdapcapi.h>
 #include <bzs/db/blobBuffer.h>
@@ -27,10 +27,16 @@
 #include <boost/asio/buffer.hpp>
 #include <bzs/env/compiler.h>
 
-
 namespace bzs
 {
-	namespace netsvc{namespace client{class connection;}}
+namespace netsvc
+{
+namespace client
+{
+class connection;
+}
+}
+
 namespace db
 {
 namespace protocol
@@ -38,153 +44,179 @@ namespace protocol
 namespace tdap
 {
 
-#define P_MASK_OP			0
-#define P_MASK_POSBLK		1
-#define P_MASK_DATA			2
-#define P_MASK_DATALEN		4
-#define P_MASK_KEYBUF		8
-#define P_MASK_KEYNUM		16
-#define P_MASK_EX_SENDLEN	32  //< The data length which transmits to a client is described at 2 bytes of the data buffer head.
-#define P_MASK_BLOBBODY		64
-
-#define P_MASK_ALL			P_MASK_POSBLK|P_MASK_DATA|P_MASK_DATALEN|P_MASK_KEYBUF|P_MASK_KEYNUM
-#define P_MASK_KEYONLY 		P_MASK_KEYBUF|P_MASK_KEYNUM
-#define P_MASK_NOKEYBUF		P_MASK_POSBLK|P_MASK_DATA|P_MASK_DATALEN|P_MASK_KEYNUM
-#define P_MASK_POS_LEN_KEY	P_MASK_POSBLK|P_MASK_DATALEN|P_MASK_KEYNUM
-#define P_MASK_KEYNAVI		P_MASK_POSBLK|P_MASK_DATALEN|P_MASK_KEYBUF|P_MASK_KEYNUM
-#define P_MASK_NODATA		P_MASK_POSBLK|P_MASK_DATALEN|P_MASK_KEYBUF
-
-//server side
-#define P_MASK_READRESULT	P_MASK_POSBLK|P_MASK_DATA|P_MASK_DATALEN
-#define P_MASK_STAT			P_MASK_DATA|P_MASK_DATALEN
-#define P_MASK_READ_EXT		P_MASK_STAT|P_MASK_KEYBUF
-#define P_MASK_MOVPOS		P_MASK_POSBLK|P_MASK_DATA|P_MASK_DATALEN|P_MASK_KEYBUF
-#define P_MASK_INS_AUTOINC	P_MASK_MOVPOS
+#define P_MASK_OP 0
+#define P_MASK_POSBLK 1
+#define P_MASK_DATA 2
+#define P_MASK_DATALEN 4
+#define P_MASK_KEYBUF 8
+#define P_MASK_KEYNUM 16
+#define P_MASK_EX_SENDLEN                                                      \
+    32 //< The data length which transmits to a client is described at 2 bytes
+// of the data buffer head.
+#define P_MASK_BLOBBODY 64
+#define P_MASK_FINALRET 128 // server sent final result
+#define P_MASK_FINALDATALEN 256 // server sent final result
+
+#define P_MASK_ALL                                                             \
+    P_MASK_POSBLK | P_MASK_DATA | P_MASK_DATALEN | P_MASK_KEYBUF | P_MASK_KEYNUM
+#define P_MASK_KEYONLY P_MASK_KEYBUF | P_MASK_KEYNUM
+#define P_MASK_NOKEYBUF                                                        \
+    P_MASK_POSBLK | P_MASK_DATA | P_MASK_DATALEN | P_MASK_KEYNUM
+#define P_MASK_POS_LEN_KEY P_MASK_POSBLK | P_MASK_DATALEN | P_MASK_KEYNUM
+#define P_MASK_KEYNAVI                                                         \
+    P_MASK_POSBLK | P_MASK_DATALEN | P_MASK_KEYBUF | P_MASK_KEYNUM
+#define P_MASK_NODATA P_MASK_POSBLK | P_MASK_DATALEN | P_MASK_KEYBUF
+
+// server side
+#define P_MASK_READRESULT P_MASK_POSBLK | P_MASK_DATA | P_MASK_DATALEN
+#define P_MASK_STAT P_MASK_DATA | P_MASK_DATALEN
+#define P_MASK_READ_EXT P_MASK_STAT | P_MASK_KEYBUF
+#define P_MASK_MOVPOS                                                          \
+    P_MASK_POSBLK | P_MASK_DATA | P_MASK_DATALEN | P_MASK_KEYBUF
+#define P_MASK_INS_AUTOINC P_MASK_MOVPOS
 
 struct req1
 {
-	ushort_td	op;
-	void_td*	keybuf;
-	uchar_td	keylen;
-	short_td	keyNum;
-	void write(std::ostream& ost);
-};
+    ushort_td op;
+    void_td* keybuf;
+    uchar_td keylen;
+    short_td keyNum;
 
-#pragma option -a-
-pragma_pack1
+    void write(std::ostream& ost);
+};
 
+#pragma pack(push, 1)
+pragma_pack1;
 
 #define POSBLK_SIZE 4
 #define CLIENTID_SIZE 2
+#define PARAMMASK_SIZE 2
 
 /** tdap version info struct
  */
+
 struct version
 {
     ushort_td majorVersion;
     ushort_td minorVersion;
-    uchar_td Type;           
+    uchar_td Type;
 };
 
 struct posblk
 {
-	posblk()
-	{
-		memset(this, 0, sizeof(posblk));
-	}
-	int handle;
+    posblk() { memset(this, 0, sizeof(posblk)); }
 
+    int handle;
 };
+
 struct clientID
 {
 
 #ifdef __x86_64__
-	bzs::netsvc::client::connection* con;
-	char_td reserved[4];	
-#else
-	bzs::netsvc::client::connection* con;
-	char_td reserved[8];
-#endif
-	char_td		aid[2];
-	ushort_td 	id;
-};
+    bzs::netsvc::client::connection* con;
+
+    char_td reserved[4];
+#else // NOT __x86_64__
 
+    bzs::netsvc::client::connection* con;
 
-#pragma option -a
-pragma_pop
+    char_td reserved[8];
+#endif // NOT __x86_64__
+    char_td aid[2];
+    ushort_td id;
+};
 
+#pragma pack(pop)
+pragma_pop;
 
 class request
 {
 private:
-	ushort_td		varLenBytesPos;	/*Ooffset of last var field*/
-	ushort_td		varLenBytes;	/*Bytes of last var field length */
+    ushort_td varLenBytesPos; /* Ooffset of last var field */
+    ushort_td varLenBytes; /* Bytes of last var field length */
 
 public:
-	uchar_td		paramMask;
-	union
-	{
-		short_td    result;
-		short_td	op;
-	};
-
-	posblk*			pbk;
-	uint_td*		datalen;
-	void_td*		data;
-	keylen_td 		keylen;
-	void_td*		keybuf;
-	char_td			keyNum;
-	uint_td			resultLen;		
-	
-	request()
-	{
-    	memset(this, 0, sizeof(request));
-	}
-
-	void reset()
-	{
-		paramMask = 0;
-		result = 0;
-		varLenBytesPos = 0;
-		varLenBytes = 0;
-		resultLen = 0;
-	}
-
-	const struct bzs::db::blobHeader* blobHeader;
-
-	inline unsigned int serializeBlobBody(blobBuffer* blob, char* buf, unsigned int max_size
-				, std::vector<boost::asio::const_buffer>* mbuffer)
-	{
-		unsigned int totallen = *((unsigned int*)(buf));
-		unsigned int size = totallen;
-		char* blobbuf = buf + totallen;
-		//write blob body
-		int stat=0;
-		if (mbuffer)
-			totallen += blob->makeMultiBuffer(*mbuffer);
-		else
-			totallen += blob->writeBuffer((unsigned char*)blobbuf, max_size - totallen - 200, stat);
-		//write total
-		memcpy(buf, &totallen, sizeof(unsigned int));
-
-		//write result
-		if (stat)
-		{
-			short_td* retPtr = (short_td*)(buf + 4 + 1);
-			*retPtr = stat;
-		}
-		//return this buffer size;
-		if (mbuffer)
-			return size;
-		return totallen;
-	}
+    ushort_td paramMask;
+
+    union
+    {
+        short_td result;
+        short_td op;
+    };
+
+    posblk* pbk;
+    uint_td* datalen;
+    void_td* data;
+    keylen_td keylen;
+    void_td* keybuf;
+    char_td keyNum;
+    uint_td resultLen;
+    short_td* resltPtr;
+
+    request()
+        : paramMask(0), op(0), pbk(0), datalen(0), data(0), keylen(0),
+          keybuf(0), keyNum(0), resultLen(0), resltPtr(0)
+    {
+    }
+
+    virtual ~request() {}
+
+    virtual void clear()
+    {
+        pbk = 0;
+        datalen = 0;
+        data = 0;
+        keylen = 0;
+        keybuf = 0;
+        keyNum = 0;
+        resltPtr = 0;
+        reset();
+    }
+
+    void reset()
+    {
+        paramMask = 0;
+        result = 0;
+        varLenBytesPos = 0;
+        varLenBytes = 0;
+        resultLen = 0;
+    }
+
+    const struct bzs::db::blobHeader* blobHeader;
+
+    inline unsigned int serializeBlobBody(
+        blobBuffer* blob, char* buf, size_t curSize, unsigned int max_size,
+        std::vector<boost::asio::const_buffer>* mbuffer, short& stat)
+    {
+
+        char* blobbuf = buf + curSize;
+        unsigned int datalen = *((unsigned int*)buf);
+        // write blob body
+        unsigned int bloblen = 0;
+        if (mbuffer)
+            bloblen = blob->makeMultiBuffer(*mbuffer);
+        else
+            bloblen = blob->writeBuffer((unsigned char*)blobbuf,
+                                        max_size - datalen - 200, stat);
+
+        // write total
+
+        datalen += bloblen;
+        memcpy(buf, &datalen, sizeof(unsigned int));
+
+        // write result
+        if (stat && resltPtr)
+            *resltPtr = stat;
+        // return this buffer size;
+        if (mbuffer)
+            return (unsigned int)curSize;
+        return (unsigned int)curSize + bloblen;
+    }
 };
 
+} // namespace tdap
+} // namespace protocol
+} // namespace db
+} // namespace bzs
 
-}//namespace tdap
-}//namespace protocol
-}//namespace db
-}//namespace bzs
-
-
-#endif //BZS_DB_PROTOCOL_TDAP_TDAPREQUSET_H
+#endif // BZS_DB_PROTOCOL_TDAP_TDAPREQUSET_H