Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact

packaging/install.sh

@@ -228,6 +228,12 @@ function install_header() {
     ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
+# temp install taosBenchmark
+function install_taosTools() {
+    cd ${script_dir}/taos-tools/
+    tar xvf taosTools-1.4.1-Linux-x64.tar.gz && cd  taosTools-1.4.1/ && ./install-taostools.sh
+}
+
 function add_newHostname_to_hosts() {
   localIp="127.0.0.1"
   OLD_IFS="$IFS"
@@ -473,6 +479,7 @@ function install_TDengine() {
     install_log
     install_header
     install_lib
+    install_taosTools
 
     if [ -z $1 ]; then # install service and client
         # For installing new

packaging/release.sh

@@ -55,6 +55,7 @@ mkdir -p ${install_dir}
 mkdir -p ${install_dir}/bin
 mkdir -p ${install_dir}/lib
 mkdir -p ${install_dir}/inc
+mkdir -p ${install_dir}/taos-tools
 
 install_files="${script_dir}/install.sh"
 chmod a+x ${script_dir}/install.sh || :
@@ -68,6 +69,8 @@ cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || :
 
 cp ${compile_dir}/source/client/libtaos.so  ${install_dir}/lib/
 cp ${compile_dir}/source/libs/tdb/libtdb.so ${install_dir}/lib/
+taostoolfile="${top_dir}/tools/taosTools-1.4.1-Linux-x64.tar.gz"
+cp ${taostoolfile} ${install_dir}/taos-tools 
 
 #cp ${compile_dir}/source/dnode/mnode/impl/libmnode.so ${install_dir}/lib/
 #cp ${compile_dir}/source/dnode/qnode/libqnode.so ${install_dir}/lib/

tests/script/tsim/query/charScalarFunction.sim

@@ -266,20 +266,20 @@ if $data11 != NULL then
   return -1
 endi
 
-print ====> select c2, c3 , concat(c2,c3) from ctb6
-sql select c2, c3 , concat(c2,c3) from ctb6
-print ====> rows: $rows
-print ====> $data00 $data01 $data02
-print ====> $data10 $data11 $data12
-if $rows != 2 then
-  return -1
-endi
-if $data02 != 中文测试01中文测试01 then
-  return -1
-endi
-if $data12 != NULL then
-  return -1
-endi
+# print ====> select c2, c3 , concat(c2,c3) from ctb6
+# sql select c2, c3 , concat(c2,c3) from ctb6
+# print ====> rows: $rows
+# print ====> $data00 $data01 $data02
+# print ====> $data10 $data11 $data12
+# if $rows != 2 then
+#   return -1
+# endi
+# if $data02 != 中文测试01中文测试01 then
+#   return -1
+# endi
+# if $data12 != NULL then
+#   return -1
+# endi
 
 print ====> select c2, c3 , concat(c2,c3) from ntb6
 sql select c2, c3 , concat(c2,c3) from ntb6
@@ -304,12 +304,12 @@ print ====> $data10 $data11 $data12
 if $rows != 2 then
   return -1
 endi
-if $data02 != 中文测试01_中文测试01 then
-  return -1
-endi
-if $data12 != NULL then
+if $data02 != 中文测试1_中文测试2 then
   return -1
 endi
+# if $data12 != NULL then
+#   return -1
+# endi
 
 print ====> select c2, c3 , concat_ws('_', c2, c3) from ntb6
 sql select c2, c3 , concat_ws('_', c2, c3) from ntb6
@@ -322,40 +322,40 @@ endi
 if $data02 != 中文测试01_中文测试01 then
   return -1
 endi
-if $data12 != NULL then
-  return -1
-endi
+# if $data12 != NULL then
+#   return -1
+# endi
 
 print ====> select  c2, substr(c2,1, 4) from ctb6
 sql select  c2, substr(c2,1, 4) from ctb6
 print ====> rows: $rows
-print ====> $data00 $data01 $data02
-print ====> $data10 $data11 $data12
+print ====> $data00 $data01
+print ====> $data10 $data11
 if $rows != 2 then
   return -1
 endi
-if $data01 != 中文测试01 then
+if $data00 != 中文测试1 then
   return -1
 endi
-if $data02 != 中文测试01 then
-  return -1
-endi
-if $data11 != NULL then
+if $data01 != 中文测试 then
   return -1
 endi
+# if $data11 != NULL then
+#   return -1
+# endi
 
 print ====> select  c2, substr(c2,1, 4) from ntb6
 sql select  c2, substr(c2,1, 4) from ntb6
 print ====> rows: $rows
-print ====> $data00 $data01 $data02
-print ====> $data10 $data11 $data12
+print ====> $data00 $data01
+print ====> $data10 $data11
 if $rows != 2 then
   return -1
 endi
-if $data01 != 中文测试01 then
+if $data00 != 中文测试01 then
   return -1
 endi
-if $data02 != 中文测试01 then
+if $data01 != 中文测试 then
   return -1
 endi
 if $data11 != NULL then