transactd 2.4.0 → 2.4.2

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,0,66
- PRODUCTVERSION 2,4,0,66
+ FILEVERSION 2,4,2,91
+ PRODUCTVERSION 2,4,2,91
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C++ client"
-            VALUE "FileVersion", "2.4.0.66"
+            VALUE "FileVersion", "2.4.2.91"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.0.66"
+            VALUE "ProductVersion", "2.4.2.91"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclrb/CMakeLists.txt

@@ -66,6 +66,15 @@ if("${TRANSACTD_RUBY_GEM_ROOT_PATH}" STREQUAL "")
   set(TRANSACTD_RUBY_GEM_ROOT_PATH "${TRANSACTD_BINARY_ROOT}")
 endif()
 
+# ==========================================================
+# add library path
+# ==========================================================
+if(WIN32)
+  link_directories("${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common")
+else()
+ link_directories("../tdclcpp")
+endif()
+
 
 # ==========================================================
 # add swig wrapper source file
@@ -104,6 +113,16 @@ endif()
 # ==========================================================
 add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
+# ==========================================================
+# add dependencie projects
+# ==========================================================
+if(WIN32)
+  if(MSVC)
+    add_dependencies(${this_target} tdclcpp)
+  endif()
+else()
+  add_dependencies(${this_target} tdclc tdclcpp)
+endif()
 
 # ==========================================================
 # Add compile options
@@ -127,7 +146,7 @@ endif()
 if(MSVC)
   set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
     WIN32 _WIN32 _WINDOWS _USRDLL BOOST_ALL_NO_LIB 
-    LIB_TDCLCPP TRDCL_AUTOLINK_OFF TRDCLENGN_EXPORTS _CRT_SECURE_NO_WARNINGS)
+    LIB_TDCLCPP TRDCL_AUTOLINK TRDCLENGN_EXPORTS _CRT_SECURE_NO_WARNINGS)
 else()
   set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
     PIC _REENTRANT BOOST_ALL_NO_LIB)
@@ -145,20 +164,10 @@ endif()
 # add link / include
 # ==========================================================
 target_link_libraries(${this_target} "${TRANSACTD_RUBY_LIBRARY_PATH}")
-if(WIN32 AND (NOT MSVC))
-  transactd_link_boost_libraries("timer;filesystem;thread;chrono;system")
-else()
-  transactd_link_boost_libraries("timer")
-  if(MSVC)
-    target_link_libraries(${this_target} "tdclcppmr")
-  else()
-    if(NOT TRANSACTD_WITHOUT_C_CPP_CLIENTS)
-      target_link_libraries(${this_target} "tdclcppm")
-    else()
-      transactd_link_boost_libraries("timer;filesystem;thread;chrono;system")
-      target_link_libraries(${this_target} "tdclcpp_64m")
-    endif()
-  endif()
+transactd_link_boost_libraries("timer;filesystem;thread;chrono;system")
+#tdclcpp_x on windows is auto link
+if(NOT WIN32)
+  target_link_libraries(${this_target} "tdclcpp_64m")
 endif()
 
 

data/build/tdclrb/gem/Makefile.win32-VS

@@ -26,8 +26,8 @@ set INSMSG=..\..\..\install.log
 set ERRMSG=errormsg.log
 
 @REM BUILD
-echo BUILD tdcl.sln %date% %time% >> "%BLDMSG%"
-msbuild tdcl.sln /p:Configuration=Release /m:2 >> "%BLDMSG%" 2>&1
+echo BUILD TransactdRubyClient.sln %date% %time% >> "%BLDMSG%"
+msbuild TransactdRubyClient.sln /p:Configuration=Release /m:2 >> "%BLDMSG%" 2>&1
 if ERRORLEVEL 1 (
   echo ************************************************************** 1>&2
   echo EROOR MESSAGE 1>&2

data/build/tdclrb/gem_output.cmake

@@ -23,24 +23,41 @@ include(../common/smart_install.cmake)
 # ==========================================================
 if(NOT COMMAND tdcl_set_output)
 macro(tdcl_set_output TRANSACTD_BINARY_ROOT prefix)
-  ## install tdclcppmr
+  if("${TRANSACTD_RUBY_GEM_ROOT_PATH}" STREQUAL "")
+    set(TRANSACTD_RUBY_GEM_ROOT_PATH "${TRANSACTD_BINARY_ROOT}")
+  endif()
+  ## install tdclcpp
   if((NOT WIN32) OR MSVC)
-    install(TARGETS tdclcppmr
-      LIBRARY DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
-      RUNTIME DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
-      ARCHIVE DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
-    )
+    foreach(tmp_build_type "_RELEASE" "_DEBUG" "_RELWITHDEBINFO" "_MINSIZEREL")
+      set_target_properties(tdclcpp PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY${tmp_build_type} "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
+        LIBRARY_OUTPUT_DIRECTORY${tmp_build_type} "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
+        ARCHIVE_OUTPUT_DIRECTORY${tmp_build_type} "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common")
+    endforeach()
     ## install to system dir (copy file if greater)
     if(WIN32)
-      get_target_property(tmp_var "tdclcppmr" LOCATION)
-      get_filename_component(tmp_var "${tmp_var}" NAME)
+      set(tmp_target_name "")
+      if(TARGET "tdclcpp")
+        set(tmp_target_name "tdclcpp")
+      elseif(TARGET "tdclcppmr")
+        set(tmp_target_name "tdclcppmr")
+      elseif(TARGET "tdclcppm")
+        set(tmp_target_name "tdclcppm")
+      endif()
+      if (NOT "${tmp_target_name}" STREQUAL "")
+        string(TOUPPER "OUTPUT_NAME_${CMAKE_BUILD_TYPE}" tmp_var)
+        get_target_property(tmp_var "${tmp_target_name}" "${tmp_var}")
+        set(tmp_var "${tmp_var}.dll")
+      else()
+        set(tmp_var "tdclcpp_vc100_*.dll")
+      endif()
       file(TO_CMAKE_PATH "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common/${tmp_var}" tmp_var)
       bz_smart_install(SOURCES "${tmp_var}" TO_WIN_SYSTEMDIR)
     else()
       if("${prefix}" STREQUAL "")
-        install(TARGETS tdclcppmr LIBRARY DESTINATION /usr/lib)
+        install(TARGETS tdclcpp LIBRARY DESTINATION /usr/lib)
       else()
-        install(TARGETS tdclcppmr LIBRARY DESTINATION "${prefix}")
+        install(TARGETS tdclcpp LIBRARY DESTINATION "${prefix}")
       endif()
     endif()
   endif()

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,0,66
- PRODUCTVERSION 2,4,0,66
+ FILEVERSION 2,4,2,91
+ PRODUCTVERSION 2,4,2,91
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "2.4.0.66"
+            VALUE "FileVersion", "2.4.2.91"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.0.66"
+            VALUE "ProductVersion", "2.4.2.91"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

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

@@ -1077,7 +1077,7 @@ void table::fillNull(uchar* ptr, int size)
 
 void table::setKeyValues(const uchar* ptr, int size)
 {
-    KEY& key = m_table->key_info[m_keyNum];
+    KEY& key = m_table->key_info[(int)m_keyNum];
     memcpy(&m_keybuf[0], ptr, std::min(MAX_KEYLEN, size));
     int pos = 0;
     for (int j = 0; j < (int)key.user_defined_key_parts; j++)
@@ -1107,7 +1107,7 @@ void table::setKeyValues(const uchar* ptr, int size)
  */
 short table::setKeyValuesPacked(const uchar* ptr, int size)
 {
-    KEY& key = m_table->key_info[m_keyNum];
+    KEY& key = m_table->key_info[(int)m_keyNum];
     int to = 0;
     const uchar* from = ptr;
     int ret = -1;
@@ -1166,7 +1166,7 @@ uint table::keyPackCopy(uchar* ptr)
     if (m_keyNum < 0)
         return 0;
 
-    KEY& key = m_table->key_info[m_keyNum];
+    KEY& key = m_table->key_info[(int)m_keyNum];
     if ((key.flags & HA_NULL_PART_KEY) || (key.flags & HA_VAR_LENGTH_KEY))
     {
         int from = 0;
@@ -1488,7 +1488,7 @@ void table::seekKey(enum ha_rkey_function find_flag, key_part_map keyMap)
         {
             if (find_flag != HA_READ_KEY_EXACT)
                 key_copy(&m_keybuf[0], m_table->record[0],
-                         &m_table->key_info[m_keyNum], KEYLEN_ALLCOPY);
+                         &m_table->key_info[(int)m_keyNum], KEYLEN_ALLCOPY);
         }
     }
     else
@@ -1508,7 +1508,7 @@ void table::moveKey(boost::function<int()> func)
         setCursorStaus();
         if (m_stat == 0)
             key_copy(&m_keybuf[0], m_table->record[0],
-                     &m_table->key_info[m_keyNum], KEYLEN_ALLCOPY);
+                     &m_table->key_info[(int)m_keyNum], KEYLEN_ALLCOPY);
     }
     else
         m_stat = STATUS_INVALID_KEYNUM;
@@ -1528,7 +1528,7 @@ void table::getNextSame(key_part_map keyMap)
         if (m_stat == 0)
         {
             key_copy(&m_keybuf[0], m_table->record[0],
-                     &m_table->key_info[m_keyNum], KEYLEN_ALLCOPY);
+                     &m_table->key_info[(int)m_keyNum], KEYLEN_ALLCOPY);
         }
     }
     else
@@ -1603,7 +1603,7 @@ bool table::keyCheckForPercent()
     if (m_keyNum == -1)
         m_keyNum = m_table->s->primary_key;
     // The value of the beginning of a key
-    KEY& key = m_table->key_info[m_keyNum];
+    KEY& key = m_table->key_info[(int)m_keyNum];
     if (key.key_length > 128)
         return false;
     return true;
@@ -1611,7 +1611,7 @@ bool table::keyCheckForPercent()
 
 void table::preBuildPercent(uchar* first, uchar* last)
 {
-    KEY& key = m_table->key_info[m_keyNum];
+    KEY& key = m_table->key_info[(int)m_keyNum];
     getFirst();
     if (m_stat == 0)
     {
@@ -1661,7 +1661,7 @@ void table::getByPercentage(unsigned short per)
         uchar* st = keybufFirst;
         uchar* en = keybufLast;
         uchar* cu = (uchar*)keybuf();
-        KEY& key = m_table->key_info[m_keyNum];
+        KEY& key = m_table->key_info[(int)m_keyNum];
         uint keylen = key.key_length + 10;
         boost::shared_array<uchar> stbuf(new uchar[keylen]);
         boost::shared_array<uchar> lsbuf(new uchar[keylen]);
@@ -1749,7 +1749,7 @@ void table::getByPercentage(unsigned short per)
 
 int table::percentage(uchar* first, uchar* last, uchar* cur)
 {
-    KEY& key = m_table->key_info[m_keyNum];
+    KEY& key = m_table->key_info[(int)m_keyNum];
     // 1 cur to last
     key_range minkey;
     minkey.key = cur;
@@ -1786,7 +1786,7 @@ void table::calcPercentage()
     m_percentResult = 0;
     // The present key value is copied.
     uchar keybufCur[MAX_KEYLEN] = { 0x00 };
-    key_copy(keybufCur, m_table->record[0], &m_table->key_info[m_keyNum],
+    key_copy(keybufCur, m_table->record[0], &m_table->key_info[(int)m_keyNum],
              KEYLEN_ALLCOPY);
 
     uchar keybufFirst[MAX_KEYLEN] = { 0x00 };
@@ -1982,7 +1982,7 @@ void table::movePos(const uchar* pos, char keyNum, bool sureRawValue)
         if (m_keyNum != keyNum)
         { // need key change
             key_copy(&m_keybuf[0], m_table->record[0],
-                     &m_table->key_info[keyNum], KEYLEN_ALLCOPY);
+                     &m_table->key_info[(int)keyNum], KEYLEN_ALLCOPY);
             // It seek(s) until ref becomes the same, since it is a duplication
             // key.
             setKeyNum(keyNum);
@@ -2086,7 +2086,7 @@ bool table::isNisKey(char num) const
 {
     if ((num >= 0) && (num < (short)m_table->s->keys))
     {
-        Field* fd = m_table->key_info[num].key_part[0].field;
+        Field* fd = m_table->key_info[(int)num].key_part[0].field;
         if (fd->null_bit)
             return true;
     }
@@ -2195,7 +2195,7 @@ __int64 table::insert(bool ncc)
         m_nonNcc = !ncc;
         if (!ncc && !m_bulkInserting)
             key_copy(&m_keybuf[0], m_table->record[0],
-                     &m_table->key_info[m_keyNum], KEYLEN_ALLCOPY);
+                     &m_table->key_info[(int)m_keyNum], KEYLEN_ALLCOPY);
         
         /* Do not change to m_changed = false */
         m_changed = true;
@@ -2282,7 +2282,7 @@ void table::update(bool ncc)
                 // Only when the present key value is changed
                 if (m_keyNum >= 0)
                 {
-                    const KEY& key = m_table->key_info[m_keyNum];
+                    const KEY& key = m_table->key_info[(int)m_keyNum];
                     key_copy(&m_keybuf[0], m_table->record[0], (KEY*)&key,
                              KEYLEN_ALLCOPY);
 
@@ -2354,7 +2354,7 @@ const char* table::keyName(char keyNum)
 {
     if ((keyNum >= 0) && (keyNum < (short)m_table->s->keys))
     {
-        KEY& key = m_table->key_info[keyNum];
+        KEY& key = m_table->key_info[(int)keyNum];
         return key.name;
     }
     return "";
@@ -2387,7 +2387,7 @@ void table::endBulkInsert()
 {
     if (m_bulkInserting)
     {
-        key_copy(&m_keybuf[0], m_table->record[0], &m_table->key_info[m_keyNum],
+        key_copy(&m_keybuf[0], m_table->record[0], &m_table->key_info[(int)m_keyNum],
                  KEYLEN_ALLCOPY);
         m_bulkInserting = false;
         m_table->file->ha_release_auto_increment();
@@ -2441,7 +2441,7 @@ inline void setSegmentValue(const KEY_PART_INFO& segment, const std::string& v)
 void table::setKeyValues(const std::vector<std::string>& values, int keypart,
                          const std::string* inValue)
 {
-    KEY& key = m_table->key_info[m_keyNum];
+    KEY& key = m_table->key_info[(int)m_keyNum];
     for (int i = 0; i < (int)key.user_defined_key_parts; i++)
         if (i < (int)values.size())
             setSegmentValue(key.key_part[i], values[i]);

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

@@ -311,7 +311,7 @@ class table : private boost::noncopyable
 
     inline uint keylen() const
     {
-        return m_table->key_info[m_keyNum].key_length;
+        return m_table->key_info[(int)m_keyNum].key_length;
     }
     void setKeyValues(const uchar* ptr, int size);
     void setBlobFieldPointer(const bzs::db::blobHeader* hd);
@@ -446,7 +446,7 @@ public:
 
     inline bool isUniqueKey()
     {
-        return (m_table->key_info[m_keyNum].flags & HA_NOSAME);
+        return (m_table->key_info[(int)m_keyNum].flags & HA_NOSAME);
     }
 
     /*
@@ -475,7 +475,7 @@ public:
 
     inline key_part_map keymap()
     {
-        return (1U << m_table->key_info[m_keyNum].user_defined_key_parts) - 1;
+        return (1U << m_table->key_info[(int)m_keyNum].user_defined_key_parts) - 1;
     }
     unsigned long long tableFlags() const { return m_table->file->ha_table_flags();}
     void seekKey(enum ha_rkey_function find_flag, key_part_map keyMap);
@@ -604,7 +604,7 @@ public:
 
     inline const KEY& keyDef(char keyNum) const
     {
-        return m_table->key_info[keyNum];
+        return m_table->key_info[(int)keyNum];
     }
 
     inline const KEY* primaryKey() const

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

@@ -224,8 +224,7 @@ int dbManager::ddl_execSql(THD* thd, const std::string& sql_stmt)
     smartDbsReopen reopen(thd, m_dbs);
 
     thd->clear_error();
-    int result = dispatch_command(COM_QUERY, thd, (char*)sql_stmt.c_str(),
-                                  (uint)sql_stmt.size());
+	int result = cp_query_command(thd, (char*)sql_stmt.c_str());
     //if (!thd->cp_isOk())
     //    result = 1;
     if (thd->is_error())

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

@@ -65,6 +65,7 @@ extern "C" {
 	extern void * my_malloc(PSI_memory_key key, size_t size, myf_t flags);
 	extern void * my_realloc(PSI_memory_key key, void *ptr, size_t size, myf_t flags);
 	extern void my_free(void *ptr);
+	extern void my_claim(void *ptr);
 	extern void * my_memdup(PSI_memory_key key, const void *from, size_t length, myf_t flags);
 	extern char * my_strdup(PSI_memory_key key, const char *from, myf_t flags);
 	extern char * my_strndup(PSI_memory_key key, const char *from, size_t length, myf_t flags);
@@ -170,9 +171,12 @@ extern "C" {
 #   endif
 #endif // MySQL 5.5 Only
 
-#if ((MYSQL_VERSION_NUM > 50600) && (MYSQL_VERSION_NUM < 50700)) // MySQL 5.6 Only
+#if ((MYSQL_VERSION_NUM > 50600) && (MYSQL_VERSION_NUM < 1000000)) // MySQL 5.6.25 or later
 #   if (MYSQL_VERSION_NUM >= 50625)
 #       define FINDFILE_6PRAMS
+#		if (MYSQL_VERSION_NUM >= 50708)
+#			define MYSQL_578_LATER
+#		endif
 #   endif
 #endif
 
@@ -363,6 +367,15 @@ inline void cp_open_error_release(THD* /*thd*/, TABLE_LIST& /*tables*/)
     ;
 }
 
+inline bool cp_query_command(THD* thd, char* str)
+{
+	COM_DATA com_data;
+	com_data.com_query.query = (char*)str;
+	com_data.com_query.length = (uint)strlen(str);
+	return dispatch_command(thd, &com_data, COM_QUERY);
+}
+
+
 #else //Not MySQL 5.7
 #define OPEN_TABLE_FLAG_TYPE MYSQL_OPEN_GET_NEW_TABLE
 
@@ -461,6 +474,10 @@ inline void cp_open_error_release(THD* thd, TABLE_LIST& tables)
    
 }
 
+inline bool cp_query_command(THD* thd, char* str)
+{
+	return dispatch_command(COM_QUERY, thd, str, (uint)strlen(str));
+}
 
 #endif
 
@@ -490,7 +507,11 @@ inline void cp_open_error_release(THD* thd, TABLE_LIST& tables)
     {
 #ifdef FINDFILE_6PRAMS
         MEM_ROOT tmp_mem_root;
-        init_sql_alloc(&tmp_mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
+#		ifdef MYSQL_578_LATER
+			init_sql_alloc(key_memory_get_all_tables, &tmp_mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
+#		else
+			init_sql_alloc(&tmp_mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
+#		endif
         return find_files(thd, files, NullS,  mysql_data_home, "", true, &tmp_mem_root);
 #else
         return find_files(thd, files, NullS,  mysql_data_home, "", true);

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

@@ -139,9 +139,10 @@ THD* buildTHD()
     assert(thd->mysys_var);
 	cp_set_mysys_var(thd->mysys_var);
     thd->system_thread = NON_SYSTEM_THREAD;
+#ifndef MYSQL_578_LATER
     const NET v = { 0 };
     thd->net = v;
-
+#endif
     thd->variables.option_bits |= OPTION_BIN_LOG;
     thd->variables.tx_isolation = (ulong)getTransactdIsolation();
 
@@ -149,7 +150,7 @@ THD* buildTHD()
     char tmp[256];
     sprintf_s(tmp, 256, "set innodb_lock_wait_timeout=%d;",
               g_lock_wait_timeout);
-    dispatch_command(COM_QUERY, thd, tmp, (uint)strlen(tmp));
+	cp_query_command(thd, tmp);
 
 	
 	cp_set_db(thd, td_strdup("bizstation", MYF(0)));

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

@@ -140,7 +140,7 @@ class activeTableImple : public activeObject<map_orm>
         joinFields.resize(fnsCount);
         fieldIndexes.resize(fnsCount);
         const tabledef* td = table()->tableDef();
-        const keydef* kd = &td->keyDefs[table()->keyNum()];
+        const keydef* kd = &td->keyDefs[(int)table()->keyNum()];
         if (kd->segmentCount < fnsCount)
             THROW_BZS_ERROR_WITH_MSG(_T("Join key fields are too many.\n ")
                                      _T("Check index number and field count."));
@@ -157,9 +157,13 @@ class activeTableImple : public activeObject<map_orm>
                 if (f.len > FIXED_VALUE_BUF_SIZE)
                     THROW_BZS_ERROR_WITH_MSG(_T("Join fixed key field is too long")
                                      _T(" field.\n This field can not use join."));
-                field fd(joinFields[i].fixedValue, f, fds);
-                fd = s.c_str() +1;
-                joinFields[i].len = f.len;
+                field fd(joinFields[i].fixedValue - f.pos, f, fds);
+                size_t pos = s.find(_T(']'), 1);
+                if (pos == std::_tstring::npos)
+                    THROW_BZS_ERROR_WITH_MSG(_T("Join fixed key field is invalid format")
+                                     _T(".\n This field can not use join."));
+                fd = s.substr(1, pos - 1).c_str();
+                joinFields[i].len = f.isStringType() ? 0xff : f.len;
                 joinFields[i].type = JOIN_KEYVALUE_TYPE_PTR;
 
             }
@@ -173,7 +177,7 @@ class activeTableImple : public activeObject<map_orm>
                     convertFieldType(
                         td->fieldDefs[kd->segments[i].fieldNum].type))
                 {
-                    joinFields[i].len = fd.len;
+                    joinFields[i].len = fd.isStringType() ? 0xff : fd.len;
                     joinFields[i].type = JOIN_KEYVALUE_TYPE_PTR;
                 }
                 else
@@ -211,10 +215,16 @@ class activeTableImple : public activeObject<map_orm>
     template <class Container>
     inline void addSeekValues(row& mdl, pq_handle& q,
                   std::vector<typename Container::key_type>& fieldIndexes,
-                  std::vector<joinInfo>& joinFields)
+                  std::vector<joinInfo>& joinFields,
+                  const fielddefs* fds)
     {
         const uchar_td* ptr[8];
         int len[8];
+        uchar_td buf[MAX_KEYLEN];
+        uchar_td* buf_ptr = buf;
+        const tabledef* td = table()->tableDef();
+        const keydef* kd = &td->keyDefs[(int)table()->keyNum()];
+
         for (int i = 0; i < (int)fieldIndexes.size(); ++i)
         {
             if (fieldIndexes[i] == -1)
@@ -223,15 +233,19 @@ class activeTableImple : public activeObject<map_orm>
                 len[i] = joinFields[i].len;
             }
             else if (joinFields[i].type == JOIN_KEYVALUE_TYPE_PTR)
-            {    
+            {
                 ptr[i] = (const uchar_td*)mdl[fieldIndexes[i]].ptr();
                 len[i] = joinFields[i].len;
             }
             else
             {
-                const _TCHAR* p = mdl[fieldIndexes[i]].c_str();
-                ptr[i] = (const uchar_td*)p;
-                len[i] = (int)_tcslen(p);
+                // if target field type is different then we need convrt type
+                const fielddef& f = td->fieldDefs[kd->segments[i].fieldNum];
+                field fd(buf_ptr - f.pos, f, fds);
+                fd = mdl[fieldIndexes[i]].c_str();
+                ptr[i] = buf_ptr;
+                len[i] = f.isStringType() ? 0xff : f.len;
+                buf_ptr += f.len;
             }
         }
     
@@ -293,7 +307,7 @@ class activeTableImple : public activeObject<map_orm>
             while (it1 != ite1)
             {
                 row& mdl = *(mdls.getRow((*it1)[0]));
-                addSeekValues<Container>(mdl, stmt, fieldIndexes, joinFields);
+                addSeekValues<Container>(mdl, stmt, fieldIndexes, joinFields, fds);
                 ++it1;
             }
         }
@@ -303,7 +317,7 @@ class activeTableImple : public activeObject<map_orm>
             while (it != ite)
             {
                 row& mdl = *(*it);
-                addSeekValues<Container>(mdl, stmt, fieldIndexes, joinFields);
+                addSeekValues<Container>(mdl, stmt, fieldIndexes, joinFields, fds);
                 ++it;
             }
         }

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

@@ -1018,9 +1018,9 @@ short dbdef::fieldNumByName(short TableIndex, const _TCHAR* name)
 uint_td dbdef::fieldValidLength(eFieldQuery query, uchar_td FieldType)
 { // return MaxLen or MinLen or DefaultLen or Dec of field type
 
-    uint_td maxlen;
-    uint_td minlen;
-    uint_td defaultlen;
+    uint_td maxlen = 0;
+    uint_td minlen = 0;
+    uint_td defaultlen = 0;
     int dec = -1;
     switch (FieldType)
     {