[TD-20]

CMakeLists.txt

@@ -309,7 +309,7 @@ IF (NOT DEFINED TD_CLUSTER)
       INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taos.h DESTINATION include)
       INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
       INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
-      INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)    
+      INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)      
       INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/${DB_CLIENT_NAME}.exe DESTINATION .)  
       #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
       #INSTALL(TARGETS shell RUNTIME DESTINATION .)

packaging/tools/install.sh

@@ -156,7 +156,10 @@ function install_lib() {
     ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
     ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
     
-	if [ "$verMode" == "cluster" ]; then
+	  if [ "$verMode" == "cluster" ]; then	  
+        ${csudo} rm -f ${lib_link_dir}/libtaosodbc.*     || :
+	      ${csudo} ln -s ${install_main_dir}/driver/libtaosodbc.so ${lib_link_dir}/libtaosodbc.so || :
+	
         # Compatible with version 1.5
         ${csudo} mkdir -p ${v15_java_app_dir}
         ${csudo} ln -s ${install_main_dir}/connector/taos-jdbcdriver-1.0.2-dist.jar ${v15_java_app_dir}/JDBCDriver-1.0.2-dist.jar

packaging/tools/install_client.sh

@@ -10,6 +10,7 @@ set -e
 
 osType=Linux
 pagMode=full
+verMode=edge
 
 if [ "$osType" != "Darwin" ]; then
     script_dir=$(dirname $(readlink -f "$0"))
@@ -105,14 +106,19 @@ function clean_lib() {
 
 function install_lib() {
     # Remove links
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
-    ${csudo} rm -rf ${v15_java_app_dir}                         || :
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :    
+    ${csudo} rm -rf ${v15_java_app_dir}              || :
 
     ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
 
     if [ "$osType" != "Darwin" ]; then
         ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
         ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+
+	      if [ "$verMode" == "cluster" ]; then	  
+            ${csudo} rm -f ${lib_link_dir}/libtaosodbc.*     || :
+	          ${csudo} ln -s ${install_main_dir}/driver/libtaosodbc.so ${lib_link_dir}/libtaosodbc.so || :	
+        fi            
     else
         ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
         ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib

packaging/tools/makeclient.sh

@@ -65,7 +65,12 @@ if [ "$osType" != "Darwin" ]; then
   else  
     bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${build_dir}/bin/${DB_CLIENT_NAME}dump ${script_dir}/remove_client.sh"
   fi
-  lib_files="${build_dir}/lib/libtaos.so.${version}"
+  
+  if [ "$verMode" == "cluster" ]; then
+    lib_files="${build_dir}/lib/libtaos.so.${version} ${build_dir}/lib/libtaosodbc.so"
+  else
+    lib_files="${build_dir}/lib/libtaos.so.${version}"
+  fi  
 else
   bin_files="${build_dir}/bin/${DB_CLIENT_NAME} ${script_dir}/remove_client.sh"
   lib_files="${build_dir}/lib/libtaos.${version}.dylib"
@@ -108,6 +113,11 @@ if [ "$pagMode" == "lite" ]; then
     mv install_client_temp.sh ${install_dir}/install_client.sh
 fi
 
+if [ "$verMode" == "cluster" ]; then
+    sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install_client.sh >> install_client_temp.sh
+    mv install_client_temp.sh ${install_dir}/install_client.sh
+fi
+
 sed -i "s/DB_CLIENT_NAME/${DB_CLIENT_NAME}/g"   ${install_dir}/install_client.sh
 sed -i "s/DB_SERVICE_NAME/${DB_SERVICE_NAME}/g" ${install_dir}/install_client.sh
 sed -i "s/DB_FULL_NAME/${DB_FULL_NAME}/g"       ${install_dir}/install_client.sh

packaging/tools/makepkg.sh

@@ -57,7 +57,12 @@ else
   bin_files="${build_dir}/bin/${DB_SERVICE_NAME} ${build_dir}/bin/${DB_CLIENT_NAME} ${build_dir}/bin/${DB_CLIENT_NAME}demo ${build_dir}/bin/${DB_CLIENT_NAME}dump ${script_dir}/remove.sh"
 fi
 
-lib_files="${build_dir}/lib/libtaos.so.${version}"
+if [ "$verMode" == "cluster" ]; then
+  lib_files="${build_dir}/lib/libtaos.so.${version} ${build_dir}/lib/libtaosodbc.so"
+else 
+  lib_files="${build_dir}/lib/libtaos.so.${version}"
+fi
+
 header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
 cfg_dir="${top_dir}/packaging/cfg"
 install_files="${script_dir}/install.sh"

packaging/tools/remove.sh

@@ -71,18 +71,19 @@ function clean_bin() {
 function clean_lib() {
     # Remove link
     ${csudo} rm -f ${lib_link_dir}/libtaos.*      || :
-    ${csudo} rm -rf ${v15_java_app_dir}                      || :
+    ${csudo} rm -f ${lib_link_dir}/libtaosodbc.*  || :
+    ${csudo} rm -rf ${v15_java_app_dir}           || :
 }
 
 function clean_header() {
     # Remove link
-    ${csudo} rm -f ${inc_link_dir}/taos.h       || :
-    ${csudo} rm -f ${inc_link_dir}/taoserror.h       || :
+    ${csudo} rm -f ${inc_link_dir}/taos.h         || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h    || :
 }
 
 function clean_config() {
     # Remove link
-    ${csudo} rm -f ${cfg_link_dir}/*            || :    
+    ${csudo} rm -f ${cfg_link_dir}/*             || :    
 }
 
 function clean_log() {

packaging/tools/remove_client.sh

@@ -36,20 +36,21 @@ function kill_client() {
 function clean_bin() {
     # Remove link
     ${csudo} rm -f ${bin_link_dir}/taos      || :
-    ${csudo} rm -f ${bin_link_dir}/taosump  || :
+    ${csudo} rm -f ${bin_link_dir}/taosump   || :
     ${csudo} rm -f ${bin_link_dir}/rmtaos    || :
 }
 
 function clean_lib() {
     # Remove link
     ${csudo} rm -f ${lib_link_dir}/libtaos.*      || :
-    ${csudo} rm -rf ${v15_java_app_dir}                      || :
+    ${csudo} rm -f ${lib_link_dir}/libtaosodbc.*  || :
+    ${csudo} rm -rf ${v15_java_app_dir}           || :
 }
 
 function clean_header() {
     # Remove link
     ${csudo} rm -f ${inc_link_dir}/taos.h       || :
-    ${csudo} rm -f ${inc_link_dir}/taoserror.h       || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h  || :
 }
 
 function clean_config() {