transactd 1.2.0 → 2.0.0

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

@@ -19,12 +19,12 @@
  02111-1307, USA.
  ================================================================= */
 #include "table.h"
+#include "fields.h"
 #include <assert.h>
 #include <vector>
 #include <boost/algorithm/string.hpp>
 #include <boost/tokenizer.hpp>
 
-
 namespace bzs
 {
 namespace db
@@ -40,12 +40,13 @@ namespace client
 #define BOOKMARK_SIZE 4
 #define DATASIZE_BYTE 2
 
-#define MAX_DATA_SIZE 57000
-
+#define BTRV_MAX_DATA_SIZE 57000
+#define TDAP_MAX_DATA_SIZE 6291456 // 3Mbyte
 
 inline ushort_td varlenForFilter(const fielddef& fd)
 {
-    if (((fd.type >= ft_myvarchar) && (fd.type <= ft_mywvarbinary)) || fd.type == ft_lstring)
+    if (((fd.type >= ft_myvarchar) && (fd.type <= ft_mywvarbinary)) ||
+        fd.type == ft_lstring)
         return fd.len < 256 ? 1 : 2;
     else if ((fd.type == ft_myblob) || (fd.type == ft_mytext))
         return fd.len - 8;
@@ -60,7 +61,8 @@ inline uint_td compDataLen(const fielddef& fd, const uchar_td* ptr, bool part)
     uint_td length = fd.keyDataLen(ptr);
     if (part)
     {
-        if ((fd.type == ft_string) || (fd.type == ft_zstring) || (fd.type == ft_note))
+        if ((fd.type == ft_string) || (fd.type == ft_zstring) ||
+            (fd.type == ft_note))
             length = (uint_td)strlen((const char*)ptr);
         else if ((fd.type == ft_wstring) || (fd.type == ft_wzstring))
             length = (uint_td)wcslen((const wchar_t*)ptr);
@@ -70,21 +72,21 @@ inline uint_td compDataLen(const fielddef& fd, const uchar_td* ptr, bool part)
 
 bool verType(uchar_td type)
 {
-    if (((type >= ft_myvarchar) && (type <= ft_mywvarbinary)) || type == ft_lstring)
+    if (((type >= ft_myvarchar) && (type <= ft_mywvarbinary)) ||
+        type == ft_lstring)
         return true;
     return false;
 }
 
-
-#pragma option -a-
-pragma_pack1
+#pragma pack(push, 1)
+pragma_pack1;
 
 struct resultField
 {
-	unsigned short len;
+    unsigned short len;
     unsigned short pos;
 
-    bool setParam(table* tb, const _TCHAR* name)
+    int setParam(table* tb, const _TCHAR* name)
     {
         short fieldNum = tb->fieldNumByName(name);
         if (fieldNum != -1)
@@ -92,63 +94,94 @@ struct resultField
             fielddef* fd = &tb->tableDef()->fieldDefs[fieldNum];
             len = fd->len;
             pos = fd->pos;
-            return true;
+            return fieldNum;
         }
-        return false;
+        return -1;
     }
     unsigned char* writeBuffer(unsigned char* p, bool estimate)
     {
         int n = sizeof(resultField);
-        if (!estimate) memcpy(p, this, n);
-        return p+n;
+        if (!estimate)
+            memcpy(p, this, n);
+        return p + n;
     }
 };
 
 struct resultDef
 {
-    resultDef()
-    {
-        reset();
-    }
+    resultDef() { reset(); }
     void reset()
     {
         maxRows = 0;
         fieldCount = 0;
     }
-	unsigned short maxRows;
-	unsigned short fieldCount;
+    unsigned short maxRows;
+    unsigned short fieldCount;
     unsigned char* writeBuffer(unsigned char* p, bool estimate)
     {
         int n = sizeof(resultDef);
-        if (!estimate) memcpy(p, this, n);
+        if (!estimate)
+            memcpy(p, this, n);
         return p + n;
     }
     friend class filter;
 };
 
-struct logic
+struct seek
 {
-	unsigned char	type;
-	unsigned short	len;
-	unsigned short	pos;
-	unsigned char	logType;
-	char			opr;
-    unsigned char*  data;
+    unsigned char* data;
+    unsigned short len;
 
 public:
-    logic():data(NULL){}
+    size_t getLength() { return sizeof(len) + len; }
 
-    ~logic()
+    // setParam from keyValue
+    bool setParam(uchar_td* buf, ushort_td keylen)
     {
-        delete [] data;
+        len = keylen;
+        data = buf;
+        return true;
     }
 
+    unsigned char* writeBuffer(unsigned char* p, bool estimate, bool end,
+                               bool isTransactd) const
+    {
+        int n = sizeof(len);
+        if (!estimate)
+        {
+            if (isTransactd)
+                memcpy(p, &len, n);
+            else
+                n = 0;
+            memcpy(p + n, data, len);
+        }
+        else if (!isTransactd)
+            n = 0;
+
+        return p + n + len;
+    }
+};
+
+struct logic
+{
+    unsigned char type;
+    unsigned short len;
+    unsigned short pos;
+    unsigned char logType;
+    char opr;
+    unsigned char* data;
+
+public:
+    logic() : data(NULL) {}
+
+    ~logic() { delete[] data; }
+
     size_t getLength()
     {
         return sizeof(logic) - sizeof(unsigned char*) + getDatalen();
     }
 
-    void setFieldParam(fielddef* fd )
+    void setFieldParam(fielddef* fd)
     {
         type = fd->type;
         len = fd->len;
@@ -157,50 +190,31 @@ public:
 
     int getDatalen() const
     {
-        if (logType & 64)
+        if (logType & CMPLOGICAL_FIELD)
             return 2;
         return len;
     }
 
     bool setCompFiled(table* tb, short index, const _TCHAR* name)
     {
-         short tmp = tb->fieldNumByName(name);
-         if (tmp !=-1)
-         {
-            memcpy(data, &tmp, 2);
+        short tmp = tb->fieldNumByName(name);
+        if (tmp != -1)
+        {
+            allocBuffer(2);
+            fielddef& fd = tb->tableDef()->fieldDefs[tmp];
+            memcpy(data, &(fd.pos), 2);
             logType |= CMPLOGICAL_FIELD;
             return true;
-         }
-         return false;
-    }
-
-    bool isPart(table* tb, short index)
-    {
-        fielddef* fd = &tb->tableDef()->fieldDefs[index];
-        bool ret = false;
-        if (fd->isStringType())
-        {
-             _TCHAR* p = (_TCHAR*)tb->getFVstr(index);
-            if (p)
-            {
-                size_t n = _tcslen(p);
-                if ((ret = (p[n-1] == _T('*')))!=0)
-                {
-                    p[n-1] = 0x00;
-                    tb->setFV(index, p);
-                }
-            }else
-                tb->setFV(index, _T(""));
         }
-        return ret;
+        return false;
     }
 
     void allocBuffer(int size)
     {
-         if (data)
-            delete [] data;
-         data = new unsigned char[size + 2];
-         memset(data, 0, size + 2);
+        if (data)
+            delete[] data;
+        data = new unsigned char[size + 2];
+        memset(data, 0, size + 2);
     }
 
     void copyToBuffer(table* tb, short index, bool part)
@@ -217,67 +231,50 @@ public:
         memcpy(to + varlen, fd->keyData(ptr), copylen);
 
         if (!part && (fd->varLenBytes() || fd->blobLenBytes()))
-            logType |= CMPLOGICAL_VAR_COMP_ALL; //match complate
+            logType |= CMPLOGICAL_VAR_COMP_ALL; // match complate
     }
 
-    bool setParam(table* tb, const _TCHAR* name
-                        , const _TCHAR* type, const _TCHAR* value, char combine, bool compField = false)
+    bool setParam(table* tb, const _TCHAR* name, const _TCHAR* type,
+                  const _TCHAR* value, char combine, bool compField = false)
     {
         logType = getFilterLogicTypeCode(type);
         opr = combine;
         short fieldNum = tb->fieldNumByName(name);
-        if ((logType!=255) && (fieldNum != -1))
+        if ((logType != 255) && (fieldNum != -1))
         {
             bool ret = true;
             fielddef* fd = &tb->tableDef()->fieldDefs[fieldNum];
             setFieldParam(fd);
-            unsigned char* tmp = new unsigned char[len];
-
-            //backup
-            memcpy(tmp, tb->fieldPtr(fieldNum), len);
 
             if (compField)
-                ret = setCompFiled(tb, fieldNum, value);// value is field name
+                ret = setCompFiled(tb, fieldNum, value); // value is field name
             else
             {
-                tb->setFV(fieldNum, value);
-                bool part = isPart(tb, fieldNum);
+                fields fds(*tb);
+                field fd = fds[fieldNum];
+                fd = value;
+                bool part = fd.isCompPartAndMakeValue();
                 copyToBuffer(tb, fieldNum, part);
             }
-            //restore
-            memcpy(tb->fieldPtr(fieldNum),tmp, len);
-            delete [] tmp;
             return ret;
         }
         return false;
     }
 
-    //setParam from keyValue
-    bool setParam(void* keyValue, ushort_td keylen)
-    {
-        logType = 1;// '=' type
-        opr = eCor;
-        len = keylen;
-        type = ft_string;// this value is ignored.
-        pos = 0;
-        allocBuffer(len);
-        memcpy(data, keyValue, len);
-        return true;
-    }
-
-    unsigned char* writeBuffer(unsigned char* p, bool estimate, bool end)
+    unsigned char* writeBuffer(unsigned char* p, bool estimate, bool end) const
     {
         int n = sizeof(logic) - sizeof(unsigned char*);
         if (!estimate)
         {
             memcpy(p, this, n);
             if (end)
-                *(p+n-1) = eCend;
+                *(p + n - 1) = eCend;
         }
         p += n;
 
         n = getDatalen();
-        if (!estimate) memcpy(p, data, n);
+        if (!estimate)
+            memcpy(p, data, n);
         return p + n;
     }
 
@@ -286,16 +283,11 @@ public:
         bool flag = true;
         if (after)
             flag = (opr == 1);
-        return (flag
-                && (logType == 1)
-                && (type != ft_zstring)
-                && !verType(type));
+        return (flag && (logType == 1) && (type != ft_zstring) &&
+                !verType(type));
     }
 
-    bool isNextFiled(logic* src)
-    {
-        return ((pos + len) ==  src->pos);
-    }
+    bool isNextFiled(logic* src) { return ((pos + len) == src->pos); }
 
     void joinAfter(logic* src)
     {
@@ -306,92 +298,155 @@ public:
         memcpy(data, tmp, len);
         memcpy(data + len, src->data, src->len);
         len += src->len;
-        type = ft_string; //compare by memcmp
+        type = ft_string; // compare by memcmp
         opr = src->opr;
-        delete [] tmp;
+        delete[] tmp;
     }
 };
 
 struct header
 {
-	unsigned short	len;
-	char			type[2];
-	unsigned short	rejectCount;
-	unsigned short	logicalCount;
-    header(){reset();};
+private:
+    union
+    {
+        struct
+        {
+            unsigned short len;
+            char type[2];
+        };
+        struct
+        {
+            int ilen : 28;
+            int itype : 4;
+        };
+    };
+
+public:
+    unsigned short rejectCount;
+    unsigned short logicalCount;
+    header() : len(0), rejectCount(1), logicalCount(0)
+    {
+        type[0] = 0x00;
+        type[1] = 0x00;
+    }
+
     void reset()
     {
         rejectCount = 1;
         logicalCount = 0;
         len = 0;
-        setPositionType(true);
+        type[0] = 0x00;
+        type[1] = 0x00;
     }
 
-    void setPositionType(bool incCurrent)
+    void setPositionType(bool incCurrent, bool withBookmark, bool isTransactd)
     {
-        if (incCurrent)
+        if (isTransactd)
         {
-            type[0] = 'U';
-            type[1] = 'C';
+            itype = incCurrent ? FILTER_CURRENT_TYPE_INC
+                               : FILTER_CURRENT_TYPE_NOTINC;
+            if (!withBookmark)
+                itype |= FILTER_CURRENT_TYPE_NOBOOKMARK;
         }
         else
         {
-            type[0] = 'E';
-            type[1] = 'G';
+            if (incCurrent)
+            {
+                type[0] = 'U';
+                type[1] = 'C';
+            }
+            else
+            {
+                type[0] = 'E';
+                type[1] = 'G';
+            }
         }
     }
 
-    bool positionTypeNext() const
+    int bookmarkSize(bool isTransactd) const
+    {
+        if (isTransactd)
+            return (itype & FILTER_CURRENT_TYPE_NOBOOKMARK) ? 0 : BOOKMARK_SIZE;
+        assert(type[0]);
+        // if (type[1] == 'N') return 0;
+        return BOOKMARK_SIZE;
+    }
+
+    bool positionTypeNext(bool isTransactd) const
     {
+        if (isTransactd)
+            return !(itype & FILTER_CURRENT_TYPE_INC);
         return (type[0] == 'E');
     }
 
-    unsigned char* writeBuffer(unsigned char* p, bool estimate)
+    void setLen(int size, bool isTransactd)
+    {
+        if (isTransactd)
+            ilen = size;
+        else
+            len = size;
+    }
+
+    unsigned char* writeBuffer(unsigned char* p, bool estimate) const
     {
         int n = sizeof(header);
-        if (!estimate) memcpy(p, this, n);
+        if (!estimate)
+            memcpy(p, this, n);
         return p + n;
     }
 };
-#pragma option -a
-pragma_pop
+#pragma pack(pop)
+pragma_pop;
+
+class recordBackup
+{
+    char* m_buf;
+    table* m_tb;
 
+public:
+    recordBackup(table* tb) : m_tb(tb)
+    {
+        m_buf = new char[m_tb->buflen()];
+        memcpy(m_buf, m_tb->fieldPtr(0), m_tb->buflen());
+    }
 
+    ~recordBackup()
+    {
+        memcpy(m_tb->fieldPtr(0), m_buf, m_tb->buflen());
+        delete[] m_buf;
+    }
+};
 
 class filter
 {
-
     table* m_tb;
     header m_hd;
     resultDef m_ret;
     std::vector<resultField*> m_fields;
-    std::vector<logic*> m_logics;
+    std::vector<short> m_selectFieldIndexes;
+    std::vector<logic> m_logics;
+    std::vector<seek> m_seeks;
+    uchar_td* m_seeksDataBuffer;
+
     int m_extendBuflen;
-    std::_tstring m_str;
     bool m_ignoreFields;
     bool m_seeksMode;
     bool m_useOptimize;
+    bool m_withBookmark;
     size_t m_seeksWritedCount;
     size_t m_logicalLimitCount;
     table::eFindType m_direction;
-    std::vector<std::_tstring> m_keyValuesCache;
-
-    bool addWhere(const _TCHAR* name, const _TCHAR* type, const _TCHAR*  value, char combine, bool compField = false)
+    bool m_isTransactd;
+    bool m_hasManyJoin;
+    inline int maxDataBuffer()
     {
-        logic* l = new logic();
-        if (l->setParam(m_tb, name, type, value, combine, compField))
-        {
-            m_logics.push_back(l);
-            return true;
-        }
-        delete l;
-        return false;
+        return m_isTransactd ? TDAP_MAX_DATA_SIZE : BTRV_MAX_DATA_SIZE;
     }
 
     void addAllFields()
     {
         resultField* r = new resultField();
-        r->len = (ushort_td) m_tb->tableDef()->maxRecordLen;
+        r->len = (ushort_td)m_tb->tableDef()->maxRecordLen;
         r->pos = 0;
         m_fields.push_back(r);
     }
@@ -399,9 +454,11 @@ class filter
     bool addSelect(const _TCHAR* name)
     {
         resultField* r = new resultField();
-        if (r->setParam(m_tb, name))
+        int fieldNum = r->setParam(m_tb, name);
+        if (fieldNum != -1)
         {
             m_fields.push_back(r);
+            m_selectFieldIndexes.push_back(fieldNum);
             return true;
         }
         delete r;
@@ -410,7 +467,7 @@ class filter
 
     bool setSelect(const std::vector<std::_tstring>& selects)
     {
-        for (size_t i=0;i < selects.size();++i)
+        for (size_t i = 0; i < selects.size(); ++i)
         {
             if (!addSelect(selects[i].c_str()))
                 return false;
@@ -420,66 +477,117 @@ class filter
 
     bool setWhere(const std::vector<std::_tstring>& where)
     {
-        if (where.size() == 0) return true;
-        if (where.size() < 3) return false;
+        if (where.size() == 0)
+            return true;
+        if (where.size() < 3)
+            return false;
+        m_logics.resize(m_logics.size() + (where.size() + 1) / 4);
 
-        for (size_t i=0;i<where.size();i+=4)
+        int index = 0;
+        for (size_t i = 0; i < where.size(); i += 4)
         {
+            if (i + 2 >= where.size())
+                return false;
             char combine = eCend;
-            std::_tstring value = where[i+2];
-            bool compField = (value[0] == _T('['));
+            std::_tstring value = where[i + 2];
+            bool compField = (value.size() && (value[0] == _T('[')));
             if (compField)
             {
                 value.erase(value.begin());
                 value.erase(value.end() - 1);
             }
-            if (i+3 < where.size())
+            if (i + 3 < where.size())
             {
-                std::_tstring s = where[i+3];
+                std::_tstring s = where[i + 3];
                 boost::algorithm::to_lower(s);
-                if (s == _T("or")) combine = eCor;
+                if (s == _T("or"))
+                    combine = eCor;
                 else if (s == _T("and"))
                     combine = eCand;
                 else
                     return false;
             }
-            if (!addWhere(where[i].c_str(), where[i+1].c_str()
-                    , value.c_str(), combine, compField))
+            if (!m_logics[index++].setParam(m_tb, where[i].c_str(),
+                                            where[i + 1].c_str(), value.c_str(),
+                                            combine, compField))
                 return false;
         }
         return true;
+    }
 
+    inline void setSeekValue(short fieldNum, const std::_tstring& s)
+    {
+        m_tb->setFV(fieldNum, s.c_str());
     }
 
+    inline void setSeekValue(short fieldNum, const keyValuePtr& v)
+    {
+        if (v.type & KEYVALUE_STR)
+            m_tb->setFV(fieldNum, (_TCHAR*)v.ptr);
+        else
+        {
+            fielddef& fd = m_tb->tableDef()->fieldDefs[fieldNum];
+            void* p = m_tb->fieldPtr(fieldNum);
+
+            ushort_td len = std::min<ushort_td>(v.len, fd.len);
+            memset(p, 0, fd.len);
+            memcpy(p, v.ptr, len);
+        }
+    }
 
-    bool setSeeks(const std::vector<std::_tstring>& keyValues)
+    template <class vector_type>
+    bool setSeeks(const vector_type& keyValues, const queryBase* q)
     {
-        //Check key values
+        int keySize = q->getJoinKeySize();
+        // Check key values
         keydef* kd = &m_tb->tableDef()->keyDefs[m_tb->keyNum()];
-        if (keyValues.size() % kd->segmentCount)
+        int joinKeySize = kd->segmentCount;
+        if (keySize != 0)
+        {
+            // Check specify key size is smoller than kd->segmentCount or equal
+            if (kd->segmentCount < keySize)
+                return false;
+            joinKeySize = keySize;
+            m_withBookmark = m_hasManyJoin =
+                (kd->segmentCount != joinKeySize) || kd->segments[0].flags.bit0;
+
+            // Check when m_hasManyJoin need set joinHasOneOrHasMany
+            if (m_hasManyJoin &&
+                !(q->getOptimize() & queryBase::joinHasOneOrHasMany))
+                return false;
+        }
+
+        if (keyValues.size() % joinKeySize)
             return false;
-        //Check uniqe key
-        if (kd->segments[0].flags.bit0)
+        // Check uniqe key
+        if (kd->segments[0].flags.bit0 && !queryBase::joinHasOneOrHasMany)
             return false;
-
-        m_keyValuesCache = keyValues;
-        for (size_t i=0;i<keyValues.size();i+= kd->segmentCount)
+        m_seeks.resize(keyValues.size() / joinKeySize);
+        int maxKeylen = 0;
+        for (int j = 0; j < joinKeySize; ++j)
+            maxKeylen +=
+                m_tb->tableDef()->fieldDefs[kd->segments[j].fieldNum].len + 2;
+
+        // alloc databuffer
+        if (m_seeksDataBuffer)
+            delete[] m_seeksDataBuffer;
+
+        m_seeksDataBuffer = new uchar_td[maxKeylen * m_seeks.size()];
+        memset(m_seeksDataBuffer, 0, maxKeylen * m_seeks.size());
+        uchar_td* dataBuf = m_seeksDataBuffer;
+
+        int index = 0;
+        for (size_t i = 0; i < keyValues.size(); i += joinKeySize)
         {
-            for (int j=0;j<kd->segmentCount;++j)
-                m_tb->setFV(kd->segments[j].fieldNum, keyValues[i+j].c_str());
-
-            logic* l = new logic();
-            ushort_td len = m_tb->writeKeyData();
-            if (l->setParam(m_tb->m_keybuf, len))
-                m_logics.push_back(l);
-            else
-            {
-                delete l;
+            for (int j = 0; j < joinKeySize; ++j)
+                setSeekValue(kd->segments[j].fieldNum, keyValues[i + j]);
+            seek* l = &m_seeks[index];
+            ushort_td len = m_tb->writeKeyDataTo(dataBuf, joinKeySize);
+            if (!l->setParam(dataBuf, len))
                 return false;
-            }
+            dataBuf += len;
+            ++index;
         }
-        if (m_logics.size())
-            m_logics[m_logics.size() -1]->opr = eCend;
         m_seeksMode = true;
         m_seeksWritedCount = 0;
         return true;
@@ -491,7 +599,10 @@ class filter
         setRejectCount(q->getReject());
         setMaxRows(q->getLimit());
         m_direction = q->getDirection();
-        m_useOptimize = q->isOptimize();
+        m_useOptimize = ((q->getOptimize() & queryBase::combineCondition) ==
+                         queryBase::combineCondition);
+        m_withBookmark = q->isBookmarkAlso();
+        recordBackup recb(m_tb);
 
         if (q->isAll())
             addAllFields();
@@ -502,53 +613,57 @@ class filter
             else if (!setSelect(q->getSelects()))
                 return false;
 
-            //seeks or where
+            // seeks or where
             if (q->getSeekKeyValues().size() && q->getWheres().size())
                 return false;
 
             if (q->getSeekKeyValues().size())
-                return setSeeks(q->getSeekKeyValues());
+                return setSeeks(q->getSeekKeyValues(), q);
+            else if (q->getSeekValuesPtr().size())
+                return setSeeks(q->getSeekValuesPtr(), q);
             else if (q->getWheres().size())
                 return setWhere(q->getWheres());
         }
         return true;
     }
 
-    ushort_td resultRowSize(bool ignoreFields)
+    int resultRowSize(bool ignoreFields) const
     {
 
-        ushort_td recordLen = BOOKMARK_SIZE + DATASIZE_BYTE;
+        int recordLen = m_hd.bookmarkSize(m_isTransactd) + DATASIZE_BYTE;
         if (!ignoreFields)
         {
-            for (size_t i=0;i< m_fields.size();++i)
+            for (size_t i = 0; i < m_fields.size(); ++i)
                 recordLen += m_fields[i]->len;
         }
         return recordLen;
     }
 
-    ushort_td calcMaxRows()
+    int calcMaxRows()
     {
-        return (ushort_td)(MAX_DATA_SIZE / resultRowSize(m_ignoreFields));
+        return maxDataBuffer() / resultRowSize(m_ignoreFields);
     }
 
-    ushort_td resultBufferNeedSize()
+    int resultBufferNeedSize()
     {
         return (m_ret.maxRows * resultRowSize(m_ignoreFields)) + DATASIZE_BYTE;
     }
 
     void joinLogic()
     {
-        if (m_seeksMode || !m_useOptimize) return;
+        if (m_seeksMode || !m_useOptimize)
+            return;
 
-        for (int i= (int)m_logics.size()-2;i>=0;--i)
+        for (int i = (int)m_logics.size() - 2; i >= 0; --i)
         {
-            logic* la = m_logics[i+1];
-            logic* lb = m_logics[i];
-            if (la->canJoin(false) && lb->canJoin(true) && lb->isNextFiled(la))
+
+            logic& la = m_logics[i + 1];
+            logic& lb = m_logics[i];
+            if (la.canJoin(false) && lb.canJoin(true) && lb.isNextFiled(&la))
             {
-                lb->joinAfter(la);
-                delete la;
-                m_logics.erase(m_logics.begin()+i+1);
+                lb.joinAfter(&la);
+                // delete la;
+                m_logics.erase(m_logics.begin() + i + 1);
             }
         }
     }
@@ -558,7 +673,7 @@ class filter
         unsigned char* p = (unsigned char*)m_tb->dataBak();
         unsigned char* start = p;
 
- 	    m_hd.logicalCount = (ushort_td)m_logicalLimitCount;
+        m_hd.logicalCount = (ushort_td)m_logicalLimitCount;
         if (m_ignoreFields)
             m_ret.fieldCount = 0;
         else
@@ -568,45 +683,62 @@ class filter
         if (m_seeksMode)
         {
             first = m_seeksWritedCount;
-            last = std::min<size_t>(calcMaxRows() + m_seeksWritedCount, m_logicalLimitCount);
+            last = std::min<size_t>(calcMaxRows() + m_seeksWritedCount,
+                                    m_logicalLimitCount);
             m_hd.rejectCount = 0;
-            m_ret.maxRows = m_hd.logicalCount = (ushort_td)(last - first);
+            if (m_hasManyJoin)
+                m_ret.maxRows = 0;
+            else
+                m_ret.maxRows = m_hd.logicalCount = (ushort_td)(last - first);
         }
         if (m_ret.maxRows == 0)
-            m_ret.maxRows = calcMaxRows();
+            m_ret.maxRows =
+                (unsigned short)std::min<int>(calcMaxRows(), USHRT_MAX);
 
-        p =  m_hd.writeBuffer(p, estimate);
-        for (size_t i=first;i< last;++i)
-            p = m_logics[i]->writeBuffer(p, estimate, (i==(last-1)));
-        if (m_seeksMode && !estimate)
-            m_seeksWritedCount += m_hd.logicalCount;
+        p = m_hd.writeBuffer(p, estimate);
+        if (m_seeksMode)
+        {
+            for (size_t i = first; i < last; ++i)
+                p = m_seeks[i].writeBuffer(p, estimate, (i == (last - 1)),
+                                           true);
+            if (!estimate)
+                m_seeksWritedCount += m_hd.logicalCount;
+        }
+        else
+        {
+            for (size_t i = first; i < last; ++i)
+                p = m_logics[i].writeBuffer(p, estimate, (i == (last - 1)));
+        }
 
-        p =  m_ret.writeBuffer(p, estimate);
+        p = m_ret.writeBuffer(p, estimate);
 
         if (!m_ignoreFields)
         {
-            for (size_t i=0;i< m_fields.size();++i)
+            for (size_t i = 0; i < m_fields.size(); ++i)
                 p = m_fields[i]->writeBuffer(p, estimate);
         }
 
-        //write total length
+        // write total length
         int len = (int)(p - start);
-        unsigned short* s = (unsigned short*)start;
         if (!estimate)
-            *s = len;
+        {
+            m_hd.setLen(len, m_isTransactd);
+            m_hd.writeBuffer(start, false);
+        }
         return len;
     }
 
+    // use seeksMode only
     int calcLogicalCutsize(int oversize)
     {
         int cutsize = 0;
-        for (size_t i=m_hd.logicalCount-1;i!=0;--i)
+        for (size_t i = m_hd.logicalCount - 1; i != 0; --i)
         {
-            cutsize += (int)m_logics[i+m_seeksWritedCount]->getLength();
+            cutsize += (int)m_seeks[i + m_seeksWritedCount].getLength();
             if (oversize - cutsize < 0)
             {
                 m_logicalLimitCount = i;
-                return  cutsize;
+                return cutsize;
             }
         }
         return 0;
@@ -615,62 +747,70 @@ class filter
     bool allocDataBuffer()
     {
         joinLogic();
-        m_logicalLimitCount = m_logics.size();
+        m_logicalLimitCount = m_seeksMode ? m_seeks.size() : m_logics.size();
         int len = doWriteBuffer(true);
-        if (len > (int)MAX_DATA_SIZE)
+        if (len > maxDataBuffer())
         {
             if (m_seeksMode)
-                len -= calcLogicalCutsize(len - MAX_DATA_SIZE + 1);
+                len -= calcLogicalCutsize(len - maxDataBuffer() + 1);
             else
                 return false;
         }
-        m_hd.len = len;
-        int resultLen = resultBufferNeedSize();
-        if (resultLen > MAX_DATA_SIZE)
+        // m_hd.len = len;//lost 2byte data at transactd
+        int resultLen = (int)resultBufferNeedSize();
+        if (resultLen > maxDataBuffer())
         {
+            /* change the max rows fit to a max buffer size */
             m_ret.maxRows = calcMaxRows();
             resultLen = resultBufferNeedSize();
         }
-        m_extendBuflen = std::max<int>((int)m_hd.len, resultLen);
-        m_extendBuflen = std::max<int>(m_extendBuflen, m_tb->tableDef()->maxRecordLen);
-        if ((m_fields.size() != 1) || m_tb->valiableFormatType())
+
+        m_extendBuflen = std::max<int>((int)len, resultLen);
+        m_extendBuflen =
+            std::max<int>(m_extendBuflen, m_tb->tableDef()->maxRecordLen);
+        if (fieldSelected() || m_tb->valiableFormatType())
             m_extendBuflen += m_tb->buflen();
 
         if ((int)m_tb->buflen() < m_extendBuflen)
         {
-            m_tb->setDataBak((void*) realloc(m_tb->dataBak(), m_extendBuflen));
+            m_tb->setDataBak((void*)realloc(m_tb->dataBak(), m_extendBuflen));
             m_tb->setData(m_tb->dataBak());
         }
         return true;
     }
 
 public:
-    filter(table* tb):m_tb(tb),m_ignoreFields(false)
-        ,m_seeksMode(false),m_seeksWritedCount(0),m_useOptimize(true){}
-    ~filter()
+    filter(table* tb)
+        : m_tb(tb), m_seeksDataBuffer(NULL), m_ignoreFields(false),
+          m_seeksMode(false), m_useOptimize(true), m_withBookmark(true),
+          m_seeksWritedCount(0), m_hasManyJoin(false)
     {
-        cleanup();
+        m_isTransactd = m_tb->isUseTransactd();
     }
 
+    ~filter() { cleanup(); }
+
     void cleanup()
     {
-        for (size_t i=0;i < m_logics.size();++i)
-            delete m_logics[i];
-        for (size_t i=0;i < m_fields.size();++i)
+        for (size_t i = 0; i < m_fields.size(); ++i)
             delete m_fields[i];
-        m_logics.erase(m_logics.begin(), m_logics.end());
-        m_fields.erase(m_fields.begin(), m_fields.end());
+        m_selectFieldIndexes.clear();
+        m_fields.clear();
+        m_logics.clear();
+        m_seeks.clear();
         m_hd.reset();
         m_ret.reset();
         m_ignoreFields = false;
         m_seeksMode = false;
         m_seeksWritedCount = 0;
         m_useOptimize = true;
+        delete[] m_seeksDataBuffer;
+        m_seeksDataBuffer = NULL;
+        m_hasManyJoin = false;
     }
 
     bool setQuery(const queryBase* q)
     {
-        m_str = q->toString();
         bool ret = doSetFilter(q);
         if (!ret)
             cleanup();
@@ -679,39 +819,47 @@ public:
 
     bool isWriteComleted() const
     {
-        if (!m_seeksMode) return true;
-        return (m_seeksWritedCount == m_logics.size());
+        if (!m_seeksMode)
+            return true;
+        return (m_seeksWritedCount == m_seeks.size());
     }
-    void resetSeeksWrited(){m_seeksWritedCount = 0;}
 
-    void setPositionType(bool incCurrent){m_hd.setPositionType(incCurrent);}
+    inline bool hasManyJoin() const { return m_hasManyJoin; }
 
-    bool positionTypeNext() const{return m_hd.positionTypeNext();}
+    inline void resetSeeksWrited() { m_seeksWritedCount = 0; }
+
+    void setPositionType(bool incCurrent)
+    {
+        m_hd.setPositionType(incCurrent, m_withBookmark, m_isTransactd);
+    }
+
+    bool positionTypeNext() const
+    {
+        return m_hd.positionTypeNext(m_isTransactd);
+    }
 
-    void setRejectCount(ushort_td v){m_hd.rejectCount = v;}
-    ushort_td rejectCount()const {return m_hd.rejectCount;}
+    void setRejectCount(ushort_td v) { m_hd.rejectCount = v; }
+    ushort_td rejectCount() const { return m_hd.rejectCount; }
 
-    void setMaxRows(ushort_td v){m_ret.maxRows = v;}
-    ushort_td maxRows()const {return m_ret.maxRows;}
+    void setMaxRows(ushort_td v) { m_ret.maxRows = v; }
+    ushort_td maxRows() const { return m_ret.maxRows; }
 
-    ushort_td recordCount()const {return maxRows();}
+    ushort_td recordCount() const { return maxRows(); }
 
-    void setPosTypeNext(bool v){setPositionType(!v);}
+    void setPosTypeNext(bool v) { setPositionType(!v); }
 
     uint_td exDataBufLen() const
     {
-        if ((m_fields.size() != 1) || m_tb->valiableFormatType())
+        if (fieldSelected() || m_tb->valiableFormatType())
             return m_extendBuflen - m_tb->buflen();
         return m_extendBuflen;
     }
 
     void init(table* pBao){};
 
-    const _TCHAR* filterStr(){return m_str.c_str();}
-
-    ushort_td fieldCount() const {return m_ret.fieldCount;}
+    ushort_td fieldCount() const { return m_ret.fieldCount; }
 
-    void setFieldCount(ushort_td v){m_ret.fieldCount = v;}
+    void setFieldCount(ushort_td v) { m_ret.fieldCount = v; }
 
     ushort_td fieldLen(int index) const
     {
@@ -719,6 +867,20 @@ public:
         return m_fields[index]->len;
     }
 
+    ushort_td totalFieldLen() const
+    {
+        return resultRowSize(false) - m_hd.bookmarkSize(m_isTransactd) -
+               DATASIZE_BYTE;
+    }
+
+    ushort_td totalSelectFieldLen() const
+    {
+        ushort_td recordLen = 0;
+        for (size_t i = 0; i < m_fields.size(); ++i)
+            recordLen += m_fields[i]->len;
+        return recordLen;
+    }
+
     ushort_td fieldOffset(int index) const
     {
         assert(index < (int)m_fields.size());
@@ -732,35 +894,37 @@ public:
         return false;
     }
 
-    ushort_td extendBuflen() const{return m_extendBuflen;}
+    ushort_td extendBuflen() const { return m_extendBuflen; }
 
     bool fieldSelected() const
     {
-        return !((m_fields.size() == 1) && (m_fields[0]->pos == 0));
+        return !((m_fields.size() == 1) && (m_fields[0]->pos == 0) &&
+                 (m_fields[0]->len ==
+                  (ushort_td)m_tb->tableDef()->maxRecordLen));
     }
 
-    bool ignoreFields() const {return m_ignoreFields;}
+    bool ignoreFields() const { return m_ignoreFields; }
+
+    int bookmarkSize() const { return m_hd.bookmarkSize(m_isTransactd); }
 
     /* The Ignore fields option don't use with multi seek operation.
        because if a server are not found a record then a server return
        error code in a bookmark field.
     */
-    void setIgnoreFields(bool v){m_ignoreFields = v;}
-    bool isSeeksMode()const {return m_seeksMode;}
-    table::eFindType direction() const{return m_direction;}
-    void setDirection(table::eFindType v) {m_direction = v;}
-    const std::vector<std::_tstring>& keyValuesCache(){return m_keyValuesCache;};
-
-
+    void setIgnoreFields(bool v) { m_ignoreFields = v; }
+    bool isSeeksMode() const { return m_seeksMode; }
+    table::eFindType direction() const { return m_direction; }
+    void setDirection(table::eFindType v) { m_direction = v; }
+    const std::vector<short>& selectFieldIndexes()
+    {
+        return m_selectFieldIndexes;
+    }
+    const std::vector<seek>& seeks() const { return m_seeks; }
 };
 
-
-
-
-
-}// namespace client
-}// namespace tdap
-}// namespace protocol
-}// namespace db
-}// namespace bzs
-#endif//BZS_DB_PROTOCOL_TDAP_CLIENT_FILTER_H
+} // namespace client
+} // namespace tdap
+} // namespace protocol
+} // namespace db
+} // namespace bzs
+#endif // BZS_DB_PROTOCOL_TDAP_CLIENT_FILTER_H