transactd 1.1.2 → 1.2.0

data/build/tdclc/tdclc_32.cbproj

@@ -27,7 +27,7 @@
         <Defines>BOOST_ALL_NO_LIB;TRANSACTD;$(Defines)</Defines>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
         <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
-        <DllSuffix>_1_0</DllSuffix>
+        <DllSuffix>_1_2</DllSuffix>
         <DynamicRTL>false</DynamicRTL>
         <BPILibOutputDir>..\..\lib</BPILibOutputDir>
         <BCC_PCHUsage>None</BCC_PCHUsage>

data/build/tdclc/tdclc_64.cbproj

@@ -44,7 +44,7 @@
         <Defines>BOOST_ALL_NO_LIB;TRANSACTD;$(Defines)</Defines>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
         <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
-        <DllSuffix>_1_0</DllSuffix>
+        <DllSuffix>_1_2</DllSuffix>
         <DynamicRTL>false</DynamicRTL>
         <BPILibOutputDir>..\..\lib</BPILibOutputDir>
         <BCC_PCHUsage>None</BCC_PCHUsage>

data/build/tdclcpp/CMakeLists.txt

@@ -104,7 +104,7 @@ add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
 # ==========================================================
 # add link / include
 # ==========================================================
-transactd_link_boost_libraries("chrono;filesystem;system;thread")
+transactd_link_boost_libraries("filesystem;thread;chrono;system")
 if(CAN_LINK_ICONV)
   target_link_libraries(${this_target} iconv)
 endif()

data/build/tdclcpp/tdclcpp_bcb_32.cbproj

@@ -59,7 +59,7 @@
 			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
 			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
 			<TD_VER_MAJOR>1</TD_VER_MAJOR>
-			<TD_VER_MINOR>1</TD_VER_MINOR>
+			<TD_VER_MINOR>2</TD_VER_MINOR>
 			<DllSuffix>$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1)'!=''">
@@ -123,9 +123,6 @@
 			<CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\fileDDF.cpp">
 				<BuildOrder>8</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\filter.cpp">
-				<BuildOrder>9</BuildOrder>
-			</CppCompile>
 			<CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\indexDDF.cpp">
 				<BuildOrder>10</BuildOrder>
 			</CppCompile>

data/build/tdclcpp/tdclcpp_bcb_64.cbproj

@@ -178,9 +178,6 @@
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\fileDDF.cpp">
             <BuildOrder>8</BuildOrder>
         </CppCompile>
-        <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\filter.cpp">
-            <BuildOrder>9</BuildOrder>
-        </CppCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\indexDDF.cpp">
             <BuildOrder>10</BuildOrder>
         </CppCompile>

data/build/tdclrb/CMakeLists.txt

@@ -178,7 +178,7 @@ endif()
 # add link / include
 # ==========================================================
 if(MINGW)
-  transactd_link_boost_libraries("timer;chrono;filesystem;system;thread")
+  transactd_link_boost_libraries("timer;filesystem;thread;chrono;system")
 else()
   transactd_link_boost_libraries("timer")
 endif()

data/build/tdclrb/GEM_VERSION

@@ -1,3 +1,3 @@
 TDVER_RUBYGEM_VER_MAJOR   1
-TDVER_RUBYGEM_VER_MINOR   1
-TDVER_RUBYGEM_VER_RELEASE 2
+TDVER_RUBYGEM_VER_MINOR   2
+TDVER_RUBYGEM_VER_RELEASE 0

data/source/bzs/db/engine/mysql/IReadRecords.h

@@ -39,7 +39,7 @@ class IReadRecordsHandler
 public:
 	virtual ~IReadRecordsHandler(){};
 	virtual int match(bool typeNext) const=0;
-	virtual short write(const unsigned char* bookmark, unsigned int bmlen)=0;
+	virtual short write(const unsigned char* bookmark, unsigned int bmlen, short stat=0)=0;
 	virtual unsigned short rejectCount() = 0;
 	virtual unsigned short maxRows() = 0;
 };

data/source/bzs/db/engine/mysql/bookmark.h

@@ -135,9 +135,9 @@ class bookmarks
 			THROW_BZS_ERROR_WITH_CODEMSG(STATUS_INVALID_BOOKMARK ,"invalid bookmark.");
 		void* tmp;
 		if (m_ptr == NULL)
-			tmp = (unsigned char*)my_malloc(count*m_refLen, 0);
+			tmp = (unsigned char*)td_malloc(count*m_refLen, 0);
 		else
-			tmp = my_realloc(m_ptr, count*m_refLen, 0);
+			tmp = td_realloc(m_ptr, count*m_refLen, 0);
 		if (tmp)
 			m_ptr = (unsigned char*)tmp;
 		else
@@ -153,7 +153,7 @@ public:
 	
 	~bookmarks()
 	{
-		my_free(m_ptr); 
+		td_free(m_ptr); 
 	}
 	
 	/** get integer bookmark pointer by raw ref pointer

data/source/bzs/db/engine/mysql/database.cpp

@@ -370,7 +370,7 @@ bool database::endSnapshot()
 /** Metadata lock, a table name is case-sensitive 
  *  However, in actual opening, it is not distinguished at Windows.
  */
-TABLE* database::doOpenTable(const std::string& name, short mode)
+TABLE* database::doOpenTable(const std::string& name, short mode, const char* ownerName)
 {
 	TABLE_LIST tables;
 	m_thd->variables.lock_wait_timeout = OPEN_TABLE_TIMEOUT_SEC;
@@ -388,6 +388,23 @@ TABLE* database::doOpenTable(const std::string& name, short mode)
 			m_stat = STATUS_CANNOT_LOCK_TABLE;
 		THROW_BZS_ERROR_WITH_CODEMSG(m_stat, name.c_str());
 	}
+	
+	//Check owner name
+	if (ownerName && ownerName[0])
+	{
+		const char* p = tables.table->s->comment.str;
+		if ((p[0] == '%') && (p[1] =='@') && (p[2] =='%'))
+		{
+			int readNoNeed = p[3] - '0';
+			if ((mode == TD_OPEN_READONLY) && readNoNeed)
+				;
+			else if (strcmp(p + 4, ownerName))
+			{
+				m_stat = STATUS_INVALID_OWNERNAME;
+				return NULL;
+			}
+		}
+	}
 
 	tables.table->use_all_columns();
 	tables.table->open_by_handler = 1;
@@ -399,15 +416,20 @@ TABLE* database::doOpenTable(const std::string& name, short mode)
 	return tables.table;
 }
 
-table* database::openTable(const std::string& name, short mode)
+table* database::openTable(const std::string& name, short mode, const char* ownerName)
 {
 	if (existsTable(name))
 	{
 		tableRef.addref(m_dbname, name);//addef first then table open.
-		boost::shared_ptr<table> tb(new table(doOpenTable(name, mode) , *this, name, mode, (int)m_tables.size()));
-		m_tables.push_back(tb);
-		m_stat = STATUS_SUCCESS;
-		return tb.get();
+		TABLE* t = doOpenTable(name, mode, ownerName);
+		if (t)
+		{
+			boost::shared_ptr<table> tb(new table(t , *this, name, mode, (int)m_tables.size()));
+			m_tables.push_back(tb);
+			m_stat = STATUS_SUCCESS;
+			return tb.get();
+		}
+		return NULL;
 	}
 	m_stat = STATUS_TABLE_NOTOPEN;
 	THROW_BZS_ERROR_WITH_CODEMSG(m_stat, name.c_str());
@@ -459,7 +481,7 @@ void database::reopen()
 	{
 		if (m_tables[i] && (m_tables[i]->m_table==NULL))
 		{
-			TABLE* table = doOpenTable(m_tables[i]->m_name.c_str(), m_tables[i]->m_mode);
+			TABLE* table = doOpenTable(m_tables[i]->m_name.c_str(), m_tables[i]->m_mode, NULL);
 			if (table)
 				m_tables[i]->resetInternalTable(table);
 			else
@@ -628,7 +650,7 @@ bool table::setNonKey(bool scan)
 	return true;
 }
 
-bool table::setKeyNum(char num)
+bool table::setKeyNum(char num, bool sorted)
 {
 	if ((m_keyNum != num) || ((m_keyNum >= 0)&& (m_table->file->inited == handler::NONE)))
 	{
@@ -637,7 +659,7 @@ bool table::setKeyNum(char num)
 		if(keynumCheck(num))
 		{
 			m_keyNum = num;
-			m_table->file->ha_index_init(m_keyNum, 1/*sorted*/);
+			m_table->file->ha_index_init(m_keyNum, sorted);
 			return true;
 		}
 		else
@@ -727,6 +749,9 @@ void table::setKeyValuesPacked(const uchar* ptr, int size)
 
 uint table::keyPackCopy(uchar* ptr)
 {
+	//if nokey and getbookmark operation then keynum = -2
+	if (m_keyNum < 0) return 0; 
+
 	KEY& key = m_table->key_info[m_keyNum];
 	if ((key.flags & HA_NULL_PART_KEY) || (key.flags & HA_VAR_LENGTH_KEY))
 	{
@@ -790,6 +815,8 @@ inline bool isNull(Field* fd)
 				
 		return (len==0);
 	}
+	else if (isBlobType(fd->type()))
+		return (0==blob_len(fd));
 	else
 	{
 		unsigned int k=0;
@@ -1334,18 +1361,21 @@ void table::stepPrev()
 
 void table::readRecords(IReadRecordsHandler* hdr, bool includeCurrent, int type)
 {
-	if ((m_table->file->inited != handler::INDEX) || !m_cursor)
+	if ((m_table->file->inited == handler::NONE) || !m_cursor)
 	{
 		m_stat = STATUS_NO_CURRENT;
 		return;
 	}
 	m_nonNcc = false;
 	int reject = (hdr->rejectCount()==0)?4096:hdr->rejectCount();
+	if (reject==0xFFFF)
+		reject = -1;
 	int rows = hdr->maxRows();
 	
 	//Is a current position read or not? 
 	bool read = !includeCurrent;
 	bool unlock = (!m_db.inSnapshot() && !m_db.inTransaction()) || (m_db.inTransaction() && (m_db.transactionType()== 0));
+	bool forword = (type == READ_RECORD_GETNEXT) || (type == READ_RECORD_STEPNEXT);
 	while((reject!=0) && (rows!=0))
 	{
 		if (read)
@@ -1361,6 +1391,13 @@ void table::readRecords(IReadRecordsHandler* hdr, bool includeCurrent, int type)
 				m_stat = m_table->file->ha_index_next(m_table->record[0]);
 			else if (type == READ_RECORD_GETPREV)
 				m_stat = m_table->file->ha_index_prev(m_table->record[0]);
+			else if (type == READ_RECORD_STEPNEXT)
+				m_stat = m_table->file->ha_rnd_next(m_table->record[0]);
+			else if (type == READ_RECORD_STEPPREV)
+			{
+				m_stat = STATUS_NOSUPPORT_OP;
+				return;
+			}
 			m_cursor = m_validCursor = (m_stat == 0);
 		}else
 			read = true;
@@ -1368,7 +1405,7 @@ void table::readRecords(IReadRecordsHandler* hdr, bool includeCurrent, int type)
 		
 		if (m_stat)	
 			break;
-		int ret = hdr->match(type == READ_RECORD_GETNEXT);
+		int ret = hdr->match(forword);
 		if (ret == REC_MACTH)
 		{
 			m_stat = hdr->write(position(), posPtrLen());
@@ -1417,7 +1454,7 @@ void table::movePos(const uchar* pos, char keyNum, bool sureRawValue)
 	unlockRow();
 	m_stat = m_table->file->ha_rnd_pos(m_table->record[0], (uchar*)rawPos);
 	m_cursor =  (m_stat == 0);
-	if (keyNum==-1)
+	if ((keyNum==-1)||(keyNum==-64))
 		return ;
 	if (m_stat==0)
 	{
@@ -1456,6 +1493,8 @@ uint table::posPtrLen()const
 
 ha_rows table::recordCount(bool estimate)
 {
+	if ((m_table->file->ha_table_flags() & (HA_HAS_RECORDS | HA_STATS_RECORDS_IS_EXACT)) != 0)
+		return m_table->file->records();		 
 	if (estimate)
 	{	//Since the answer of innodb is random, 1 returns also 0.
 		//Since it is important, in the case of 1
@@ -1466,16 +1505,45 @@ ha_rows table::recordCount(bool estimate)
 			return rows;
 	}
 	uint n = 0;
-	m_table->read_set= &m_table->tmp_set;
+	m_table->read_set = &m_table->tmp_set;
+	m_table->write_set = &m_table->tmp_set;
 	bitmap_clear_all(m_table->read_set);
-	setNonKey(true/*scan*/);
-	m_stat = m_table->file->ha_rnd_next(m_table->record[0]);
-	while (m_stat == 0)
+	//bitmap_clear_all(m_table->write_set);
+	
+	char keynum = m_keyNum;
+	int inited = m_table->file->inited;
+	m_table->file->ha_index_or_rnd_end();
+	
+	m_table->file->extra(HA_EXTRA_KEYREAD);
+	if (setKeyNum((char)0, false/*sorted*/))
 	{
-		n++;
+		m_stat = m_table->file->ha_index_first(m_table->record[0]);
+		while (m_stat == 0)
+		{
+			n++;
+			m_stat = m_table->file->ha_index_next(m_table->record[0]);
+		}
+		m_table->file->extra(HA_EXTRA_NO_KEYREAD);
+
+		//restore index init
+		if ((inited == (int)handler::INDEX) && (m_keyNum != keynum))
+			setKeyNum(keynum);
+		else if((inited == (int)handler::RND))
+			setNonKey(true/*scan*/);
+	}
+	else
+	{
+		setNonKey(true/*scan*/);
 		m_stat = m_table->file->ha_rnd_next(m_table->record[0]);
+		while (m_stat == 0)
+		{
+			n++;
+			m_stat = m_table->file->ha_rnd_next(m_table->record[0]);
+		}
 	}
+	m_table->file->extra(HA_EXTRA_NO_KEYREAD);
 	m_table->read_set = &m_table->s->all_set;
+	m_table->write_set = &m_table->s->all_set;
 	return n;
 }
 
@@ -1570,7 +1638,7 @@ void table::setFiledNullFlags()
 
 __int64 table::insert(bool ncc)
 {
-	if (!cp_is_write_lock(m_table->file))
+	if ((m_mode==TD_OPEN_READONLY) || !cp_is_write_lock(m_table->file))
 	{
 		m_stat = STATUS_INVALID_LOCKTYPE;
 		return 0;
@@ -1609,6 +1677,7 @@ __int64 table::insert(bool ncc)
 
 void table::beginUpdate(char keyNum)
 {
+	m_stat = 0;
 	m_table->file->try_semi_consistent_read(1); 
 	beginDel();
 	if (m_stat==0)
@@ -1624,6 +1693,11 @@ void table::beginUpdate(char keyNum)
 
 void table::beginDel()
 {
+	if ((m_mode==TD_OPEN_READONLY) || !cp_is_write_lock(m_table->file))
+	{
+		m_stat = STATUS_INVALID_LOCKTYPE;
+		return;
+	}
 	if (m_cursor)
 	{
 		m_stat = 0;
@@ -1641,7 +1715,9 @@ void table::beginDel()
 			}
 			else
 				movePos(position(true), -1, true);
-			if (cmp_record(m_table, record[1]))
+
+			//Has blob fileds then ignore conflicts.
+			if ((m_table->s->blob_fields==0) && cmp_record(m_table, record[1]))
 				m_stat = STATUS_CHANGE_CONFLICT;
 			
 			m_cursor = m_validCursor = (m_stat == 0);

data/source/bzs/db/engine/mysql/database.h

@@ -101,7 +101,7 @@ class database : private boost::noncopyable
 	short m_trnType;
 	
 	std::vector<boost::shared_ptr<table> > m_tables;
-	TABLE* doOpenTable(const std::string& name, short mode);
+	TABLE* doOpenTable(const std::string& name, short mode, const char* ownerName);
 	
 	void unUseTable(table* tb);
 public:
@@ -111,7 +111,7 @@ public:
 	THD* thd()const{return m_thd;};
 	void use() const;
 	short clientID()const{return m_cid;}
-	table* openTable(const std::string& name, short mode);
+	table* openTable(const std::string& name, short mode, const char* ownerName);
 	const std::string& name()const{return m_dbname;};
 	table* useTable(int index, enum_sql_command cmd);
 	bool beginTrn(short type);
@@ -283,8 +283,8 @@ public:
 		return m_keyconv.keyNumByMakeOrder(num);
 	}
 	
-	bool setKeyNum(char num);
-	inline void setKeyNum(const char* name){setKeyNum(keynumByName(name));};
+	bool setKeyNum(char num, bool sorted = true);
+	inline void setKeyNum(const char* name, bool sorted = true){setKeyNum(keynumByName(name), sorted);};
 	bool isNisKey(char num)const;
 	void seekKey(enum ha_rkey_function find_flag);
 	void getNextSame();
@@ -314,12 +314,12 @@ public:
 
 	inline void stepNextExt(IReadRecordsHandler* handler, bool includeCurrent)
 	{
-		readRecords(handler, includeCurrent, READ_RECORD_GETNEXT);
+		readRecords(handler, includeCurrent, READ_RECORD_STEPNEXT);
 	}
 
 	inline void stepPrevExt(IReadRecordsHandler* handler, bool includeCurrent)
 	{
-		readRecords(handler, includeCurrent, READ_RECORD_GETPREV);
+		readRecords(handler, includeCurrent, READ_RECORD_STEPPREV);
 	}
 
 	void clearBuffer();

data/source/bzs/db/engine/mysql/mysqlInternal.h

@@ -26,12 +26,15 @@
 #ifndef MYSQL_DYNAMIC_PLUGIN
 	#define MYSQL_DYNAMIC_PLUGIN
 #endif
+
 #define MYSQL_SERVER 1
 
 #ifndef HAVE_CONFIG_H
 #define HAVE_CONFIG_H
 #endif
 
+#define HAVE_PSI_INTERFACE //50700
+#define NO_USE_MALLOC_SERVICE_INTERFACE
 
 #ifdef ERROR
 #undef ERROR
@@ -44,6 +47,7 @@
 #pragma warning(disable:4800) 
 #pragma warning(disable:4267) 
 #pragma warning(disable:4996) 
+#pragma warning(disable:4805) 
 #endif
 
 #include <my_config.h>
@@ -70,9 +74,13 @@
 #include "sql/sql_parse.h"  
 #include "sql/sql_table.h"
 #include "sql/sql_db.h"
-#include "sql/sql_acl.h"
+#include "sql_acl.h"
 #include "mysqld_error.h"
 
+#if ((MYSQL_VERSION_ID > 50700) && !defined(MARIADB_BASE_VERSION))
+#include "sql/log.h"
+#endif
+
 #undef test
 
 #undef sleep
@@ -84,6 +92,7 @@
 #pragma warning(default:4996) 
 #pragma warning(default:4267) 
 #pragma warning(default:4800) 
+#pragma warning(default:4805) 
 #endif
 
 #undef min
@@ -114,6 +123,10 @@
 	#define MDL_SHARED_UPGRADABLE MDL_SHARED_WRITE
 	#define	cp_get_sql_error()	stmt_da->sql_errno()
 	#define	cp_isOk()			stmt_da->is_ok()
+#elif ((MYSQL_VERSION_NUM > 50700) && !defined(MARIADB_BASE_VERSION))
+	#define	cp_get_sql_error()	get_stmt_da()->mysql_errno()
+	#define query_cache_invalidate3(A, B, C) query_cache.invalidate(A, B, C)
+	#define	cp_isOk()			get_stmt_da()->is_ok()
 #else
 	#define	cp_get_sql_error()	get_stmt_da()->sql_errno()
 	#define	cp_isOk()			get_stmt_da()->is_ok()
@@ -167,5 +180,34 @@
 	#define ha_index_read_map		index_read_map
 #endif
 
+/* memory management */
+#if ((MYSQL_VERSION_NUM > 50700) && !defined(MARIADB_BASE_VERSION))
+	#define td_malloc(A, B) my_malloc(PSI_NOT_INSTRUMENTED, A, B)
+	#define td_realloc(A, B, C) my_realloc(PSI_NOT_INSTRUMENTED, A, B, C)
+	#define td_strdup(A, B) my_strdup(PSI_NOT_INSTRUMENTED, A, B)
+	#define td_free(A) my_free(A)
+	
+	/* On Windows,
+	   "operator delete()" function is implemented in mysqld. 
+	   But "operator new" operation implement in transactd.dll.
+	   Therefore, memory managers differ.*/ 
+	#ifdef _WIN32
+		inline void releaseTHD(THD* thd)
+		{
+			thd->~THD();
+			operator delete((void*)thd); 
+		}
+	#else
+		inline void releaseTHD(THD* thd){delete thd;}
+	#endif
+#else
+	#define td_malloc(A, B) my_malloc(A, B)
+	#define td_realloc(A, B, C) my_realloc(A, B, C)
+	#define td_strdup(A, B) my_strdup(A, B)
+	#define td_free(A) my_free(A)
+	inline void releaseTHD(THD* thd){delete thd;}
+#endif
+
+
 
 #endif //MYSQLINTERNAL_H

data/source/bzs/db/engine/mysql/mysqlThd.cpp

@@ -51,25 +51,26 @@ inline void setStackaddr(char* v)
 #endif
 }
 
+
 void* operator new(size_t t)
 {   
-    return my_malloc(t, MY_WME);   
+    return td_malloc(t, MY_WME);   
 }   
 
 void operator delete(void* p)
 {   
-    my_free(p);   
+    td_free(p);   
 }   
   
 void* operator new[](size_t t)
 {   
-    return my_malloc(t, MY_WME);   
+    return td_malloc(t, MY_WME);   
 }   
 
 void operator delete[](void* p)
 {   
-    my_free(p);   
-}  
+    td_free(p);   
+} 
 
 void initThread(THD* thd )
 {
@@ -121,8 +122,8 @@ THD* buildTHD()
 	sprintf_s(tmp, 256,"set innodb_lock_wait_timeout=%d;", g_lock_wait_timeout);
 	dispatch_command(COM_QUERY, thd, tmp, (uint)strlen(tmp));
 
-	my_free(thd->db);
-	thd->db = my_strdup("bizstation", MYF(0));
+	td_free(thd->db);
+	thd->db = td_strdup("bizstation", MYF(0));
 	if(thd->variables.sql_log_bin)
 		thd->set_current_stmt_binlog_format_row();
 	return thd;
@@ -165,6 +166,7 @@ void deleteThdForThread(THD* thd)
 	cp_thd_release_resources(thd);
 	cp_remove_global_thread(thd);
 	mysql_mutex_unlock(&LOCK_thread_count);
-	delete thd;
 
+	releaseTHD(thd);
+	
 }

data/source/bzs/db/protocol/hs/hsCommandExecuter.cpp

@@ -282,7 +282,7 @@ int dbExecuter::commandExec(std::vector<request>& requests, char* result, size_t
 		{	
 			checkNewHandle(req.handle);
 			database* db = getDatabase(req.db.name, 0/*cid*/);
-			m_tb = db->openTable(req.table.name, req.table.openMode);
+			m_tb = db->openTable(req.table.name, req.table.openMode, NULL);
 			addHandle(getDatabaseID(0/*cid*/), m_tb->id(), req.handle);
 			m_tb = getTable(req.handle);
 			m_tb->setUseFieldList(req.table.fields);

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

@@ -122,10 +122,10 @@ public:
              btrTimeStamp(btrDate d, btrTime t);
 #ifdef _WIN32
     explicit btrTimeStamp(const wchar_t* p);
-    wchar_t* toString(wchar_t* p);
+    wchar_t* toString(wchar_t* retbuf);
     void fromString(const wchar_t* p);
 #endif
-    char* toString(char* p);
+    char* toString(char* retbuf);
     void fromString(const char* p);
 
 };

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

@@ -201,7 +201,7 @@ void dbdef::setCodePage(tabledef* td)
     }
 }
 
-void dbdef::updateTableDef(short TableIndex)
+void dbdef::updateTableDef(short TableIndex, bool forPsqlDdf)
 {
     m_stat = STATUS_SUCCESS;
     tabledef* td = tableDefs(TableIndex);
@@ -292,7 +292,7 @@ void dbdef::updateTableDef(short TableIndex)
         return;
     }
     if (m_impl->deftype == TYPE_SCHEMA_DDF)
-        saveDDF(TableIndex, 3);
+        saveDDF(TableIndex, 3, forPsqlDdf);
     else
     {
         moveById(td->id);
@@ -831,6 +831,7 @@ void dbdef::getFileSpec(fileSpec* fs, short TableIndex)
             ks->keyFlag.all = KeyDef->segments[j].flags.all;
             ks->keyCount = 0;
             ks->keyType = TableDef->fieldDefs[FieldNum].type;
+
             if ((ks->keyType == ft_autoinc) && (KeyDef->segmentCount > 1))
                 ks->keyType = 1;
             if (ks->keyFlag.bit3 == true)
@@ -1051,9 +1052,10 @@ uint_td dbdef::fieldValidLength(eFieldQuery query, uchar_td FieldType)
         maxlen = 8;
         defaultlen = 2;
         break;
+    case ft_autoIncUnsigned:
     case ft_autoinc: minlen = 2;
-        maxlen = 4;
-        defaultlen = 2;
+        maxlen = 8;
+        defaultlen = 4;
         break;
     case ft_bit: minlen = 1;
         maxlen = 1;
@@ -1101,9 +1103,9 @@ bool dbdef::validLen(uchar_td FieldType, uint_td FieldLen)
                 return false;
 
         }
-        else if (FieldType == ft_autoinc)
+        else if ((FieldType == ft_autoinc) || (FieldType == ft_autoIncUnsigned))
         {
-            if ((FieldLen == 2) || (FieldLen == 4))
+            if ((FieldLen == 2) || (FieldLen == 4)|| (FieldLen == 8))
                 return true;
             else
                 return false;
@@ -1202,7 +1204,7 @@ void dbdef::createDDF(const _TCHAR* fullpath)
 
 }
 
-void dbdef::saveDDF(short TableIndex, short opration)
+void dbdef::saveDDF(short TableIndex, short opration, bool forPsqlDdf)
 {
     ushort_td chOpen = 0;
     short Mode = 0;
@@ -1269,7 +1271,10 @@ void dbdef::saveDDF(short TableIndex, short opration)
             tb->seek();
             strcpy(tb->tablename, TableDef->tableNameA());
             strcpy(tb->filename, TableDef->fileNameA());
-            tb->flag = TableDef->flags.all;
+            if (forPsqlDdf)
+                tb->flag = 0;//PSQL are reading flags from table files.
+            else
+                tb->flag = TableDef->flags.all;
             if (tb->stat() == STATUS_SUCCESS)
             {
                 if (opration == 4)
@@ -1303,6 +1308,8 @@ void dbdef::saveDDF(short TableIndex, short opration)
                     fd->fileid = tb->id;
                     strcpy(fd->name, FieldDef->nameA());
                     fd->type = FieldDef->type;
+                    if (forPsqlDdf && (fd->type == ft_logical))
+                        fd->type = ft_uinteger;
                     fd->pos = (ushort_td)(pos - 1);
                     fd->len = FieldDef->len;
                     pos += FieldDef->len;

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

@@ -55,7 +55,7 @@ class AGRPACK dbdef : private nstable
     bool isPassKey(uchar_td FieldType);
     void openDdf(const _TCHAR* dir, short Mode, const _TCHAR* OwnerName);
     void createDDF(const _TCHAR* fullpath);
-    void saveDDF(short tableIndex, short opration);
+    void saveDDF(short tableIndex, short opration, bool forPsqlDdf=true);
     ushort_td getDDFNewTableIndex();
     ushort_td getDDFNewFieldIndex();
     int totalDefLength(short tableIndex);
@@ -94,7 +94,7 @@ public:
 
     inline short_td stat() const {return m_stat;}
 
-    void updateTableDef(short tableIndex);
+    void updateTableDef(short tableIndex, bool forPsqlDdf=true);
     fielddef* insertField(short tableIndex, short insertIndex);
     void deleteField(short tableIndex, short deleteIndex);
     keydef* insertKey(short tableIndex, short insertIndex);