transactd 2.4.5 → 3.0.0

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

@@ -46,14 +46,13 @@ enum eFieldQuery
 class DLLLIB dbdef : private nstable
 {
     friend class database;
-    struct dbdimple* m_impl;
+    struct dbdimple* m_dimpl;
     dbdef(const dbdef&);
     dbdef& operator=(const dbdef&);
 
     bool isUsedField(short tableIndex, short deleteIndex);
     void renumberFieldNum(short tableIndex, short Index, short op);
     bool resizeAt(short tableIndex, bool key);
-    bool resizeReadBuf(void);
     void moveById(short id);
     bool validLen(uchar_td FieldType, uint_td FieldLen);
     bool isPassKey(uchar_td FieldType);
@@ -62,10 +61,6 @@ class DLLLIB dbdef : private nstable
     void saveDDF(short tableIndex, short opration, bool forPsqlDdf = true);
     ushort_td getDDFNewTableIndex();
     ushort_td getDDFNewFieldIndex();
-    int totalDefLength(short tableIndex);
-    void setRecordLen(short tableIndex);
-    void setCodePage(tabledef* rd);
-
     void doOpen(const _TCHAR* uri, char_td mode = 0,
                 const _TCHAR* ownername = NULL);
     void doClose();
@@ -76,16 +71,19 @@ class DLLLIB dbdef : private nstable
     inline nstable* table() { return this; }
     inline fielddef_t_my& convert(fielddef_t_my& fd_my,
                                   const fielddef_t_pv& fd_pv);
-    void tableDefCopy(tabledef* dest, tabledef* src, size_t size);
+    void tableDefCopy(tabledef* dest, const tabledef* src, size_t size);
 
     ~dbdef();
     dbdef(nsdatabase* pbe, short defType);
     void create(const _TCHAR* uri);
-    void autoMakeSchema();
+    void autoMakeSchema(bool noUseNullkey);
     void setDefType(short defType);
-    static keydef* getKeyDef(tabledef* p);
-    static fielddef* getFieldDef(tabledef* p);
-
+    bool testTablePtr(tabledef* td);
+    tabledef* initReadAfter(short tableIndex, const tabledef* data, uint_td datalen);
+    void* getBufferPtr(uint_td& size);
+    bool setDefaultImage(short tableIndex, const uchar_td* p, ushort_td size);
+    bool addSchemaImage(const tabledef* p, ushort_td size, short& tableIndex);
+    void allocDatabuffer();
 public:
     using nstable::addref;
     using nstable::release;
@@ -109,23 +107,22 @@ public:
     void deleteTable(short tableIndex);
     void renumberTable(short oldIndex, short newIndex);
     short tableNumByName(const _TCHAR* tableName);
-    ushort_td getRecordLen(short tableIndex);
-
     void getFileSpec(fileSpec* fs, short tableIndex);
     short findKeynumByFieldNum(short tableIndex, short index);
     short fieldNumByViewNum(short tableIndex, short index);
     short fieldNumByName(short tableIndex, const _TCHAR* name);
     void* allocRelateData(int size);
-
     uint_td fieldValidLength(eFieldQuery query, uchar_td fieldType);
     void pushBackup(short tableIndex);
     bool compAsBackup(short tableIndex);
     void popBackup(short tableIndex);
+    void synchronizeSeverSchema(short tableIndex);
 
     inline short_td tdapErr(HWND hWnd, _TCHAR* retbuf = NULL)
     {
         return nstable::tdapErr(hWnd, retbuf);
     }
+
     inline _TCHAR* statMsg(_TCHAR* retbuf)
     {
         nstable::tdapErr(0, retbuf);
@@ -134,9 +131,6 @@ public:
 
     void reopen(char_td mode = TD_OPEN_READONLY);
     using nstable::setStat;
-    static ushort_td getFieldPosition(tabledef* tableDef, short fieldNum);
-    static void cacheFieldPos(tabledef* tableDef);
-
     using nstable::mode;
 };
 

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

@@ -105,7 +105,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved)
     {
         try
         {
-        	delete m_cons;
+            delete m_cons;
         }
         catch(...){}
         m_cons = NULL;
@@ -204,7 +204,7 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             break;
         case TD_MOVE_BOOKMARK:
         case TD_MOVE_PER:
-			client_t->req().paramMask = P_MASK_NOKEYBUF;
+            client_t->req().paramMask = P_MASK_NOKEYBUF;
             break;
         case TD_UNLOCK:
         case TD_CLOSETABLE:
@@ -216,7 +216,7 @@ extern "C" PACKAGE_OSX short_td __STDCALL
         case TD_REC_DELETE:
         case TD_CLEAR_OWNERNAME:
         case TD_AUTOMEKE_SCHEMA:
-            client_t->req().paramMask = P_MASK_POSBLK;
+            client_t->req().paramMask = P_MASK_POSBLK | P_MASK_KEYNUM;
             break;
         case TD_END_TRANSACTION:
         case TD_BEGIN_TRANSACTION:
@@ -267,7 +267,16 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             break;
         case TD_GET_PER:
         case TD_SET_OWNERNAME:
+            client_t->req().paramMask = P_MASK_ALL;
+            break;
         case TD_TABLE_INFO:
+            if (client_t->req().keyNum == ST_SUB_GETSQL_BY_TABLEDEF)
+            {
+                client_t->req().result = 0;
+                client_t->getSqlCreate();
+                client_t->cleanup();
+                return client_t->req().result;
+            }
             client_t->req().paramMask = P_MASK_ALL;
             break;
         case TD_BOOKMARK:
@@ -286,23 +295,46 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             break;
         case TD_VERSION:
         {
-            ushort_td datalen = *client_t->req().datalen;
+            if (!client_t->req().cid->con)
+                 return ERROR_TD_NOT_CONNECTED;
+
+            ushort_td datalen = *(client_t->req().datalen);
+            btrVersion* v = (btrVersion*)(client_t->req().data);
+            const clsrv_ver* ver = client_t->ver();
             if (datalen >= sizeof(btrVersion))
             {
-                btrVersion& v = (btrVersion&)*((char*)client_t->req().data);
-                v.majorVersion = atoi(CPP_INTERFACE_VER_MAJOR);
-                v.minorVersion = atoi(CPP_INTERFACE_VER_MINOR);
-                v.type = 'N';
-                client_t->req().paramMask = P_MASK_DATA | P_MASK_DATALEN;
+                v->majorVersion = atoi(CPP_INTERFACE_VER_MAJOR);
+                v->minorVersion = atoi(CPP_INTERFACE_VER_MINOR);
+                v->type = 'N';
+                client_t->req().result = 0;
             }
             else
                 client_t->req().result = STATUS_BUFFERTOOSMALL;
-            if (datalen < sizeof(btrVersion) * 2)
+            if (datalen >= sizeof(btrVersion) * 2)
             {
-                client_t->cleanup();
-                return 0;
+                ++v;
+                if (ver)
+                {
+                    v->majorVersion = ver->srvMysqlMajor;
+                    v->minorVersion = ver->srvMysqlMinor;
+                    v->type = ver->srvMysqlType;
+                    client_t->req().result = 0;
+                }else
+                    memset(v, 0, sizeof(btrVersion));
             }
-            break;
+            if (datalen >= sizeof(btrVersion) * 3)
+            {
+                ++v;
+                if (ver)
+                {
+                    v->majorVersion = ver->srvMajor;
+                    v->minorVersion = ver->srvMinor;
+                    v->type = 'T';
+                }else
+                    memset(v, 0, sizeof(btrVersion));
+                client_t->req().result = 0;
+            }
+            return client_t->req().result;
         }
         case TD_OPENTABLE:
         case TD_CREATETABLE:
@@ -360,6 +392,22 @@ extern "C" PACKAGE_OSX short_td __STDCALL
         case TD_ACL_RELOAD:
             client_t->req().paramMask = 0;
             break;
+        case TD_GET_SCHEMA:
+            if (client_t->isSupportFunction(TD_GET_SCHEMA))
+                client_t->req().paramMask = P_MASK_DATALEN | P_MASK_KEYBUF;
+            else
+                return STATUS_NOSUPPORT_OP;
+            break;
+        case TD_STORE_TEST:
+            client_t->req().paramMask = P_MASK_POSBLK | P_MASK_DATA | P_MASK_DATALEN | P_MASK_KEYNUM;
+            break;
+        case TD_SET_TIMESTAMP_MODE:
+            client_t->req().paramMask = P_MASK_POSBLK | P_MASK_KEYNUM;
+            break;
+        case TD_STOP_ENGINE:
+            return 0;
+        default:
+            return STATUS_NOSUPPORT_OP;
         }
         short_td ret = client_t->execute();
         client_t->cleanup();