transactd 1.1.2 → 1.2.0

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

@@ -521,7 +521,7 @@ ushort_td nstable::doCommitBulkInsert(bool autoCommit)
     return count;
 }
 
-void nstable::abortBulkInsert()
+void nstable::doAbortBulkInsert()
 {
     delete m_impl->bulkIns;
     m_impl->bulkIns = NULL;
@@ -684,7 +684,7 @@ void nstable::stats(void* dataBuf, uint_td len, bool estimate)
     m_keynum = svm_keynum;
 }
 
-uint_td nstable::doRecordCount(bool estimate, bool fromCurrent)
+uint_td nstable::doRecordCount(bool estimate, bool fromCurrent, eFindType /*direction*/)
 {
     fileSpec *fs;
     uint_td Count;
@@ -791,7 +791,7 @@ short_td nstable::tdapErr(HWND hWnd, short_td status, const _TCHAR* TableName, _
 
 #pragma warning(disable:4996)
     if (retbuf)
-        _stprintf(retbuf, _T("table_name:%s %s"), TableName, buf);
+        _stprintf(retbuf, _T("table_name:%s \n%s"), TableName, buf);
 #pragma warning(default:4996)
 
     if ((int)hWnd <= 0) return errorCode;
@@ -815,6 +815,16 @@ void nstable::throwError(const _TCHAR* caption, short statusCode)
     THROW_BZS_ERROR_WITH_CODEMSG(statusCode, tmp2);
 }
 
+void nstable::throwError(const _TCHAR* caption, nstable* tb)
+{
+    _TCHAR tmp[1024]={0x00};
+    nstable::tdapErr(0x00, tb->stat(), tb->uri(), tmp);
+    _TCHAR tmp2[1024]={0x00};
+    _stprintf_s(tmp2, 1024, _T("[%s]\n%s\n"),caption, tmp);
+    THROW_BZS_ERROR_WITH_CODEMSG(tb->stat(), tmp2);
+
+}
+
 _TCHAR* nstable::getDirURI(const _TCHAR* path, _TCHAR* buf)
 {
     bool uri = false;

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

@@ -46,9 +46,12 @@ class bulkInsert;
 class AGRPACK nstable
 {
 	friend class nsdatabase; // for destroy()
+    friend class filter;
 public:
     enum eUpdateType{changeCurrentCc,changeCurrentNcc,changeInKey};
+    enum eFindType{findForword, findBackForword};
     static const bool inkey = true;
+
 private:
     struct nstimpl* m_impl;
 
@@ -61,7 +64,6 @@ private:
 
 protected:
 
-
     ushort_td m_op;
     void* m_pdata;
     uint_td m_buflen;
@@ -105,20 +107,22 @@ protected:
     virtual void doOpen(const _TCHAR* name, char_td mode, const _TCHAR* ownername);
     virtual void doClose();
     virtual void doCreateIndex(bool specifyKeyNum);
-    virtual uint_td doRecordCount(bool estimate, bool fromCurrent);
+    virtual uint_td doRecordCount(bool estimate, bool fromCurrent, eFindType direction);
     virtual short_td doBtrvErr(HWND hWnd, _TCHAR* retbuf);
     virtual ushort_td doCommitBulkInsert(bool autoCommit);
+    virtual void doAbortBulkInsert();
     inline void open(const _TCHAR* uri, char_td mode = 0, const _TCHAR* ownerName = NULL) {
         doOpen(uri, mode, ownerName);}
 
-	/* 	   
+	/*
 		This method is ignore refarence count of nstable and force delete.
 		Use in nsdatabase::reset()	
 	*/
 	void destroy();
 	void setShared();
-	
+
 public:
+
     explicit nstable(nsdatabase *pbe);
 	void addref(void);
 	void release();
@@ -148,11 +152,12 @@ public:
     inline ushort_td insert(bool ncc = false) {return doInsert(ncc);};
     inline void createIndex(bool specifyKeyNum = false) {doCreateIndex(specifyKeyNum);}
     void dropIndex(bool norenumber = false);
-    inline uint_td recordCount(bool estimate = true, bool fromCurrent = false) {return doRecordCount(estimate, fromCurrent);}
+    inline uint_td recordCount(bool estimate = true, bool fromCurrent = false, eFindType direction = findForword)
+    {return doRecordCount(estimate, fromCurrent, direction);}
     inline short_td tdapErr(HWND hWnd, _TCHAR* retbuf = NULL) {return doBtrvErr(hWnd, retbuf);}
     
     void beginBulkInsert(int maxBuflen);
-    void abortBulkInsert();
+    void abortBulkInsert(){doAbortBulkInsert();}
     inline ushort_td commitBulkInsert(bool autoCommit = false) {
         return doCommitBulkInsert(autoCommit);}
     void tdap(ushort_td op);
@@ -183,6 +188,7 @@ public:
     static short_td tdapErr(HWND hWnd, short_td status, const _TCHAR* tableName = NULL,
         _TCHAR* retbuf = NULL);
 	static void throwError(const _TCHAR* caption, short statusCode);
+    static void throwError(const _TCHAR* caption, nstable* tb);
     static _TCHAR* getDirURI(const _TCHAR* uri, _TCHAR* retbuf);
     static bool existsFile(const _TCHAR* filename);
 	static bool test(nstable* p);

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

@@ -96,6 +96,7 @@ const char* getFieldTypeName(uchar_td fieldType, int size, bool nobinary,
 		if (size==4)return "INT";
 		if (size==8)return "BIGINT";
 	case ft_uinteger:
+    case ft_autoIncUnsigned:
 		if (size==1)return "TINYINT UNSIGNED";
 		if (size==2)return "SMALLINT UNSIGNED";
 		if (size==4)return "INT UNSIGNED";
@@ -257,7 +258,7 @@ std::string getFiledList(tabledef* table, std::vector<std::string>& fdl)
 			s += " NULL";
 		else
 			s += " NOT NULL";
-		if (fd.type == ft_autoinc)
+		if ((fd.type == ft_autoinc)||(fd.type == ft_autoIncUnsigned))
 			s +=	" AUTO_INCREMENT";
 		s += ",";
 	}

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

@@ -586,6 +586,7 @@ char* blobStore(char* ptr, const T* data, fielddef& fd, stringConverter* cv)
             maxlen = std::min<size_t>(maxlen, len + 1);
             p = new char[maxlen];
             memcpy_t(p, data, len);
+            p[len] = 0x00;
         }
     }
     memset(ptr, 0, fd.len);