transactd 3.6.1 → 3.7.0

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

@@ -65,7 +65,10 @@ class dumpRecordset
         {
             row& rec = rs[i];
             for (size_t col = 0; col < fds.size(); ++col)
-                m_widths[col] = std::max(_tcslen(rec[(short)col].c_str()), m_widths[col]);
+            {
+                if (!rec[(short)col].isNull())
+                    m_widths[col] = std::max(_tcslen(rec[(short)col].c_str()), m_widths[col]);
+            }
         }
     }
 
@@ -199,12 +202,6 @@ class recordsetImple
     /* for registerMemoryBlock temp data */
     size_t m_joinRows;
 
-    /*
-            for optimazing join.
-            If the first reading is using by unique key , set that field count.
-    */
-    short m_uniqueReadMaxField;
-
 public:
     typedef std::vector<row_ptr>::iterator iterator;
     typedef row_ptr item_type;
@@ -226,7 +223,7 @@ private:
         am->setParams(ptr, size, 0, true);
         m_memblock.push_back(boost::shared_ptr<autoMemory>(am, boost::bind(&autoMemory::release, _1)));
         unsigned char* p = am->ptr;
-        // copy fileds
+        // copy fields
         if (addtype & mra_nextrows)
         {
             if (addtype == mra_nextrows)
@@ -241,13 +238,6 @@ private:
             m_mra->setCurFirstField((int)m_fds->size());
             if (tb)
                 m_fds->addSelectedFields(tb);
-            if (tb && (addtype == mra_nojoin))
-            {
-                const keydef& kd = tb->tableDef()->keyDefs[(int)tb->keyNum()];
-                m_uniqueReadMaxField = (kd.segments[0].flags.bit0 == false)
-                                           ? (short)m_fds->size()
-                                           : 0;
-            }
         }
 
         *(am->endFieldIndex) = (short)m_fds->size();
@@ -262,8 +252,7 @@ private:
             if (jmap)
             {
                 // At Join that if some base records reference to a joined
-                // record
-                //      that the joined record pointer is shared by some
+                // record that the joined record pointer is shared by some
                 // base records.
                 for (int i = 0; i < (int)rows; ++i)
                 {
@@ -322,6 +311,16 @@ private:
         return -1;
     }
 
+    inline size_t getIndexOfEndPtr(short* p, int memBlockIndex) const
+    {
+        const boost::shared_ptr<autoMemory>& am = m_memblock[memBlockIndex];
+        if ((p >= am->endFieldIndex) && (p < am->endFieldIndex + JOINLIMIT_PER_RECORD))
+            return p - am->endFieldIndex;
+
+        assert(0);
+        return -1;
+    }
+
     // Duplicate row for hasManyJoin
     void duplicateRow(int row, int count)
     {
@@ -336,18 +335,73 @@ private:
         }
     }
 
+    void assignJoinFields(const recordsetImple& r, std::vector<int>& indexes)
+    {
+        int fieldCount = (int)m_fds->size();
+        m_fds->append(r.m_fds.get());
+        
+        // append memblock
+        std::vector<short*> endIndex;
+        for (size_t i = 0;i < r.m_memblock.size(); ++i)
+        {
+            m_memblock.push_back(r.m_memblock[i]);
+            short* ei = r.m_memblock[i]->appendEndFieldIndex(*r.m_memblock[i]->endFieldIndex + fieldCount);
+            endIndex.push_back(ei);
+        }
+
+        if (r.size() == 0) return;
+
+        //counting (row * memblock)
+        int rblockSize = (int)dynamic_cast<memoryRecord*>(r.m_recordset[0])->memBlockSize();
+        int amsize = (int)(rblockSize * indexes.size());
+        
+        autoMemory* amar = autoMemory::create(amsize);
+        amsize = 0;
+        autoMemory* nullRecordAm = 0;
+        for (int i = 0; i < (int)m_recordset.size(); ++i)
+        {
+            memoryRecord* row = dynamic_cast<memoryRecord*>(m_recordset[i]);
+            for (int j = 0; j < (int)rblockSize; ++j)
+            {
+                autoMemory* mb = amar + amsize;
+                if (indexes[i] != -1)
+                {
+                    memoryRecord* srow = dynamic_cast<memoryRecord*>(r.m_recordset[indexes[i]]);
+                    assert(srow->memBlockSize() == rblockSize);
+                    const autoMemory& smb = srow->memBlock(j);
+                    int index = r.getMemBlockIndex(smb.ptr);
+                    row->setRecordData(mb, smb.ptr, 0, endIndex[index], false);
+                }else
+                {
+                    // Alloc data buffer for not found record.
+                    if (nullRecordAm == NULL)
+                    {
+                        nullRecordAm = autoMemory::create();
+                        nullRecordAm->addref();
+                        short endIndex = (short)m_fds->size();
+                        nullRecordAm->setParams(0, r.m_fds->totalFieldLen(), &endIndex, true);
+                        m_memblock.push_back(boost::shared_ptr<autoMemory>(nullRecordAm, boost::bind(&autoMemory::release, _1)));
+                    }                    
+                    row->setRecordData(mb, nullRecordAm->ptr, 0, nullRecordAm->endFieldIndex, false);
+                    // Specify fieldnum
+                    row->setInvalidMemblockLast();
+                }
+                ++amsize;
+            }
+        }
+    }
+
 public:
     inline recordsetImple()
         : m_fds(fielddefs::create(), boost::bind(&fielddefs::release, _1)),
-          m_joinRows(0), m_uniqueReadMaxField(0)
+          m_joinRows(0)
     {
         m_mra.reset(new multiRecordAlocatorImple(this));
     }
 
     inline recordsetImple(const recordsetImple& r)
         : m_fds(r.m_fds),m_mra(r.m_mra), m_recordset(r.m_recordset),
-          m_memblock(r.m_memblock), m_joinRows(r.m_joinRows),
-          m_uniqueReadMaxField(r.m_uniqueReadMaxField)
+          m_memblock(r.m_memblock), m_joinRows(r.m_joinRows)
     {
         for (size_t i = 0; i < m_recordset.size(); ++i)
             m_recordset[i]->addref();
@@ -370,7 +424,6 @@ public:
             m_recordset = r.m_recordset;
             m_memblock = r.m_memblock;
             m_joinRows = r.m_joinRows;
-            m_uniqueReadMaxField = r.m_uniqueReadMaxField;
             for (size_t i = 0; i < m_recordset.size(); ++i)
                 m_recordset[i]->addref();
         }
@@ -384,7 +437,6 @@ public:
     {
         recordsetImple* p = new recordsetImple();
         p->m_joinRows = m_joinRows;
-        p->m_uniqueReadMaxField = m_uniqueReadMaxField;
         p->m_fds.reset(m_fds->clone(), boost::bind(&fielddefs::release, _1));
 
         std::vector<size_t> offsets;
@@ -396,7 +448,7 @@ public:
                 autoMemory* am = ama + i;
                 am->addref();
                 am->setParams(m_memblock[i]->ptr, m_memblock[i]->size, 0, true);
-                *am->endFieldIndex = *m_memblock[i]->endFieldIndex;
+                am->assignEndFieldIndex(m_memblock[i]->endFieldIndex);
                 p->m_memblock.push_back(boost::shared_ptr<autoMemory>(am,  boost::bind(&autoMemory::release, _1)));
                 offsets.push_back((am->ptr - m_memblock[i]->ptr));
             }
@@ -443,8 +495,10 @@ public:
 #pragma warn .8072
                     autoMemory* a = amar + amindex;
                     const boost::shared_ptr<autoMemory>& am = p->m_memblock[index];
-                    // isInvalidRecord will be reset.
                     mr->setRecordData(a, ptr, mb.size, am->endFieldIndex, mb.owner);
+                    // set  endFieldIndex
+                    size_t offset = getIndexOfEndPtr(mb.endFieldIndex, index);
+                    a->endFieldIndex += offset;
                     ++amindex;
                 }
 
@@ -456,8 +510,6 @@ public:
         return p;
     }
 
-    inline short uniqueReadMaxField() const { return m_uniqueReadMaxField; }
-
     inline void clearRecords()
     {
         if (m_recordset.size())
@@ -468,9 +520,8 @@ public:
                     m_recordset[i]->release();
             }
         } 
-        
+
         m_recordset.clear();
-        m_uniqueReadMaxField = 0;
     }
 
     inline const fielddefs* fieldDefs() const { return m_fds.get(); }
@@ -654,8 +705,6 @@ public:
 
     inline void appendField(const _TCHAR* name, int type, short len, uchar_td decimals=0)
     {
-        assert(m_fds->size());
-        
         fielddef fd;
         memset(&fd, 0, sizeof(fielddef));
         fd.len = len;
@@ -664,6 +713,13 @@ public:
         fd.decimals = decimals;
         fd.setName(name);
         fd.setCharsetIndex((*m_fds)[0].charsetIndex());
+        appendField(fd);
+    }
+
+    inline void appendField(const fielddef& fd)
+    {
+        assert(m_fds->size());
+        
         if (blobLenBytes(fd))
             THROW_BZS_ERROR_WITH_MSG(_T("Can not append Blob or Text field."));
         m_fds->push_back(&fd);
@@ -697,6 +753,51 @@ public:
         m_recordset.reserve(size);
     }
 
+    void nestedLoopJoin(const recordsetImple& r, recordsetQuery& q, bool inner)
+    {
+        
+        std::vector<int> indexes;
+        size_t i = 0;
+        indexes.reserve(size() * 3);
+        q.init(m_fds.get(), r.m_fds.get());
+        while (i < size())
+        {
+            size_t j = 0;
+            size_t found = 0;
+            q.setJoinRow(m_recordset[i]);
+            while (j < r.size())
+            {
+                if (q.matchJoin(r.m_recordset[j]))
+                {
+                    indexes.push_back((int)j);
+                    ++found;
+                }
+                if(q.matchStatus() == JOIN_NO_MORERECORD)
+                    break;
+                ++j;
+            }
+            if (found == 0)
+            {
+                if (inner) 
+                    erase(i);
+                else
+                {
+                    indexes.push_back(-1);
+                    ++i;
+                }
+            }
+            else if (found == 1)
+                ++i;
+            else
+            {
+                duplicateRow((int)i, (int)(found - 1));
+                i += found;
+            }
+        }
+        assert(m_recordset.size() == indexes.size());
+        assignJoinFields(r, indexes);
+    }
+
 #ifdef _DEBUG
     void dump()
     {

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

@@ -229,6 +229,13 @@ public:
         }
     }
 
+    inline int currentRow()
+    {
+        if (m_filter->hasManyJoin())
+            return *((int*)(m_ptr + DATASIZE_BYTE));
+        return m_row;
+    }
+
     inline char* moveCurrentData(char* ptr, unsigned short& len, int& sqnum)
     {
         len = *((unsigned short*)ptr);
@@ -1011,8 +1018,8 @@ void table::doFind(ushort_td op, bool notIncCurrent)
         m_stat = m_impl->rc->seekMultiStat();
 
         /*If seek multi error, set keyvalue for keyValueDescription*/
-        if (m_stat != 0)
-            setSeekValueField(row);
+        if (m_stat != 0 && m_impl->filterPtr->isSeeksMode())
+            setSeekValueField(m_impl->rc->currentRow());
 
         // m_datalen = m_impl->rc->len();
         m_datalen = tableDef()->recordlen();
@@ -2110,6 +2117,8 @@ bool table::setSeekValueField(int row)
     keydef* kd = &tableDef()->keyDefs[(int)keyNum()];
     if (keyValues.size() % kd->segmentCount)
         return false;
+    if (row >= keyValues.size())
+        return false;
     // Check uniqe key
     if (kd->segments[0].flags.bit0)
         return false;

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

@@ -446,6 +446,7 @@ public:
         {
             m_matched = true;
             // check  is this logic range of max ?
+            // (v == 0) it was max value of this node. 
             // if max then set judge node to next logic
             if ((m_fd->opr != 0) && m_judge && (v == 0) && m_next->m_judgeType)
                 m_next->m_judge = true;

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

@@ -669,8 +669,8 @@ struct handshale_t
  If you change this version then you need change The ($TargetName) project options too.
  */
 #define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "6"//##2 Build marker! Don't remove
-#define C_INTERFACE_VER_RELEASE "1"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "7"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
  The default extention of Mac is ".boudle", Therefore ".so" is popular. */
@@ -733,8 +733,8 @@ struct handshale_t
  */
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "6"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "1"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "7"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)
@@ -770,7 +770,7 @@ struct handshale_t
 
 
 #define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 6//##8 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 7//##8 Build marker! Don't remove
 #define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/test/tdclatl/test_v3.js

@@ -331,6 +331,7 @@ var FMT_RIGHT = 2;
 var MAGNIFICATION = 100;
 var resultCode = 0;
 var q;
+var gq;
 
 WScript.quit(main());
 /*--------------------------------------------------------------------------------*/
@@ -906,6 +907,25 @@ function tesAlias(db)
 	tb.close();
 }
 
+function testRecordsetJoin(atu, ate)
+{
+	initQuery();
+	q.where("id" , ">=", 1).and("id", "<=", 10).select("id", "name");
+	rs = atu.index(0).keyValue(1).read(q);
+	checkEqual(rs.size, 10, "RecordsetJoin 1");
+	q.reset().where("id" , ">=", 1).and("id", "<=", 5);
+	rse = ate.index(0).keyValue(1).read(q);
+	checkEqual(rse.size, 5, "RecordsetJoin 2");
+	var rq = createRecordsetQuery();
+	var rs1 = rs.clone();
+	rq.when("id", "=", "id");
+	rs1.join(rse, rq);
+	checkEqual(rs1.size, 5, "RecordsetJoin 3");
+	rs.outerjoin(rse, rq);
+	checkEqual(rs.size, 10, "RecordsetJoin 4");
+}
+
+
 /*--------------------------------------------------------------------------------*/
 function test(atu, ate, db)
 {
@@ -1218,6 +1238,8 @@ function test(atu, ate, db)
 	
 	//Alias
 	tesAlias(db);
+	
+	testRecordsetJoin(atu, ate);
 	//WScript.Echo(" -- End Test -- ");
 }
 /*--------------------------------------------------------------------------------*/

data/source/bzs/test/tdclphp/transactd_v3_Test.php

@@ -24,6 +24,7 @@ use BizStation\Transactd\Transactd;
 use BizStation\Transactd\PooledDbManager;
 use BizStation\Transactd\ConnectParams;
 use BizStation\Transactd\Tabledef;
+use BizStation\Transactd\Fielddef;
 use BizStation\Transactd\Database;
 use BizStation\Transactd\BtrVersions;
 use BizStation\Transactd\Nstable;
@@ -1429,4 +1430,38 @@ class TransactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tb->deleteByObject($usr, false/*inKey*/), false);
         $this->assertEquals($tb->deleteByObject($usr), true);  //default value true
     }
+    
+    public function testRecordsetJoin()
+    {
+        $db = new Database();
+        $db->open(URI, Transactd::TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL);
+        $this->assertEquals($db->stat(), 0);
+        $at = new ActiveTable($db, "user", Transactd::TD_OPEN_READONLY);
+        $ate = new ActiveTable($db, "extention", Transactd::TD_OPEN_READONLY);
+        $q = new Query;
+        $q->where('id','>=', 1)->and_('id','<=',10);
+        $rs = $at->index(0)->keyValue(1)->read($q);
+        $this->assertEquals($rs->size(), 10);
+        $q->reset()->where('id','>=', 1)->and_('id','<=',5);
+        $rse = $ate->index(0)->keyValue(1)->read($q);
+        $this->assertEquals($rse->size(), 5);
+        $rs1 = clone($rs);
+        $rq = new RecordsetQuery;
+        $rq->when('id', '=', 'id');
+        $rs1->join($rse, $rq);
+        $this->assertEquals($rs1->size(), 5);
+        $rs->outerJoin($rse, $rq);
+        $this->assertEquals($rs->size(), 10);
+        
+        // Recordset::appendField
+        $n = $rs->fieldDefs()->size();
+        $fd = new Fielddef;
+        $fd->type = Transactd::ft_integer;
+        $fd->len = 4;
+        $fd->name = 'abc';
+        $rs->appendField($fd);
+        $this->assertEquals($n + 1, $rs->fieldDefs()->size());
+        $rs->appendField($fd->name, $fd->type, $fd->len);
+        $this->assertEquals($n + 2, $rs->fieldDefs()->size());
+    }
 }

data/source/bzs/test/tdclrb/transactd_v3_spec.rb

@@ -2114,4 +2114,44 @@ describe Transactd, 'V3Features' do
     tb.close
     db.close
   end
+
+  it 'recordset join' do
+    db = Transactd::Database.new()
+    db.open(URL, Transactd::TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL)
+    at = Transactd::ActiveTable.new(db, "user")
+    ate = Transactd::ActiveTable.new(db, "extention")
+
+    q = Transactd::Query.new()
+    q.where("id", ">=", 1).and_("id", "<=", 10)
+    rs = at.index(0).keyValue(1).read(q)
+    expect(rs.size).to eq 10
+
+    q.reset().where("id", ">=", 1).and_("id", "<=", 5)
+    rse = ate.index(0).keyValue(1).read(q)
+    expect(rse.size).to eq 5
+    
+    rs1 = rs.clone();
+    rq = Transactd::RecordsetQuery.new()
+    rq.when('id', '=', 'id')
+    
+    #Join
+    rs1.join(rse, rq)
+    expect(rs1.size).to eq 5
+
+    #outerJoin
+    rs.outerJoin(rse, rq)
+    expect(rs.size).to eq 10
+    
+    #appendField
+    n = rs.fieldDefs().size
+    fd = Transactd::Fielddef.new()
+    fd.name = 'abc'
+    fd.len = 2
+    fd.type = Transactd::Ft_integer
+    rs.appendField(fd)
+    expect(rs.fieldDefs().size).to eq n+1
+    expect(rs.fieldDefs()[n].name).to eq 'abc'
+    db.close
+  end
+
 end