transactd 2.3.0 → 2.4.0

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

@@ -426,14 +426,26 @@ void database::doClose()
     m_impl->lockReadOnly = false;
 }
 
-void database::close()
+void database::close(bool withDropDefaultSchema)
 {
     bool flag = (m_impl->dbDef != NULL);
+    if (m_impl && m_impl->dbDef)
+        m_impl->dbDef->setKeyNum(withDropDefaultSchema ? CR_SUBOP_DROP : 0);
     doClose();
     if (flag)
         nsdatabase::release();
 }
 
+bool database::doReopenDatabaseSchema()
+{
+    if (m_impl->dbDef && m_impl->dbDef->isOpen())
+    {
+        doReconnect(m_impl->dbDef);
+        return (m_stat == 0);
+    }
+    return true;
+}
+
 _TCHAR* database::getTableUri(_TCHAR* buf, short FileNum)
 {
     m_stat = STATUS_SUCCESS;
@@ -569,6 +581,12 @@ table* database::openTable(short FileNum, short mode, bool AutoCreate,
 
 bool database::createTable(short FileNum, const _TCHAR* FilePath)
 {
+    tabledef* td = m_impl->dbDef->tableDefs(FileNum);
+    if (!td || td->fieldCount == 0)
+    {
+        m_stat = STATUS_INVALID_FIELD_OFFSET;
+        return false;
+    }
     if (isTransactdUri(FilePath))
     {
         if (setUseTransactd() == false)
@@ -580,7 +598,7 @@ bool database::createTable(short FileNum, const _TCHAR* FilePath)
         const char* p = toServerUri(buf2, MAX_PATH, FilePath, isUseTransactd());
 
         m_stat = m_btrcallid(
-            TD_CREATETABLE, posblk, m_impl->dbDef->tableDefs(FileNum),
+            TD_CREATETABLE, posblk, td,
             &m_impl->dbDef->m_datalen, (void*)p, (uchar_td)strlen(p),
             CR_SUBOP_BY_TABLEDEF /* exists check */, clientID());
     }
@@ -597,7 +615,7 @@ bool database::createTable(short FileNum, const _TCHAR* FilePath)
         if (FilePath)
             buf = FilePath;
         else
-            buf = m_impl->dbDef->tableDefs(FileNum)->fileName();
+            buf = td->fileName();
         nsdatabase::createTable(fs, 1024, buf, CR_SUBOP_BY_FILESPEC);
         free(fs);
     }
@@ -734,11 +752,13 @@ inline void copyEachFieldData(table* dest, table* src, filedChnageInfo* fci)
 inline int moveVaileRecord(table* src)
 {
     int count = 0;
-    bookmark_td bm = 0;
+    bookmark_td bm;
     src->stepLast();
     while (src->stat() == STATUS_SUCCESS)
     {
         bm = src->bookmark();
+        if (src->stat() != STATUS_SUCCESS)
+        	break;
         ++count;
         src->stepPrev();
     }
@@ -779,6 +799,7 @@ short database::copyTableData(table* dest, table* src, bool turbo, int offset,
                               short keyNum, int maxSkip)
 {
     src->setKeyNum((char_td)keyNum);
+    dest->setKeyNum(-1);
     const tabledef* ddef = dest->tableDef();
     const tabledef* sdef = src->tableDef();
     ushort_td ins_rows = 0;
@@ -839,7 +860,7 @@ short database::copyTableData(table* dest, table* src, bool turbo, int offset,
             dest->tdap(TD_REC_INSERT);
         }
         else
-            ins_rows += dest->insert();
+            ins_rows += dest->insert(true);
         if (dest->stat() == STATUS_INVALID_VALLEN)
             skipCount++;
         else if (dest->stat() == STATUS_DUPPLICATE_KEYVALUE)

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

@@ -35,7 +35,7 @@ class database;
 class table;
 class dbdef;
 
-#if (defined(__BORLANDC__) && !defined(__clang__))
+#if (defined(__BORLANDC__) && !defined(__APPLE__) && !defined(__clang__))
 typedef bool __stdcall (*deleteRecordFn)(database* db, table* tb, bool inkey);
 typedef short __stdcall (*schemaMgrFn)(database* db);
 typedef void __stdcall (*copyDataFn)(database* db, int recordCount, int count,
@@ -84,6 +84,7 @@ protected:
                                     bool& cancel);
     virtual void doConvertTable(short tableIndex, bool turbo,
                                 const _TCHAR* ownerName);
+    virtual bool doReopenDatabaseSchema();
 
 public:
     virtual void release();
@@ -111,7 +112,7 @@ public:
     void create(const _TCHAR* uri, short type = TYPE_SCHEMA_BDF);
     void drop();
     void dropTable(const _TCHAR* tableName);
-    void close();
+    void close(bool withDropDefaultSchema = false);
     short aclReload();
     short continuous(char_td op = TD_BACKUP_START, bool inclideRepfile = false);
     short assignSchemaData(dbdef* src);

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

@@ -42,6 +42,7 @@ namespace client
 #define FORMAT_VERSON_BTRV_DEF 0
 #define FORMAT_VERSON_CURRENT 1
 
+/* BDFFORMAT_VERSION used in the databaseSchema.cpp listSchemaTable() */
 static const _TCHAR BDFFORMAT_VERSION[] = _T("2.000.00");
 static const _TCHAR ow0[11] = { 46, 46, 83, 67, 46, 46, 46, 46, 93, 4, 0 };
 static const _TCHAR ow1[11] = { 46, 46, 83, 67, 46, 46, 46, 46, 66, 5, 0 };
@@ -220,25 +221,23 @@ void dbdef::setCodePage(tabledef* td)
     }
 }
 
-void dbdef::updateTableDef(short TableIndex, bool forPsqlDdf)
+short dbdef::validateTableDef(short TableIndex)
 {
     m_stat = STATUS_SUCCESS;
     tabledef* td = tableDefs(TableIndex);
-    short i, j, ret, Fnum;
-    uchar_td type;
 
     td->optionFlags.bitA = false; // reset valiable type
     td->optionFlags.bitB = false;
-    for (i = 0; i < td->fieldCount; ++i)
+    for (short i = 0; i < td->fieldCount; ++i)
     {
-        ret = fieldNumByName(TableIndex, td->fieldDefs[i].name());
+        short ret = fieldNumByName(TableIndex, td->fieldDefs[i].name());
         if ((ret != -1) && (ret != i))
         {
             m_stat = STATUS_DUPLICATE_FIELDNAME;
-            return;
+            return m_stat;
         }
         // Check field length.
-        type = td->fieldDefs[i].type;
+        uchar_td type = td->fieldDefs[i].type;
 
         // reset update indicator
         td->fieldDefs[i].enableFlags.bitE = false;
@@ -247,7 +246,7 @@ void dbdef::updateTableDef(short TableIndex, bool forPsqlDdf)
         if (!ret)
         {
             m_stat = STATUS_INVALID_FIELDLENGTH;
-            return;
+            return m_stat;
         }
         // Note or Lvar type must be the last of fields.
         if ((type == ft_note) || (type == ft_lvar))
@@ -255,7 +254,7 @@ void dbdef::updateTableDef(short TableIndex, bool forPsqlDdf)
             if (i != td->fieldCount - 1)
             {
                 m_stat = STATUS_LVAR_NOTE_NOT_LAST;
-                return;
+                return m_stat;
             }
         }
 
@@ -265,7 +264,7 @@ void dbdef::updateTableDef(short TableIndex, bool forPsqlDdf)
             (type != ft_note) && (type != ft_lvar))
         {
             m_stat = STATUS_INVALID_VARIABLETABLE;
-            return;
+            return m_stat;
         }
         if ((type == ft_myvarchar) || (type == ft_mywvarchar) ||
             (type == ft_myvarbinary) || (type == ft_mywvarbinary) ||
@@ -276,36 +275,44 @@ void dbdef::updateTableDef(short TableIndex, bool forPsqlDdf)
     }
 
     // Check invalid key type
-    for (i = 0; i < td->keyCount; i++)
+    for (short i = 0; i < td->keyCount; i++)
     {
-        for (j = 0; j < td->keyDefs[i].segmentCount; j++)
+        for (short j = 0; j < td->keyDefs[i].segmentCount; j++)
         {
-            Fnum = td->keyDefs[i].segments[j].fieldNum;
-            ret = isPassKey(td->fieldDefs[Fnum].type);
+            short fnum = td->keyDefs[i].segments[j].fieldNum;
+            short ret = isPassKey(td->fieldDefs[fnum].type);
             if (!ret)
             {
                 m_stat = STATUS_INVALID_KEYTYPE;
-                return;
+                return m_stat;
             }
         }
     }
 
     // Chack duplicate table name.
-    for (i = 1; i < m_impl->tableCount; i++)
+    for (short i = 1; i < m_impl->tableCount; i++)
     {
         if ((tableDefs(i)) && (i != TableIndex))
         {
             if (strcmp(tableDefs(i)->tableNameA(), td->tableNameA()) == 0)
             {
                 m_stat = STATUS_DUPPLICATE_KEYVALUE;
-                return;
+                return m_stat;
             }
         }
     }
     setCodePage(td);
-
     setRecordLen(TableIndex);
-    td = tableDefs(TableIndex);
+    return m_stat;
+}
+
+void dbdef::updateTableDef(short TableIndex, bool forPsqlDdf)
+{
+    if ((m_stat = validateTableDef(TableIndex)) != 0)
+        return;
+
+    tabledef* td = tableDefs(TableIndex);
+
     if (m_impl->noWriteMode)
     {
         m_stat = STATUS_ACCESS_DENIED;
@@ -716,10 +723,9 @@ tabledef* dbdef::tableDefs(int index)
         }
         m_datalen =
             fixVariableLenBug(isUseTransactd(), (tabledef*)m_pdata, m_datalen);
-
-        m_impl->tableDefs[index] = def =
-            (tabledef*)malloc(getNewVersionSize((tabledef*)m_pdata));
-
+        size_t size = getNewVersionSize((tabledef*)m_pdata);
+        def = (tabledef*)malloc(size);
+        m_impl->tableDefs[index] = def;
         if (def == NULL)
         {
             m_stat = STATUS_CANT_ALLOC_MEMORY;
@@ -1709,7 +1715,11 @@ void dbdef::pushBackup(short TableIndex)
     }
 
     setFieldsCharsetIndex(tableDefs(TableIndex));
-    memcpy(m_impl->tableDefs[TABLE_NUM_TMP], tableDefs(TableIndex), blen);
+    tabledef* td = m_impl->tableDefs[TABLE_NUM_TMP];
+    memcpy(td, tableDefs(TableIndex), blen);
+    td->fieldDefs = getFieldDef(td);
+    td->keyDefs = getKeyDef(td);
+
 }
 
 bool dbdef::compAsBackup(short TableIndex)
@@ -1745,10 +1755,10 @@ void dbdef::popBackup(short TableIndex)
     int len = totalDefLength(TABLE_NUM_TMP);
     m_impl->tableDefs[TableIndex] =
         (tabledef*)realloc(tableDefs(TableIndex), len);
-    memcpy(tableDefs(TableIndex), tableDefs(TABLE_NUM_TMP), len);
-    tableDefs(TableIndex)->fieldDefs = getFieldDef(tableDefs(TableIndex));
-    tableDefs(TableIndex)->keyDefs = getKeyDef(tableDefs(TableIndex));
-
+    tabledef* td = m_impl->tableDefs[TableIndex];
+    memcpy(td, tableDefs(TABLE_NUM_TMP), len);
+    td->fieldDefs = getFieldDef(td);
+    td->keyDefs = getKeyDef(td);
     updateTableDef(TableIndex);
 }
 

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

@@ -99,7 +99,7 @@ public:
     int version() const;
 
     inline short_td stat() const { return m_stat; }
-
+    short validateTableDef(short TableIndex);
     void updateTableDef(short tableIndex, bool forPsqlDdf = true);
     fielddef* insertField(short tableIndex, short insertIndex);
     void deleteField(short tableIndex, short deleteIndex);

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

@@ -211,13 +211,13 @@ extern "C" PACKAGE_OSX short_td __STDCALL
 			client_t->req().paramMask = P_MASK_NOKEYBUF;
             break;
         case TD_UNLOCK:
+        case TD_CLOSETABLE:
             client_t->req().paramMask = P_MASK_POSBLK | P_MASK_KEYNUM;
             break;
         case TD_UPDATE_PART:
             client_t->cleanup();
             return 0;
         case TD_REC_DELETE:
-        case TD_CLOSETABLE:
         case TD_CLEAR_OWNERNAME:
         case TD_AUTOMEKE_SCHEMA:
             client_t->req().paramMask = P_MASK_POSBLK;
@@ -371,37 +371,7 @@ extern "C" PACKAGE_OSX short_td __STDCALL
     }
     catch (boost::system::system_error& e)
     {
-        switch (e.code().value())
-        {
-        case 11004:
-        case 11001:
-            ret = ERROR_TD_HOSTNAME_NOT_FOUND;
-            break;
-        case 10060:
-        case 10057: //blocking fire wall
-        case 110:   //connect: Connection timed out
-        case 121:   //timeout sema
-        case 11:    //EAGAIN
-            ret = ERROR_TD_NET_TIMEOUT;
-            break;
-        case 32:    //write:brokn pipe
-        case 111:   //connect: Connection refused
-        case 10061:
-            ret = ERROR_TD_CONNECTION_FAILURE;
-            break;
-        case 104:   //write: Connection reset by peer
-        case 10054:
-            ret = ERROR_TD_NET_REMOTE_DISCONNECT;
-            break;
-        case 232:
-        case 109:
-        case 2:
-        case 1:
-            ret = ERROR_TD_INVALID_CLINETHOST;
-            break;
-        default:
-            ret = ERROR_TD_NET_OTHER;
-        }
+        ret = errorCode(e.code());
         OutputDebugString(e.what());
         char tmp[512];
         sprintf_s(tmp, 512, "%d %s", e.code().value(), e.what());

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

@@ -1614,7 +1614,6 @@ void* field::getFVbin(uint_td& size) const
         size = m_fd->len;
         return (void*)(p);
     }
-    return NULL;
 }
 
 double field::getFVDecimal() const

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

@@ -37,7 +37,6 @@ namespace client
 {
 
 
-#define BOOKMARK_SIZE 4
 #define DATASIZE_BYTE 2
 
 
@@ -504,12 +503,11 @@ public:
         }
     }
 
-    int bookmarkSize(bool isTransactd) const
+    int bookmarkSize(bool isTransactd, ushort_td bmlen) const
     {
         if (isTransactd)
-            return (itype & FILTER_CURRENT_TYPE_NOBOOKMARK) ? 0 : BOOKMARK_SIZE;
-        assert(type[0]);
-        return BOOKMARK_SIZE;
+            return (itype & FILTER_CURRENT_TYPE_NOBOOKMARK) ? 0 : bmlen;
+        return bmlen;
     }
 
     bool positionTypeNext(bool isTransactd) const
@@ -599,7 +597,7 @@ class filter
     struct
     {
         bool m_stopAtLimit : 1;
-
+        bool m_seekByBookmarks : 1;
     };
 
     struct bufSize
@@ -740,11 +738,20 @@ class filter
         {
             seek& l = m_seeks[index];
             uchar_td* to = dataBuf;
-            for (int j = 0; j < joinKeySize; ++j)
+            if (m_seekByBookmarks)
             {
-                const keyValuePtr& v = keyValues[i + j];
-                fielddef& fd = fds[kd->segments[j].fieldNum];
-                to = fd.keyCopy(to, (uchar_td*)v.ptr, v.len);
+                const keyValuePtr& v = keyValues[i];
+                memcpy(to, (uchar_td*)v.ptr, v.len);
+                to += v.len;
+            }
+            else
+            {
+                for (int j = 0; j < joinKeySize; ++j)
+                {
+                    const keyValuePtr& v = keyValues[i + j];
+                    fielddef& fd = fds[kd->segments[j].fieldNum];
+                    to = fd.keyCopy(to, (uchar_td*)v.ptr, v.len);
+                }
             }
             if (!l.setParam(dataBuf, (ushort_td)(to - dataBuf)))
                 return false;
@@ -758,25 +765,34 @@ class filter
     bool prebuiltSeeks( keydef* kd, size_t size, const queryBase* q, int& keySize, uchar_td** dataBuf)
     {
         // Check specify key size is smoller than kd->segmentCount or equal
-        if (keySize == 0)
-            keySize = kd->segmentCount;
-        else if (kd->segmentCount < keySize) 
-                return false;
-        if (size % keySize)
-            return false;
-        
-        m_hasManyJoin = (kd->segmentCount != keySize) || kd->segments[0].flags.bit0;
-        if (m_hasManyJoin)
-            m_withBookmark = true;
-        if (q && m_hasManyJoin && 
-                !(q->getOptimize() & queryBase::joinHasOneOrHasMany))
-            return false;
-        m_seeks.resize(size / keySize);
         int maxKeylen = 0;
-        for (int j = 0; j < keySize; ++j)
-            maxKeylen +=
-                m_tb->tableDef()->fieldDefs[kd->segments[j].fieldNum].len + 2;
+        if (m_seekByBookmarks)
+        {
+            maxKeylen = m_tb->bookmarkLen();
+            m_hasManyJoin = false;
+            keySize = 1;
+            m_seeks.resize(size);
+        }
+        else
+        {
+            if (keySize == 0)
+                keySize = kd->segmentCount;
+            else if (kd->segmentCount < keySize)
+                    return false;
+            if (size % keySize)
+                return false;
 
+            m_hasManyJoin = (kd->segmentCount != keySize) || kd->segments[0].flags.bit0;
+            if (m_hasManyJoin)
+                m_withBookmark = true;
+            if (q && m_hasManyJoin &&
+                    !(q->getOptimize() & queryBase::joinHasOneOrHasMany))
+                return false;
+            m_seeks.resize(size / keySize);
+            for (int j = 0; j < keySize; ++j)
+                maxKeylen +=
+                    m_tb->tableDef()->fieldDefs[kd->segments[j].fieldNum].len + 2;
+        }
         // alloc databuffer
         *dataBuf = reallocSeeksDataBuffer(maxKeylen * m_seeks.size());
         m_hd.rejectCount = 0;
@@ -812,7 +828,7 @@ class filter
         m_withBookmark = q->isBookmarkAlso();
         m_cachedOptimize = q->getOptimize();
         m_stopAtLimit = q->isStopAtLimit();
-
+        m_seekByBookmarks = q->isSeekByBookmarks(); 
 
         if (q->isAll())
             addAllFields();
@@ -839,7 +855,7 @@ class filter
 
     int resultRowSize(bool ignoreFields) const
     {
-        int recordLen = m_hd.bookmarkSize(m_isTransactd) + DATASIZE_BYTE;
+        int recordLen = bookmarkSize() + DATASIZE_BYTE;
         if (!ignoreFields)
             recordLen += bsize.retRowSize;
         return recordLen;
@@ -1152,8 +1168,12 @@ public:
             if (!m_withBookmark)
                 type |= FILTER_CURRENT_TYPE_NOBOOKMARK;
             if (m_seeksMode)
+            {
+                incCurrent = false;
                 type |= FILTER_TYPE_SEEKS;
-            
+                if (m_seekByBookmarks)
+                    type |= FILTER_TYPE_SEEKS_BOOKMARKS;
+            }
         }
         m_hd.setPositionType(incCurrent, m_isTransactd, type);
     }
@@ -1192,8 +1212,7 @@ public:
 
     ushort_td totalFieldLen() const
     {
-        return resultRowSize(false) - m_hd.bookmarkSize(m_isTransactd) -
-               DATASIZE_BYTE;
+        return resultRowSize(false) - bookmarkSize() - DATASIZE_BYTE;
     }
 
     ushort_td totalSelectFieldLen() const
@@ -1240,7 +1259,12 @@ public:
 
     inline bool ignoreFields() const { return m_ignoreFields; }
 
-    inline int bookmarkSize() const { return m_hd.bookmarkSize(m_isTransactd); }
+    inline int bookmarkSize() const
+    {
+        ushort_td bmlen = (m_seeksMode && m_hasManyJoin) ?
+                             4 : m_tb->bookmarkLen();
+        return m_hd.bookmarkSize(m_isTransactd, bmlen);
+    }
 
     /* The Ignore fields option don't use with multi seek operation.
        because if a server are not found a record then a server return
@@ -1248,6 +1272,7 @@ public:
     */
     inline void setIgnoreFields(bool v) { m_ignoreFields = v; }
     inline bool isSeeksMode() const { return m_seeksMode; }
+    inline bool isSeekByBookmarks() const { return m_seekByBookmarks; }
     inline table::eFindType direction() const { return m_direction; }
     inline bool setDirection(table::eFindType v) 
     { 
@@ -1304,6 +1329,8 @@ public:
         return setDirection(v ? table::findBackForword : table::findForword);
     }
 
+    bool withBookmark() const { return m_withBookmark; }
+
     static filter* create(table* tb)
     {
         return new filter(tb);

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

@@ -393,11 +393,8 @@ public:
             f->init(mdls.fieldDefs());
 
             if (f->resultKey() == (int)mdls.fieldDefs()->size())
-            {
-                groupFuncBase::numeric_type dummy = 0;
                 mdls.appendField(f->resultName(), f->resultType(),
                                   f->resultLen());
-            }
         }
 
         grouping_comp<recordsetImple> groupingComp(mdls, keyFields);
@@ -584,8 +581,8 @@ public:
 
     inline groupFuncBaseImple(const groupFuncBaseImple& r)
         : m_targetNames(r.m_targetNames), m_resultName(r.m_resultName),
-          m_resultKey(r.m_resultKey), m_resultType(r.m_resultType), 
-          m_resultLen(r.m_resultLen),
+          m_resultKey(r.m_resultKey), 
+          m_resultLen(r.m_resultLen), m_resultType(r.m_resultType), 
           m_values(r.m_values), m_counts(r.m_counts)
     {
         copyStrings(r.m_strings);  

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

@@ -320,6 +320,15 @@ bool writableRecord::read(bool KeysetAlrady)
     return true;
 }
 
+bool writableRecord::read(bookmark_td& bm)
+{
+    m_tb->seekByBookmark(bm);
+    if (m_tb->stat())
+        return false;
+    copyFromBuffer(m_tb);
+    return true;
+}
+
 void writableRecord::insert()
 {
     copyToBuffer(m_tb);

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

@@ -171,6 +171,7 @@ class DLLLIB writableRecord : public memoryRecord
 public:
 
     bool read(bool KeysetAlrady = false);
+    bool read(bookmark_td& bm);
     void insert();
     void del(bool KeysetAlrady = false);
     void update();