transactd 2.0.1 → 2.1.0

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

@@ -59,13 +59,13 @@ class dbExecuter : public engine::mysql::dbManager
     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 void doSeekKey(request& req, int op, engine::mysql::rowLockMode* lock);
+    inline void doMoveFirst(request& req, engine::mysql::rowLockMode* lock);
+    inline void doMoveKey(request& req, int op, engine::mysql::rowLockMode* lock);
     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 doStepRead(request& req, int op, engine::mysql::rowLockMode* lock);
 
     inline void doInsert(request& req);
     inline void doUpdate(request& req);

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

@@ -43,6 +43,7 @@ namespace protocol
 {
 namespace tdap
 {
+namespace client {class table;}
 
 #define P_MASK_OP 0
 #define P_MASK_POSBLK 1
@@ -75,22 +76,20 @@ namespace tdap
     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);
-};
-
 #pragma pack(push, 1)
 pragma_pack1;
 
-#define POSBLK_SIZE 4
-#define CLIENTID_SIZE 2
-#define PARAMMASK_SIZE 2
+
+#define CLIENTID_SIZE                   2
+#define PARAMMASK_SIZE                  2
+#define TD_POSBLK_TRANSMIT_SIZE         4
+
+
+/** tdap bosblk
+*/
+
+/* Dynamic data buffer alloc for client */
+typedef void*(__STDCALL* DDBA_PTR)(client::table* tb, uint_td size);
 
 /** tdap version info struct
  */
@@ -106,7 +105,9 @@ struct posblk
 {
     posblk() { memset(this, 0, sizeof(posblk)); }
 
-    int handle;
+    unsigned int handle;
+    client::table* tb;
+    DDBA_PTR allocFunc;
 };
 
 struct clientID

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

@@ -26,6 +26,8 @@
 #include <bzs/env/compiler.h>
 #include <bzs/env/crosscompile.h>
 #include <bzs/db/protocol/tdap/mysql/characterset.h>
+#include <bzs/db/blobStructs.h>
+#include <assert.h>
 
 namespace bzs
 {
@@ -321,84 +323,41 @@ private:
      */
     inline ushort_td maxKeylen() const { return keylen ? keylen : len; };
 
-    inline ushort_td keyFromVarlen() const
-    {
-        if ((type >= ft_myvarchar) && (type <= ft_mywvarbinary))
-            return len < 256 ? 1 : 2;
-        else if ((type == ft_myblob) || (type == ft_mytext))
-            return len - 8;
-        return 0;
-    }
-
 public:
     inline unsigned int codePage() const
     {
         return mysql::codePage((unsigned short)m_charsetIndex);
     }
 
-    /* data image for key
-     * param ptr address of record buffer
-     */
-    inline const uchar_td* keyData(const uchar_td* ptr) const
-    {
-        if ((type == ft_myblob) || (type == ft_mytext))
-            return blobDataPtr(ptr);
-        int sizeByte = varLenBytes();
-        return ptr + sizeByte;
-    }
+    /* Is string type or not.
+    */
+    bool isStringType() const;
 
-    inline uint_td keyDataLen(const uchar_td* ptr) const
+    inline bool isNumericType() const
     {
-        if ((type == ft_myblob) || (type == ft_mytext))
-            return blobDataLen(ptr);
-        return dataLen(ptr);
+        return ((type == ft_integer) || (type == ft_decimal) ||
+                (type == ft_money) || (type == ft_logical) ||
+                (type == ft_numeric) || (type == ft_bfloat) ||
+                (type == ft_uinteger) || (type == ft_autoinc) ||
+                (type == ft_bit) || (type == ft_numericsts) ||
+                (type == ft_numericsa) || (type == ft_autoIncUnsigned));
     }
 
-    /* copy key data for send to mysql
-     *  return next copy address.
+    /* Charctor numbers from charset.
      */
-    inline uchar_td* keyCopy(uchar_td* to, const uchar_td* from)
-    {
-
-        ushort_td kl = maxKeylen(); // size of max key segmnet for mysql
-        ushort_td copylen = kl;
-        memset(to, 0x00, kl);
-        ushort_td keyVarlen =
-            keyFromVarlen(); // size of var sizeByte for record.
-        if (keyVarlen)
-        {
-            copylen = (ushort_td)std::min<uint_td>((uint_td)copylen,
-                                                   keyDataLen(from));
-            memcpy(to, &copylen, 2);
-            to += 2;
-            from = keyData(from);
-        }
-        memcpy(to, from, copylen);
-        return to + kl - keyVarlen;
-    }
+    unsigned int charNum() const;
 
-    /* Get keyValue from keybuf for seek mode error description
-     *  return next copy key address.
-     */
-    inline const uchar_td* getKeyValueFromKeybuf(const uchar_td* from,
-                                                 const uchar_td** data,
-                                                 ushort_td& size)
+    inline void setCharsetIndex(uchar_td index)
     {
-        ushort_td keyVarlen =
-            keyFromVarlen(); // size of var sizeByte for record.
-        if (keyVarlen)
-        {
-            size = *((ushort_td*)from);
-            *data = from + 2;
-        }
-        else
-        {
-            size = maxKeylen();
-            *data = from;
-        }
-        return *data + size;
+        m_charsetIndex = index;
+        if ((type == ft_wstring) || (type == ft_wzstring) ||
+            (type == ft_mywvarchar) || (type == ft_mywvarbinary) ||
+            (type == ft_mywchar))
+            m_charsetIndex = CHARSET_UTF16LE;
     }
 
+    inline uchar_td charsetIndex() const { return m_charsetIndex; };
+    
     /* length bytes of var field
      */
     inline int varLenBytes() const
@@ -416,6 +375,11 @@ public:
         return 0;
     }
 
+    inline bool isBlob() const 
+    {
+        return (type == ft_myblob) || (type == ft_mytext);
+    }
+
     inline int maxVarDatalen() const
     {
         if (((type >= ft_myvarchar) && (type <= ft_mywvarbinary)) ||
@@ -463,43 +427,62 @@ public:
         return v;
     }
 
-    inline const uchar_td* blobDataPtr(const uchar_td* ptr) const
+    /* data image for key
+     * param ptr address of record buffer
+     */
+    inline const uchar_td* keyData(const uchar_td* ptr) const
     {
-        int blen = blobLenBytes();
-        if (blen == 0)
-            return NULL;
-        const uchar_td** p = (const uchar_td**)(ptr + blen);
-        return *p;
+        if ((type == ft_myblob) || (type == ft_mytext))
+            return blobDataPtr(ptr);
+        int sizeByte = varLenBytes();
+        return ptr + sizeByte;
     }
 
-    /* Is string type or not.
-     */
-    bool isStringType() const;
-
-    inline bool isNumericType() const
+    inline uint_td keyDataLen(const uchar_td* ptr) const
     {
-        return ((type == ft_integer) || (type == ft_decimal) ||
-                (type == ft_money) || (type == ft_logical) ||
-                (type == ft_numeric) || (type == ft_bfloat) ||
-                (type == ft_uinteger) || (type == ft_autoinc) ||
-                (type == ft_bit) || (type == ft_numericsts) ||
-                (type == ft_numericsa) || (type == ft_autoIncUnsigned));
+        if ((type == ft_myblob) || (type == ft_mytext))
+            return blobDataLen(ptr);
+        return dataLen(ptr);
     }
 
-    /* Charctor numbers from charset.
+/** @cond INTERNAL */
+    /* copy key data for send to mysql
+     *  return next copy address.
+     *  If datalen==0xff then From is field formated (string) type.
+     *  If datalen!=0xff then From is none field formated (string) type.
      */
-    unsigned int charNum() const;
-
-    inline void setCharsetIndex(uchar_td index)
+    inline uchar_td* keyCopy(uchar_td* to, const uchar_td* from, ushort_td datalen=0xff)
     {
-        m_charsetIndex = index;
-        if ((type == ft_wstring) || (type == ft_wzstring) ||
-            (type == ft_mywvarchar) || (type == ft_mywvarbinary) ||
-            (type == ft_mywchar))
-            m_charsetIndex = CHARSET_UTF16LE;
+
+        ushort_td kl = maxKeylen(); // size of max key segmnet for mysql
+        memset(to, 0x00, kl);
+        ushort_td keyVarlen =
+            varLenByteForKey(); // size of var sizeByte for record.
+        ushort_td copylen = std::min<ushort_td>(kl, datalen);
+        if (keyVarlen)
+        {
+            if (datalen==0xff)
+                copylen = (ushort_td)std::min<uint_td>((uint_td)copylen,
+                                                   keyDataLen(from));
+            // Var size is allways 2byte for key.
+            memcpy(to, &copylen, 2);
+            to += 2;
+            if (datalen==0xff)
+                from = keyData(from);
+        }
+        memcpy(to, from, copylen);
+        return to + kl - keyVarlen;// incremnt 2 +  (store_len - varlen)
     }
 
-    inline uchar_td charsetIndex() const { return m_charsetIndex; };
+
+    inline const uchar_td* blobDataPtr(const uchar_td* ptr) const
+    {
+        int blen = blobLenBytes();
+        if (blen == 0)
+            return NULL;
+        const uchar_td** p = (const uchar_td**)(ptr + blen);
+        return *p;
+    }
 
     inline uint_td unPackCopy(uchar_td* dest, const uchar_td* src) const
     {
@@ -513,6 +496,58 @@ public:
         memcpy(dest, src, clen);
         return clen;
     }
+
+    inline ushort_td varLenByteForKey() const
+    {
+        if (((type >= ft_myvarchar) && (type <= ft_mywvarbinary)) ||
+            (type == ft_lstring))
+            return len < 256 ? 1 : 2;
+        else if ((type == ft_myblob) || (type == ft_mytext))
+            return len - 8;
+        return 0;
+    }
+
+    /* Get keyValue from keybuf for seek mode error description
+     *  return next copy key address.
+     */
+    inline const uchar_td* getKeyValueFromKeybuf(const uchar_td* from,
+                                                 const uchar_td** data,
+                                                 ushort_td& size)
+    {
+        ushort_td keyVarlen =
+            varLenByteForKey(); // size of var sizeByte for record.
+        if (keyVarlen)
+        {
+            size = *((ushort_td*)from);
+            *data = from + 2;
+        }
+        else
+        {
+            size = maxKeylen();
+            *data = from;
+        }
+        return *data + size;
+    }
+
+    inline  unsigned char* setBlobFieldPointer(uchar_td* dest, const blobHeader* hd,
+                                    unsigned char* blobBlock, int fieldNum) const
+    {
+        assert(hd->curRow < hd->rows);
+        const blobField* f = hd->nextField;
+        int sizeByte = blobLenBytes();
+        unsigned int size = f->size;
+        //Copy data size
+        memcpy(dest, &size, sizeByte);
+        //Copy data 
+        memcpy(blobBlock, f->data(), size);
+        //Copy data ptr
+        memcpy(dest + sizeByte, &blobBlock, sizeof(char*));
+        hd->nextField = (blobField*)f->next();
+        if (fieldNum == hd->fieldCount - 1)
+            ++hd->curRow;
+        return blobBlock + size;
+    }
+/** @endcond */
 };
 
 namespace client

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

@@ -65,8 +65,11 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
  */
 #define POS_BLOCK_SIZE                  128
 #ifndef MAX_KEYLEN
-#define MAX_KEYLEN                      0X3FF // 1023
+#define MAX_KEYLEN                      0X3FF   // 1023
 #endif
+#define BTRV_MAX_DATA_SIZE              57000
+#define TDAP_MAX_DATA_SIZE              6291456 // 3Mbyte
+#define BOOKMARK_ALLOC_SIZE             40960
 
 /** operation type
  *
@@ -130,6 +133,7 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 #define TD_REC_DELLETEATKEY             71
 #define TD_KEY_GE_NEXT_MULTI            72
 #define TD_KEY_LE_PREV_MULTI            73
+#define TD_FILTER_PREPARE               74
 #define TD_CONNECT                      78
 #define TD_BEGIN_SHAPSHOT               88
 #define TD_END_SNAPSHOT                 89
@@ -249,13 +253,35 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 
 #define NOWAIT_WRITE                    500
 #define PARALLEL_TRN                    1000
-
+#define TRN_ISO_READ_COMMITED           0
+#define TRN_ISO_REPEATABLE_READ         2000
+#define TRN_ISO_SERIALIZABLE            3000
+
+#define SINGLELOCK_READ_COMMITED        LOCK_SINGLE_NOWAIT + PARALLEL_TRN
+#define MULTILOCK_READ_COMMITED         LOCK_MULTI_NOWAIT + PARALLEL_TRN
+#define MULTILOCK_REPEATABLE_READ       TRN_ISO_REPEATABLE_READ + LOCK_MULTI_NOWAIT
+#define MULTILOCK_ISO_SERIALIZABLE      TRN_ISO_SERIALIZABLE + LOCK_MULTI_NOWAIT
+
+/** InnoDB or transactional engin lock options
+*/
+// Transaction
+#define SINGLELOCK_NOGAP                SINGLELOCK_READ_COMMITED
+#define MULTILOCK_NOGAP                 MULTILOCK_READ_COMMITED
+#define MULTILOCK_GAP                   MULTILOCK_REPEATABLE_READ + LOCK_MULTI_NOWAIT
+// Snapshot
+#define CONSISTENT_READ                 4000
+#define MULTILOCK_GAP_SHARE             TRN_ISO_REPEATABLE_READ
+#define MULTILOCK_NOGAP_SHARE           0
+// Read row lock
+#define ROW_LOCK_X                      LOCK_SINGLE_NOWAIT
+#define ROW_LOCK_S                      5000 + LOCK_SINGLE_NOWAIT
 
 /** open mode
  */
 #define TD_OPEN_NORMAL                  0
 #define TD_OPEN_READONLY                -2
 #define TD_OPEN_EXCLUSIVE               -4
+#define TD_OPEN_READONLY_EXCLUSIVE      (TD_OPEN_READONLY + TD_OPEN_EXCLUSIVE)
 
 /** filed algin
  */
@@ -325,12 +351,15 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 #define STATUS_TABLE_EXISTS_ERROR       59
 #define STATUS_LIMMIT_OF_REJECT         60
 #define STATUS_WARKSPACE_TOO_SMALL      61
+#define STATUS_INVALID_EX_DESC          62
+#define STATUS_INVALID_EX_INS           63
 #define STATUS_REACHED_FILTER_COND      64
 #define STATUS_INVALID_FIELD_OFFSET     65
 #define STATUS_CHANGE_CONFLICT          80
 #define STATUS_INVALID_LOCKTYPE         83
 #define STATUS_LOCK_ERROR               84
 #define STATUS_FILE_LOCKED              85
+#define STATUS_INVALID_SUPPLYVALUES     86
 #define STATUS_CANNOT_LOCK_TABLE        88
 #define STATUS_INVALID_KEYNAME          STATUS_INVALID_KEYNUM
 #define STATUS_INVALID_DATASIZE         STATUS_BUFFERTOOSMALL
@@ -339,6 +368,10 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 #define ERROR_NOSPECIFY_TABLE           176
 #define ERROR_LOAD_CLIBRARY             200
 #define ERROR_INDEX_RND_INIT            201
+#define STATUS_INVALID_PREPAREID        202
+#define STATUS_LMIT_OF_PREPAREED        203
+#define STATUS_ALREADY_INSNAPSHOT       204
+#define STATUS_ALREADY_INTRANSACTION    205
 #define SERVER_CLIENT_NOT_COMPATIBLE    3003
 #define NET_BAD_SRB_FORMAT              3021
 #define ERROR_TD_HOSTNAME_NOT_FOUND     3103
@@ -352,6 +385,14 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 #define FILTER_CURRENT_TYPE_NOTINC      0
 #define FILTER_CURRENT_TYPE_INC         1
 #define FILTER_CURRENT_TYPE_NOBOOKMARK  2
+#define FILTER_TYPE_SUPPLYVALUE         4
+#define FILTER_TYPE_FORWORD             4 //at preparing only 
+#define FILTER_TYPE_SEEKS               8
+
+
+/* No need export for client */
+#define FILTER_COMBINE_NOPREPARE        0
+#define FILTER_COMBINE_PREPARE          32
 
 
 #define NIS_FILED_NAME                  "$nf"
@@ -385,7 +426,7 @@ struct trdVersiton
  If you change this version then you need change The ($TargetName) project options too.
  */
 #define C_INTERFACE_VER_MAJOR "2"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "0"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "1"//##2 Build marker! Don't remove
 #define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
@@ -449,7 +490,7 @@ struct trdVersiton
  */
 
 #define CPP_INTERFACE_VER_MAJOR "2"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "0"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "1"//##5 Build marker! Don't remove
 #define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
@@ -466,7 +507,7 @@ struct trdVersiton
 #endif
 
 #define TRANSACTD_VER_MAJOR 2//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 0//##8 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 1//##8 Build marker! Don't remove
 #define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H