transactd 1.1.2 → 1.2.0

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

@@ -143,6 +143,14 @@ std::string getTableName(const request& req, bool forSql)
 	return "";
 }
 
+const char* getOwnerName(const request& req)
+{
+	const char* p = (const char*)req.data;
+	if (*req.datalen && (p[*req.datalen-1] == 0x00))
+		return p;
+	return "";
+}
+
 void dumpStdErr(int op, request& req, table* tb)
 {
 	boost::scoped_array<char> msg(new char[1024]);
@@ -357,7 +365,7 @@ inline void dbExecuter::doOpenTable(request& req)
 	if (dbname != "")
 	{
 		database* db = getDatabase(dbname.c_str(), req.cid);
-		m_tb = db->openTable(getTableName(req), req.keyNum);// if error occured that throw exception
+		m_tb = db->openTable(getTableName(req), req.keyNum, getOwnerName(req));// if error occured that throw exception
 		req.result = db->stat();
 		if (m_tb)
 		{
@@ -458,7 +466,8 @@ inline int dbExecuter::doReadMultiWithSeek(request& req, int op, char* resultBuf
 		m_tb->seekKey((op == TD_KEY_GE_NEXT_MULTI) ? HA_READ_KEY_OR_NEXT : HA_READ_KEY_OR_PREV);
 		
 		extRequest* ereq = (extRequest*)req.data;
-		req.result = m_readHandler->begin(m_tb, ereq, resultBuffer, RETBUF_EXT_RESERVE_SIZE, *req.datalen);
+		req.result = m_readHandler->begin(m_tb, ereq, true
+				, resultBuffer, RETBUF_EXT_RESERVE_SIZE, *req.datalen, (op == TD_KEY_GE_NEXT_MULTI));
 		if (req.result != 0)
 			return 1;
 		if (m_tb->stat() == 0)
@@ -489,18 +498,34 @@ inline int dbExecuter::doReadMulti(request& req, int op, char* resultBuffer
 	m_tb = getTable(req.pbk->handle);
 	extRequest* ereq = (extRequest*)req.data;
 	bool incCurrent = !((ereq->type[0]=='E') && (ereq->type[1]=='G'));
-	req.result = m_readHandler->begin(m_tb, ereq, resultBuffer, RETBUF_EXT_RESERVE_SIZE, *req.datalen);
+	bool forword = (op == TD_KEY_NEXT_MULTI) || (op == TD_POS_NEXT_MULTI);
+	req.result = m_readHandler->begin(m_tb, ereq,(op != TD_KEY_SEEK_MULTI)
+			, resultBuffer, RETBUF_EXT_RESERVE_SIZE, *req.datalen, forword);
 	if (req.result == 0)
 	{
-		if (op == TD_KEY_NEXT_MULTI)
-			m_tb->getNextExt(m_readHandler, incCurrent);
-		else if (op == TD_KEY_PREV_MULTI)
-			m_tb->getPrevExt(m_readHandler, incCurrent);
-		else if (op == TD_POS_NEXT_MULTI)
-			m_tb->stepNextExt(m_readHandler, incCurrent);
-		else if (op == TD_POS_PREV_MULTI)
-			m_tb->stepPrevExt(m_readHandler, incCurrent);
-		req.result = errorCodeSht(m_tb->stat());
+		if (op == TD_KEY_SEEK_MULTI)
+		{
+			char keynum = m_tb->keyNumByMakeOrder(req.keyNum);
+			if (m_tb->setKeyNum(keynum))
+				req.result = errorCodeSht(seekEach(ereq));
+			else
+			{
+				if (m_tb)m_tb->unUse();
+				return ret;
+			}
+		}
+		else
+		{
+			if (op == TD_KEY_NEXT_MULTI)
+				m_tb->getNextExt(m_readHandler, incCurrent);
+			else if (op == TD_KEY_PREV_MULTI)
+				m_tb->getPrevExt(m_readHandler, incCurrent);
+			else if (op == TD_POS_NEXT_MULTI)
+				m_tb->stepNextExt(m_readHandler, incCurrent);
+			else if (op == TD_POS_PREV_MULTI)
+				m_tb->stepPrevExt(m_readHandler, incCurrent);
+			req.result = errorCodeSht(m_tb->stat());
+		}
 		DEBUG_WRITELOG2(op, req);
 		size = req.serializeForExt(m_tb, resultBuffer, m_readHandler->end());
 		if ((req.paramMask & P_MASK_BLOBBODY) && m_blobBuffer->fieldCount())
@@ -514,6 +539,26 @@ inline int dbExecuter::doReadMulti(request& req, int op, char* resultBuffer
 	return ret;
 }
 
+inline short dbExecuter::seekEach(extRequest* ereq)
+{
+	short stat = 0;
+	logicalField* fd = &ereq->field;
+	for (int i=0;i<ereq->logicalCount;++i)
+	{
+		m_tb->setKeyValuesPacked(fd->ptr, fd->len);
+		m_tb->seekKey(HA_READ_KEY_EXACT);
+		if (m_tb->stat() == 0)
+			stat = m_readHandler->write(m_tb->position(), m_tb->posPtrLen());
+		else 
+			stat = m_readHandler->write(NULL, m_tb->posPtrLen(), errorCodeSht(m_tb->stat()));
+		if (stat) break;	
+		fd = fd->next();
+	}
+	if (stat==0)
+		stat = STATUS_REACHED_FILTER_COND;
+	return stat;
+}
+
 inline void dbExecuter::doStepRead(request& req, int op)
 {
 	m_tb = getTable(req.pbk->handle);
@@ -846,7 +891,12 @@ int dbExecuter::commandExec(request& req, char* resultBuffer, size_t& size, nets
 		{
 			database* db = getDatabaseCid(req.cid);
 			m_tb = getTable(req.pbk->handle);
-			req.result = ddl_execSql(db->thd(), makeSQLChangeTableComment(db->name(), m_tb->name(), (const char*)req.keybuf));
+			int num = (req.keyNum >1) ? req.keyNum -2: req.keyNum; 
+			num += '0';
+			std::string s("%@%");
+			s += (const char*)&num;
+			s += (const char*)req.keybuf;
+			req.result = ddl_execSql(db->thd(), makeSQLChangeTableComment(db->name(), m_tb->name(), s.c_str()));
 			break;
 		}
 		case TD_DROP_INDEX:
@@ -861,6 +911,7 @@ int dbExecuter::commandExec(request& req, char* resultBuffer, size_t& size, nets
 			if (doReadMultiWithSeek(req, op, resultBuffer, size, optionalData) == EXECUTE_RESULT_SUCCESS)
 				return EXECUTE_RESULT_SUCCESS; // Caution Call unUse()
 			break;
+		case TD_KEY_SEEK_MULTI:
 		case TD_KEY_NEXT_MULTI:
 		case TD_KEY_PREV_MULTI:
 		case TD_POS_NEXT_MULTI:

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

@@ -39,6 +39,7 @@ namespace mysql
 {
 
 class ReadRecordsHandler;
+struct extRequest;
 
 #define  FOR_SQL true
 
@@ -72,7 +73,7 @@ class dbExecuter : public engine::mysql::dbManager
 	inline void doDeleteKey(request& req);
 	inline void doInsertBulk(request& req);
 	inline void doStat(request& req);
-
+	inline short seekEach(extRequest* ereq);
 public:
 	dbExecuter();
 	~dbExecuter();

data/source/bzs/db/protocol/tdap/tdapSchema.cpp

@@ -130,10 +130,9 @@ void tabledef::setTableName(const wchar_t* s)
 	WideCharToMultiByte(schemaCodePage, (schemaCodePage == CP_UTF8) ? 0:WC_COMPOSITECHECK, s, -1, m_tableName, TABLE_NAME_SIZE, NULL, NULL);
 }
 #endif //_UNICODE
-
-bool fielddef::isStringType()const
+bool isStringType(uchar_td type)
 {
-		return ((type == ft_string)|| (type == ft_zstring)
+	return ((type == ft_string)|| (type == ft_zstring)
 			||(type == ft_wstring)|| (type == ft_wzstring)
 			||(type == ft_myvarchar)|| (type == ft_myvarbinary)
 			||(type == ft_mywvarchar)|| (type == ft_mywvarbinary)
@@ -142,6 +141,12 @@ bool fielddef::isStringType()const
 			||(type == ft_lstring)|| (type == ft_note));
 }
 
+
+bool fielddef::isStringType()const
+{
+    return tdap::isStringType(type);
+}
+
 unsigned int fielddef::charNum(/*int index*/)const
 {
 	if (type==ft_mychar)
@@ -215,6 +220,7 @@ const _TCHAR* getTypeName(short type)
     case ft_mytimestamp: return _T("myTimeStamp");
     case ft_mytext: return _T("myText");
     case ft_myblob: return _T("myBlob");
+    case ft_autoIncUnsigned: return _T("AutoIncUnsigned");
     case ft_nullindicator: return _T("Nullindicator");
     default: return _T("Unknown");
     }
@@ -299,6 +305,32 @@ const _TCHAR* btrVersion::moduleVersionShortString(_TCHAR* buf)
     return buf;
 }
 
+PACKAGE uchar_td getFilterLogicTypeCode(const _TCHAR* cmpstr)
+{
+    if (_tcscmp(cmpstr, _T("=")) == 0)
+        return (uchar_td)1;
+
+    if (_tcscmp(cmpstr, _T(">")) == 0)
+        return (uchar_td)2;
+
+    if (_tcscmp(cmpstr, _T("<")) == 0)
+        return (uchar_td)3;
+
+    if (_tcscmp(cmpstr, _T("<>")) == 0)
+        return (uchar_td)4;
+
+    if (_tcscmp(cmpstr, _T("=>")) == 0)
+        return (uchar_td)5;
+    if (_tcscmp(cmpstr, _T(">=")) == 0)
+        return (uchar_td)5;
+
+    if (_tcscmp(cmpstr, _T("=<")) == 0)
+        return (uchar_td)6;
+    if (_tcscmp(cmpstr, _T("<=")) == 0)
+        return (uchar_td)6;
+    return 255;
+}
+
 }//namespace tdap
 }//namespace protocol
 }//namespace db

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

@@ -134,11 +134,12 @@ struct keySegment
 
 /* brief A key infomation
  */
+#define MAX_KEY_SEGMENT 8
 struct keydef
 {
-    uchar_td segmentCount;   // Number of segment
-    keySegment segments[8];  // key segments . max 8 segments
-    uchar_td keyNumber;      // key number
+    uchar_td segmentCount;					// Number of segment
+    keySegment segments[MAX_KEY_SEGMENT];   // key segments . max 8 segments
+    uchar_td keyNumber;						// key number
 };
 // 26byte
 
@@ -173,6 +174,9 @@ PACKAGE ushort_td lenByCharnum(uchar_td type, uchar_td charsetIndex
 
 #endif
 
+/* Is field type string ?*/
+PACKAGE bool isStringType(uchar_td type);
+
 /* Mark of ** that BizStation Corp internal use only.
  */
 template <int N>
@@ -550,6 +554,10 @@ struct btrVersions
 #pragma option -a.
 pragma_pop
 
+/*filter cobine type*/
+enum combineType{eCend, eCand, eCor};
+
+PACKAGE uchar_td getFilterLogicTypeCode(const _TCHAR* cmpstr);
 
 }// namespace tdap
 }// namespace protocol

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

@@ -125,6 +125,7 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
 #define TD_ADD_SENDBLOB 	       92
 #define TD_GET_BLOB_BUF		       93
 #define TD_STASTISTICS	           94
+#define TD_KEY_SEEK_MULTI		   95
 
 
 
@@ -165,50 +166,61 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
 
 /**  field types
  */
-#define ft_string		0 
-#define ft_integer		1
-#define ft_float		2
-#define ft_date			3
-#define ft_time			4
-#define ft_decimal		5
-#define ft_money		6
-#define ft_logical		7
-#define ft_numeric		8 
-#define ft_bfloat		9 
-#define ft_lstring		10
-#define ft_zstring		11
-#define ft_note			12
-#define ft_lvar			13
-#define ft_uinteger		14
-#define ft_autoinc		15
-#define ft_bit			16
-#define ft_numericsts	17
-#define ft_numericsa	18
-#define ft_currency		19
-#define ft_timestamp	20
-#define ft_blob			21
-#define ft_reserve22	22
-#define ft_reserve23	23
-#define ft_reserve24	24
-#define ft_wstring		25
-#define ft_wzstring		26
-#define ft_guid			27
-#define ft_datatime		30
-#define ft_myvarchar	40
-#define ft_myvarbinary	41
-#define ft_mywvarchar	42
-#define ft_mywvarbinary	43
-#define ft_mychar		44
-#define ft_mywchar		45
-#define ft_mydate		46
-#define ft_mytime		47
-#define ft_mydatetime 	48
-#define ft_mytimestamp	49
-#define ft_mytext 		50
-#define ft_myblob 		51
-#define ft_nullindicator  255
-
-
+#define ft_string		    0
+#define ft_integer		    1
+#define ft_float		    2
+#define ft_date			    3
+#define ft_time			    4
+#define ft_decimal		    5
+#define ft_money		    6
+#define ft_logical		    7
+#define ft_numeric		    8
+#define ft_bfloat		    9
+#define ft_lstring		    10
+#define ft_zstring		    11
+#define ft_note			    12
+#define ft_lvar			    13
+#define ft_uinteger		    14
+#define ft_autoinc		    15
+#define ft_bit			    16
+#define ft_numericsts	    17
+#define ft_numericsa	    18
+#define ft_currency		    19
+#define ft_timestamp	    20
+#define ft_blob			    21
+#define ft_reserve22	    22
+#define ft_reserve23	    23
+#define ft_reserve24	    24
+#define ft_wstring		    25
+#define ft_wzstring		    26
+#define ft_guid			    27
+#define ft_datatime		    30
+#define ft_myvarchar	    40
+#define ft_myvarbinary	    41
+#define ft_mywvarchar	    42
+#define ft_mywvarbinary	    43
+#define ft_mychar		    44
+#define ft_mywchar		    45
+#define ft_mydate		    46
+#define ft_mytime		    47
+#define ft_mydatetime 	    48
+#define ft_mytimestamp	    49
+#define ft_mytext 		    50
+#define ft_myblob 		    51
+#define ft_autoIncUnsigned 	52
+#define ft_nullindicator    255
+
+/** compair types
+*/
+enum eCompType
+{
+	equal		= 1,
+	greater		= 2,
+	less		= 3,
+	notEq		= 4,
+	greaterEq	= 5,
+	lessEq		= 6
+};
 
 /** charset type number
  */
@@ -316,6 +328,7 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
 #define	STATUS_INVALID_OWNERNAME	51
 #define STATUS_TABLE_EXISTS_ERROR	59
 #define STATUS_LIMMIT_OF_REJECT		60
+#define STATUS_WARKSPACE_TOO_SMALL	61
 #define STATUS_REACHED_FILTER_COND	64
 #define STATUS_INVALID_FIELD_OFFSET 65
 #define STATUS_CHANGE_CONFLICT		80
@@ -335,9 +348,6 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
 #define ERROR_TD_NOT_CONNECTED      3110
 
 
-#define STATUS_BUFFERTOOSMALL		22
-#define STATUS_KEYBUFFERTOOSMALL	21
-
 #define TRANSACTD_SCHEMANAME		_T("transactd_schema")
 #define TYPE_SCHEMA_BDF				(short)0
 #define TYPE_SCHEMA_DDF				(short)1
@@ -364,8 +374,8 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
  If you change this version then you need change The ($TargetName) project options too.
 */
 #define C_INTERFACE_VER_MAJOR "1"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "1"//##2 Build marker! Don't remove
-#define C_INTERFACE_VER_RELEASE "2"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "2"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 #ifdef LINUX
 #ifdef __APPLE__
@@ -414,15 +424,15 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
 
 
 #define CPP_INTERFACE_VER_MAJOR "1"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "1"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "2"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "2"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 #ifdef _WIN32
 #define CPP_INTERFACE_VERSTR "_" COMPILER_VERSTR "_" TD_LIB_PART "_" CPP_INTERFACE_VER_MAJOR "_" CPP_INTERFACE_VER_MINOR //use autolink
 #endif
 
 #define TRANSACTD_VER_MAJOR 1//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 1//##8 Build marker! Don't remove
-#define TRANSACTD_VER_RELEASE 2//##9 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 2//##8 Build marker! Don't remove
+#define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif //BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/env/crosscompile.h

@@ -106,9 +106,14 @@
 	
 #else //!defined(LINUX)
 
-#ifdef __MINGW32__
-	#define _ttof      atof
-#endif
+	// define _ttof for MinGW or less than visual studio 2010
+	#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1600)
+		#ifdef _UNICODE
+			#define _ttof _wtof
+		#else
+			#define _ttof atof
+		#endif
+	#endif
 
 /* c c++ runtime library */
 	#include <tchar.h>

data/source/bzs/example/connection_pool_c.cpp

@@ -23,14 +23,8 @@ Each worker shows the connection object pointer.
 
 struct clientID
 {
-
-#ifdef __x86_64__
-    void* con;
-    char_td reserved[4];
-#else
     void* con;
-    char_td reserved[8];
-#endif
+    char_td reserved[12 - sizeof(void*)];//32bit = 8 64bit = 4
     char_td     aid[2];
     ushort_td   id;
 };