transactd 2.1.0 → 2.2.0

data/source/bzs/db/protocol/tdap/client/databaseFactory.cpp

@@ -115,7 +115,6 @@ void onLoadLibrary(void)
         pthread_key_create(&g_tlsiID_SC2, cleanupCharPtr);
     if (tls_getspecific(g_tlsiID_SC3) == NULL)
         pthread_key_create(&g_tlsiID_SC3, cleanupCharPtr);
-
 #endif
 }
 
@@ -123,7 +122,6 @@ void onUnloadLibrary(void)
 {
     bzs::env::deinitCvtProcess();
 #if (defined(__APPLE__) && defined(USETLS))
-    cleanupTls();
     pthread_key_delete(g_tlsiID_SC1);
     pthread_key_delete(g_tlsiID_SC2);
     pthread_key_delete(g_tlsiID_SC3);

data/source/bzs/db/protocol/tdap/client/dbDef.cpp

@@ -820,6 +820,8 @@ void dbdef::create(const _TCHAR* fullpath)
     fs->keySpecs[0].keyType = 1; // Integer
     nsdb()->createTable(fs, 412, fullpath, 0);
     free(fs);
+
+    //TODO Create operation include set owner name.
     if (nsdb()->stat() == 0)
     { // set owner name
         ownerNameSetter* bao = new ownerNameSetter(nsdb());

data/source/bzs/db/protocol/tdap/client/dllmain.cpp

@@ -162,8 +162,8 @@ void onUnloadLibrary(void)
         pthread_key_delete(g_tlsiID);
         pthread_key_delete(g_tlsiID1);
         pthread_key_delete(g_tlsiID_SC1);
-    }
 #endif
+    }
 }
 #endif // NOT _WIN32
 
@@ -198,45 +198,6 @@ extern "C" PACKAGE_OSX short_td __STDCALL
         case TD_ADD_SENDBLOB:
             return client_t->addBlob((const bzs::db::blob*)data,
                                      (keyNum == TD_ASBLOB_ENDROW));
-        case TD_OPENTABLE:
-        case TD_CREATETABLE:
-            client_t->connect();
-            if (client_t->result() == 0)
-            {
-                if (op == TD_CREATETABLE)
-                {
-                    if (client_t->getServerCharsetIndex() != -1)
-                        client_t->create();
-                    else
-                    {
-                        client_t->cleanup();
-                        return 1;
-                    }
-                }
-                else if (op == TD_OPENTABLE)
-                    client_t->req().paramMask = P_MASK_ALL;
-                if (!client_t->buildDualChasetKeybuf())
-                {
-                    client_t->cleanup();
-                    return SERVER_CLIENT_NOT_COMPATIBLE;
-                }
-            }
-            break;
-        case TD_CONNECT:
-        {
-            client_t->cmdConnect();
-            break;
-        }
-        case TD_STASTISTICS:
-            client_t->req().paramMask =
-                P_MASK_DATALEN | P_MASK_KEYBUF | P_MASK_KEYNUM;
-            break;
-        case TD_RESET_CLIENT:
-            client_t->req().paramMask = P_MASK_KEYONLY;
-            break;
-        case TD_DROP_INDEX:
-            client_t->req().paramMask = P_MASK_POSBLK | P_MASK_KEYNUM;
-            break;
         case TD_REC_INSERT:
         case TD_INSERT_BULK:
         case TD_REC_UPDATE:
@@ -247,8 +208,7 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             break;
         case TD_MOVE_BOOKMARK:
         case TD_MOVE_PER:
-        case TD_BUILD_INDEX:
-            client_t->req().paramMask = P_MASK_NOKEYBUF;
+			client_t->req().paramMask = P_MASK_NOKEYBUF;
             break;
         case TD_UNLOCK:
             client_t->req().paramMask = P_MASK_POSBLK | P_MASK_KEYNUM;
@@ -349,6 +309,51 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             }
             break;
         }
+        case TD_OPENTABLE:
+        case TD_CREATETABLE:
+            client_t->connect();
+            if (client_t->result() == 0)
+            {
+                if (op == TD_CREATETABLE)
+                {
+                    if (client_t->getServerCharsetIndex() != -1)
+                        client_t->create();
+                    else
+                    {
+                        client_t->cleanup();
+                        return 1;
+                    }
+                }
+                else if (op == TD_OPENTABLE)
+                    client_t->req().paramMask = P_MASK_ALL;
+                if (!client_t->buildDualChasetKeybuf())
+                {
+                    client_t->cleanup();
+                    return SERVER_CLIENT_NOT_COMPATIBLE;
+                }
+            }
+            break;
+        case TD_CONNECT:
+        {
+            client_t->cmdConnect();
+            break;
+        }
+        case TD_STASTISTICS:
+            client_t->req().paramMask =
+                P_MASK_DATALEN | P_MASK_KEYBUF | P_MASK_KEYNUM;
+            break;
+        case TD_RESET_CLIENT:
+            client_t->req().paramMask = P_MASK_KEYONLY;
+            break;
+        case TD_BUILD_INDEX:
+            client_t->createIndex();
+            break;
+        case TD_DROP_INDEX:
+            client_t->req().paramMask = P_MASK_POSBLK | P_MASK_KEYNUM;
+            break;
+        case TD_ACL_RELOAD:
+            client_t->req().paramMask = 0;
+            break;
         }
         short_td ret = client_t->execute();
         client_t->cleanup();

data/source/bzs/db/protocol/tdap/client/fields.h

@@ -58,9 +58,11 @@ class refarymem
 
 protected:
 
-    refarymem(const refarymem& r):m_parent(NULL), 
+    refarymem(const refarymem& r):m_parent(NULL),
             m_child(0), m_allocType(MEM_ALLOC_TYPE_NONE){}
 
+    virtual ~refarymem(){}
+
     refarymem& operator=(const refarymem& r)
     {
         return *this;

data/source/bzs/db/protocol/tdap/client/filter.h

@@ -978,9 +978,9 @@ class filter
     
 
     filter(table* tb)
-        : m_tb(tb), m_extendBuflen(0), m_stat(0), m_preparedId(0),
-          m_ignoreFields(false), m_seeksMode(false), m_useOptimize(true),
-          m_withBookmark(true), m_seeksWritedCount(0), m_hasManyJoin(false),
+        : m_tb(tb), m_seeksWritedCount(0), m_extendBuflen(0), m_stat(0),
+          m_preparedId(0),m_ignoreFields(false), m_seeksMode(false),
+          m_useOptimize(true),m_withBookmark(true), m_hasManyJoin(false),
           m_preparingMode(false),m_ddba(false)
     {
         m_isTransactd = m_tb->isUseTransactd();

data/source/bzs/db/protocol/tdap/client/nsDatabase.cpp

@@ -638,6 +638,21 @@ void nsdatabase::abortTrn()
 #endif
 }
 
+ushort_td nsdatabase::trxIsolationServer() const 
+{
+    if (!isUseTransactd())
+        return 0xFFFF;
+    return *((ushort_td*)(m_nsimpl->clientID + sizeof(char*)));
+}
+
+ushort_td nsdatabase::trxLockWaitTimeoutServer() const
+{
+    if (!isUseTransactd())
+        return 0xFFFF;
+    return *((ushort_td*)(m_nsimpl->clientID + sizeof(char*) + sizeof(ushort_td)));
+}
+
+
 short_td nsdatabase::tdapErr(HWND hWnd, _TCHAR* retbuf)
 {
     return nstable::tdapErr(hWnd, m_stat, _T("Engin"), retbuf);
@@ -713,7 +728,7 @@ bool nsdatabase::isTransactdUri(const _TCHAR* uri)
     return (_tcsstr(uri, _T("tdap://")) != NULL);
 }
 
-bool nsdatabase::isUseTransactd()
+bool nsdatabase::isUseTransactd() const
 {
     return (m_btrcallid == getTrnsctdEntryPoint());
 }
@@ -754,7 +769,8 @@ bool nsdatabase::disconnect(const _TCHAR* URI)
     char uri_a[MAX_PATH];
     const char* p = toServerUri(uri_a, MAX_PATH, URI, isUseTransactd());
     m_stat = m_btrcallid(TD_CONNECT, NULL, NULL, &datalen, (void*)p,
-                         (keylen_td)(strlen(p) + 1), 1, clientID());
+                         (keylen_td)(strlen(p) + 1), LG_SUBOP_DISCONNECT,
+                         clientID());
     if (m_stat)
         return false;
     return true;

data/source/bzs/db/protocol/tdap/client/nsDatabase.h

@@ -105,18 +105,19 @@ public:
     void swapTablename(const _TCHAR* uri1, const _TCHAR* uri2);
     void beginTrn(short bias = SINGLELOCK_READ_COMMITED +
                                NOWAIT_WRITE); // NoWit SingleLock
-    // ���s�g�����U�N�V����
     void endTrn();
     void abortTrn();
     void beginSnapshot(short bias = CONSISTENT_READ);
     void endSnapshot();
+    ushort_td trxIsolationServer() const ;
+    ushort_td trxLockWaitTimeoutServer() const ;
     short_td tdapErr(HWND hWnd, _TCHAR* retbuf = NULL);
     bool useLongFilename();
     void setUseLongFilename(bool value);
     void getBtrVersion(btrVersions* versions, uchar_td* posblk);
     bool setUseTransactd();
     bool isTransactdUri(const _TCHAR* uri);
-    bool isUseTransactd();
+    bool isUseTransactd() const;
     void readDatabaseDirectory(_TCHAR* retBuf, uchar_td len);
     bool connect(const _TCHAR* uri, bool newConnection = false);
     bool disconnect(const _TCHAR* uri = _T(""));

data/source/bzs/db/protocol/tdap/client/nsTable.cpp

@@ -19,7 +19,7 @@
 #include "nsTable.h"
 #include "nsDatabase.h"
 #include "bulkInsert.h"
-
+#include <bzs/db/protocol/tdap/uri.h>
 #include <limits.h>
 #include <string.h> // Required for _fstrstr()
 #include <stdio.h>
@@ -362,9 +362,10 @@ void nstable::doOpen(const _TCHAR* name, char_td mode, const _TCHAR* ownerName)
         GetShortPathName(name, m_impl->uri, MAX_PATH);
     else
 #endif
+    {
         if (m_impl->uri != name)
-        _tcscpy_s(m_impl->uri, MAX_PATH, name);
-
+            _tcscpy_s(m_impl->uri, MAX_PATH, name);
+    }
     // for trnasctd
     if (m_impl->nsdb->isTransactdUri(m_impl->uri))
     {
@@ -375,6 +376,7 @@ void nstable::doOpen(const _TCHAR* name, char_td mode, const _TCHAR* ownerName)
         }
     }
 
+    // convert utf8 string
     char tmpName[MAX_PATH] = { 0x00 };
     const char* p = nsdatabase::toServerUri(tmpName, MAX_PATH, m_impl->uri,
                                             m_impl->nsdb->isUseTransactd());
@@ -752,6 +754,7 @@ ushort_td nstable::recordLength()
 
 void nstable::doCreateIndex(bool specifyKeyNum)
 {
+
     if (specifyKeyNum)
         m_keynum += ((uchar_td)0x80);
     tdap(TD_BUILD_INDEX);
@@ -835,7 +838,12 @@ short_td nstable::tdapErr(HWND hWnd, short_td status, const _TCHAR* TableName,
 
 #pragma warning(disable : 4996)
     if (retbuf)
-        _stprintf(retbuf, _T("table_name:%s \n%s"), TableName, buf);
+    {
+        if (TableName && TableName[0])
+            _stprintf(retbuf, _T("table_name:%s \n%s"), TableName, buf);
+        else
+            _stprintf(retbuf, _T("%s"), buf);
+    }
 #pragma warning(default : 4996)
 
     if ((int)hWnd <= 0)
@@ -854,7 +862,7 @@ short_td nstable::tdapErr(HWND hWnd, short_td status, const _TCHAR* TableName,
 void nstable::throwError(const _TCHAR* caption, short statusCode)
 {
     _TCHAR tmp[1024] = { 0x00 };
-    nstable::tdapErr(0x00, statusCode, _T("unknown"), tmp);
+    nstable::tdapErr(0x00, statusCode, NULL, tmp);
     _TCHAR tmp2[1024] = { 0x00 };
     _stprintf_s(tmp2, 1024, _T("%s\n%s\n"), caption, tmp);
     THROW_BZS_ERROR_WITH_CODEMSG(statusCode, tmp2);
@@ -879,7 +887,7 @@ _TCHAR* nstable::getDirURI(const _TCHAR* path, _TCHAR* buf)
         _tfullpath(buf, path, MAX_PATH);
     else
 #endif
-        _tcscpy(buf, path);
+        stripAuth(path, buf, MAX_PATH);
     _TUCHAR* p = (_TUCHAR*)_tcsmrchr((const _TUCHAR*)buf, PSEPARATOR_C);
     _TUCHAR* p2 = (_TUCHAR*)_tcsmrchr((const _TUCHAR*)buf, '=');
     if (p && p2)

data/source/bzs/db/protocol/tdap/client/nsTable.h

@@ -193,19 +193,19 @@ public:
         return doCommitBulkInsert(autoCommit);
     }
     void tdap(ushort_td op);
-    void seekFirst(ushort_td lockBias = 0);
-    void seekLast(ushort_td lockBias = 0);
-    void seekPrev(ushort_td lockBias = 0);
-    void seekNext(ushort_td lockBias = 0);
-    void seek(ushort_td lockBias = 0);
-    void seekGreater(bool orEqual, ushort_td lockBias = 0);
-    void seekLessThan(bool orEqual, ushort_td lockBias = 0);
-    void stepFirst(ushort_td lockBias = 0);
-    void stepLast(ushort_td lockBias = 0);
-    void stepPrev(ushort_td lockBias = 0);
-    void stepNext(ushort_td lockBias = 0);
+    void seekFirst(ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void seekLast(ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void seekPrev(ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void seekNext(ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void seek(ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void seekGreater(bool orEqual, ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void seekLessThan(bool orEqual, ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void stepFirst(ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void stepLast(ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void stepPrev(ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void stepNext(ushort_td lockBias = LOCK_BIAS_DEFAULT);
     bookmark_td bookmark();
-    void seekByBookmark(bookmark_td bm, ushort_td lockBias = 0);
+    void seekByBookmark(bookmark_td bm, ushort_td lockBias = LOCK_BIAS_DEFAULT);
     void seekByBookmark();
     percentage_td getPercentage();
     percentage_td getPercentage(bookmark_td bm);

data/source/bzs/db/protocol/tdap/client/recordsetImple.h

@@ -172,7 +172,7 @@ private:
             {
                 // At Join that if some base records reference to a joined
                 // record
-                //		that the joined record pointer is shared by some
+                //      that the joined record pointer is shared by some
                 // base records.
                 for (int i = 0; i < (int)rows; ++i)
                 {
@@ -466,8 +466,11 @@ public:
         if (index != -1)
             return index;
         if (!noexception)
-            THROW_BZS_ERROR_WITH_MSG(_T("groupQuery:Invalid key name"));
-
+        {
+            _TCHAR tmp[256];
+            _stprintf_s(tmp, 256, _T("groupQuery:Invalid key name '%s'."), name.c_str());
+            THROW_BZS_ERROR_WITH_MSG(tmp);
+        }
         return (key_type)m_fds->size();
     }
 

data/source/bzs/db/protocol/tdap/client/request.h

@@ -286,6 +286,7 @@ public:
 
             memcpy(p, keybuf, keylen);
             p += keylen;
+            // increment 1 byte
             *p = 0x00;
             ++p;
         }

data/source/bzs/db/protocol/tdap/client/sqlBuilder.cpp

@@ -191,11 +191,11 @@ const char* getFieldTypeName(uchar_td fieldType, int size, bool nobinary,
     return "";
 }
 
-FLAGS getKeyFlags(tabledef* table, short fieldNum)
+FLAGS getKeyFlags(const tabledef* table, short fieldNum)
 {
     for (int i = 0; i < table->keyCount; i++)
     {
-        keydef& key = table->keyDefs[i];
+        const keydef& key = table->keyDefs[i];
         for (int j = 0; j < key.segmentCount; j++)
         {
             if (key.segments[j].fieldNum == fieldNum)
@@ -217,12 +217,12 @@ bool isNumericFieldName(const char* name)
     return false;
 }
 
-bool isNULLKeySegment(tabledef* table, short fieldIndex)
+bool isNULLKeySegment(const tabledef* table, short fieldIndex)
 {
     bool ret = 0;
     for (int i = 0; i < table->keyCount; i++)
     {
-        keydef& key = table->keyDefs[i];
+        const keydef& key = table->keyDefs[i];
         for (int j = 0; j < key.segmentCount; j++)
         {
             if (key.segments[j].fieldNum == fieldIndex)
@@ -243,13 +243,13 @@ bool isNULLKeySegment(tabledef* table, short fieldIndex)
     return ret;
 }
 
-std::string getFiledList(tabledef* table, std::vector<std::string>& fdl)
+std::string getFiledList(const tabledef* table, std::vector<std::string>& fdl)
 {
     std::string s;
     int len;
     for (int i = 0; i < table->fieldCount; i++)
     {
-        fielddef& fd = table->fieldDefs[i];
+        const fielddef& fd = table->fieldDefs[i];
         s += "`";
         s += fdl[i];
         s += "` ";
@@ -260,7 +260,7 @@ std::string getFiledList(tabledef* table, std::vector<std::string>& fdl)
          characters in MySQL.
          Moreover, unicode cannot be specified by charset of the field. */
         if (fd.charsetIndex() == 0)
-            fd.setCharsetIndex(table->charsetIndex);
+            const_cast<fielddef&>(fd).setCharsetIndex(table->charsetIndex);
         if ((fd.type == ft_myvarchar) || (fd.type == ft_mychar))
             len /= mysql::charsize(fd.charsetIndex());
         else if ((fd.type == ft_mywvarchar) || (fd.type == ft_mywchar))
@@ -283,7 +283,7 @@ std::string getFiledList(tabledef* table, std::vector<std::string>& fdl)
     return s;
 }
 
-void insertNisFields(tabledef* table, std::vector<std::string>& fdl,
+void insertNisFields(const tabledef* table, std::vector<std::string>& fdl,
                      std::string& s)
 {
     char buf[20];
@@ -291,7 +291,7 @@ void insertNisFields(tabledef* table, std::vector<std::string>& fdl,
     {
         _ltoa_s(i, buf, 20, 10);
         std::string fddef = "";
-        keydef& key = table->keyDefs[i];
+        const keydef& key = table->keyDefs[i];
         if (key.segmentCount > 1)
         {
             if (key.segments[0].flags.bit9)
@@ -306,64 +306,71 @@ void insertNisFields(tabledef* table, std::vector<std::string>& fdl,
     }
 }
 
-std::string getKeyList(tabledef* table, std::vector<std::string>& fdl)
+std::string& getKey(const tabledef* table, std::vector<std::string>& fdl, 
+                                    int index, std::string& s, bool specifyKeyNum=false)
 {
     char buf[20];
-    std::string s;
-
-    for (int i = 0; i < table->keyCount; i++)
+    const keydef& key = table->keyDefs[index];
+    if (specifyKeyNum)
+        _ltoa_s(key.keyNumber, buf, 20, 10);     
+    else
+        _ltoa_s(index, buf, 20, 10);
+    if ((table->primaryKeyNum == index) &&
+        (fdl[key.segments[0].fieldNum] == "auto_id_field"))
+        s += " PRIMARY KEY ";
+    else
     {
-        keydef& key = table->keyDefs[i];
-        _ltoa_s(i, buf, 20, 10);
-        if ((table->primaryKeyNum == i) &&
-            (fdl[key.segments[0].fieldNum] == "auto_id_field"))
-            s += " PRIMARY KEY ";
+        if (key.segments[0].flags.bit0 == false)
+            s += " UNIQUE ";
         else
-        {
-            if (key.segments[0].flags.bit0 == false)
-                s += " UNIQUE ";
-            else
-                s += " INDEX ";
-            s += "key";
+            s += " INDEX ";
+        s += "key";
 
-            s += buf;
-        }
-        s += "(";
+        s += buf;
+    }
+    s += "(";
 
-        // "nf" segment is added to a head.
-        if (key.segmentCount > 1)
+    // "nf" segment is added to a head.
+    if (key.segmentCount > 1)
+    {
+        // If a first segment is not 1 byte of Logical
+        const fielddef& fd = table->fieldDefs[key.segments[0].fieldNum];
+        if (!((fd.len == 1) && (fd.type == ft_logical)))
         {
-            // If a first segment is not 1 byte of Logical
-            fielddef& fd = table->fieldDefs[key.segments[0].fieldNum];
-            if (!((fd.len == 1) && (fd.type == ft_logical)))
-            {
-                if (key.segments[0].flags.bit9)
-                    s += std::string("`") + "$nfn" + buf + "`,";
-                else if (key.segments[0].flags.bit3)
-                    s += std::string("`") + "$nfa" + buf + "`,";
-            }
+            if (key.segments[0].flags.bit9)
+                s += std::string("`") + "$nfn" + buf + "`,";
+            else if (key.segments[0].flags.bit3)
+                s += std::string("`") + "$nfa" + buf + "`,";
         }
-        for (int j = 0; j < key.segmentCount; j++)
-        {
-            s += "`";
-            s += fdl[key.segments[j].fieldNum];
-            s += "`";
-
-            // part key
-            fielddef& fd = table->fieldDefs[key.segments[j].fieldNum];
-            if (fd.keylen && ((fd.keylen != fd.len) || fd.blobLenBytes()))
-            {
-                sprintf_s(buf, 20, "(%d)", fd.keylen);
-                s += buf;
-            }
+    }
+    for (int j = 0; j < key.segmentCount; j++)
+    {
+        s += "`";
+        s += fdl[key.segments[j].fieldNum];
+        s += "`";
 
-            if (key.segments[j].flags.bit6)
-                s += " DESC";
-            s += ",";
+        // part key
+        const fielddef& fd = table->fieldDefs[key.segments[j].fieldNum];
+        if (fd.keylen && ((fd.keylen != fd.len) || fd.blobLenBytes()))
+        {
+            sprintf_s(buf, 20, "(%d)", fd.keylen);
+            s += buf;
         }
-        s.erase(s.end() - 1);
-        s += "),";
+
+        if (key.segments[j].flags.bit6)
+            s += " DESC";
+        s += ",";
     }
+    s.erase(s.end() - 1);
+    s += "),";
+    return s;
+}
+
+std::string getKeyList(const tabledef* table, std::vector<std::string>& fdl)
+{
+    std::string s;
+    for (int i = 0; i < table->keyCount; i++)
+        getKey(table, fdl, i, s);
     return s;
 }
 
@@ -381,15 +388,10 @@ std::string convertString(unsigned int toPage, unsigned int fromPage,
     return s;
 }
 
-std::string sqlCreateTable(const char* name /* utf8 */, tabledef* table,
-                           uchar_td charsetIndexServer)
+// suffix added names list
+void makeSuffixNamesList(const tabledef* table, std::vector<std::string>& fds)
 {
-    // Duplication of a name is inspected and, in duplication, _1 is added.
-    // It does not correspond to two or more duplications.
-    std::string s = "CREATE TABLE `";
-
-    std::vector<std::string> fdl;
-    std::vector<std::string> fds;
+    std::vector<std::string> fdl;// lower case names list.
     char tmp[256];
     char num[10];
     for (int i = 0; i < table->fieldCount; i++)
@@ -407,6 +409,18 @@ std::string sqlCreateTable(const char* name /* utf8 */, tabledef* table,
             fds.push_back(fd.nameA());
         fdl.push_back(tmp);
     }
+}
+
+std::string sqlCreateTable(const char* name /* utf8 */, tabledef* table,
+                           uchar_td charsetIndexServer)
+{
+    // Duplication of a name is inspected and, in duplication, _1 is added.
+    // It does not correspond to two or more duplications.
+    std::string s = "CREATE TABLE `";
+
+    std::vector<std::string> fds;// suffix added names list
+    makeSuffixNamesList(table, fds);
+
     uint_td schemaCodePage =
         table->schemaCodePage ? table->schemaCodePage : GetACP();
     if ((name && name[0]))
@@ -434,6 +448,29 @@ std::string sqlCreateTable(const char* name /* utf8 */, tabledef* table,
     return s;
 }
 
+std::string sqlCreateIndex(const tabledef* table, int keyNum,
+        bool specifyKeyNum, uchar_td charsetIndexServer)
+{
+    std::string s;
+    std::vector<std::string> fds;// suffix added names list
+    makeSuffixNamesList(table, fds);
+    uint_td schemaCodePage =
+        table->schemaCodePage ? table->schemaCodePage : GetACP();
+    s += getFiledList(table, fds);
+    insertNisFields(table, fds, s);
+    s = "`";
+    s+= getFileName(table->fileNameA());
+    s += "` ADD";
+    getKey(table, fds, keyNum, s, specifyKeyNum); 
+    s.erase(s.end() - 1);
+    // create statement charset must be server default charset.
+    // server default charset writen in my.cnf.
+    if (schemaCodePage != mysql::codePage(charsetIndexServer))
+        s = convertString(mysql::codePage(charsetIndexServer), schemaCodePage,
+                          s.c_str());
+    return s;
+}
+
 int findFieldNum(std::vector<fielddef>& fds, int pos)
 {
     for (int i = 0; i < (int)fds.size(); i++)

data/source/bzs/db/protocol/tdap/client/sqlBuilder.h

@@ -42,6 +42,9 @@ std::string sqlCreateTable(const char* name, tabledef* table,
 std::string sqlCreateTable(const char* fileName, fileSpec* fs,
                            uchar_td charsetIndexServer);
 
+std::string sqlCreateIndex(const tabledef* table, int keyNum,
+                  bool specifyKeyNum, uchar_td charsetIndexServer);
+
 } // namespace client
 } // namespace tdap
 } // namespace protocol

data/source/bzs/db/protocol/tdap/client/stringConverter.h

@@ -671,19 +671,15 @@ const T* readBlob(char* ptr, ::bzs::rtl::stringBuffer* strBufs,
     if (len)
     {
         char** pc = (char**)(ptr + offset);
-
-        if (len)
-        {
-            size_t olen = len * 2 + 1;
-            result = strBufs->getPtr<T>(olen);
-            if ((typeid(T) != typeid(char)) ||
-                (cv->isNeedConvert() && (typeid(T) == typeid(char))))
-                len = cv->revert(result, olen, *pc, len);
-            else if (((T*)(*pc))[len] != 0x00)
-                memcpy(result, *pc, len);
-            else
-                result = (T*)*pc;
-        }
+        size_t olen = len * 2 + 1;
+        result = strBufs->getPtr<T>(olen);
+        if ((typeid(T) != typeid(char)) ||
+            (cv->isNeedConvert() && (typeid(T) == typeid(char))))
+            len = cv->revert(result, olen, *pc, len);
+        else if (((T*)(*pc))[len] != 0x00)
+            memcpy(result, *pc, len);
+        else
+            result = (T*)*pc;
         result[len] = 0x00;
 
     }else