Merge pull request #810 from taosdata/release/v1.6.4.0

fix some release scripts

packaging/release.sh

@@ -123,11 +123,11 @@ cd ${compile_dir}
 
 # arm only support lite ver
 if [ -z "$armver" ]; then
-  cmake ${top_dir}/../
+  cmake ../
 elif [ "$armver" == "arm64" ]; then
-  cmake ${top_dir}/../ -DVERSION=lite -DARMVER=arm64
+  cmake ../ -DARMVER=arm64
 elif [ "$armver" == "arm32" ]; then
-  cmake ${top_dir}/../ -DVERSION=lite -DARMVER=arm32
+  cmake ../ -DARMVER=arm32
 else
   echo "input parameter error!!!"
   return

packaging/tools/install.sh

@@ -313,9 +313,9 @@ vercomp () {
 
 function is_version_compatible() {
 
-    curr_version=$(${bin_dir}/taosd -V | cut -d ' ' -f 2)
+    curr_version=$(${bin_dir}/taosd -V | head -1 | cut -d ' ' -f 2)
 
-    min_compatible_version=$(${script_dir}/bin/taosd -V | cut -d ' ' -f 4)
+    min_compatible_version=$(${script_dir}/bin/taosd -V | head -1 | cut -d ' ' -f 4)
 
     vercomp $curr_version $min_compatible_version
     case $? in

packaging/tools/release_note

+taos-1.6.4.0 (Release on 2019-12-01)
+Bug fixed:
+    1.Look for possible causes of file corruption and fix them
+    2.Encapsulate memory allocation functions to reduce the possibility of crashes
+    3.Increase Arm64 compilation options
+    4.Remove most of the warnings in the code
+    5.Provide a variety of connector usage documents
+    6.Network connection can be selected in udp and tcp
+    7.Allow the maximum number of Tags to be 32
+    8.Bugs reported by the user
+
 taos-1.5.2.6 (Release on 2019-05-13)
 Bug fixed:
     - Nchar strings sometimes were wrongly truncated on Window

src/inc/tsdb.h

@@ -147,7 +147,10 @@ extern "C" {
 #define TSDB_MAX_MGMT_IPS         (TSDB_MAX_MPEERS+1)
 
 #define TSDB_REPLICA_MIN_NUM      1
-#define TSDB_REPLICA_MAX_NUM      3
+/*
+ * this is defined in CMakeList.txt
+ */
+//#define TSDB_REPLICA_MAX_NUM      3
 
 #define TSDB_TBNAME_COLUMN_INDEX       (-1)
 #define TSDB_MULTI_METERMETA_MAX_NUM    100000  // maximum batch size allowed to load metermeta

src/rpc/src/tudp.c

@@ -377,6 +377,7 @@ void *taosTransferDataViaTcp(void *argv) {
       pThead->tcp = 1;
       pThead->msgType = (char)(pHeader->msgType - 1);
       pThead->msgLen = (int32_t)htonl(sizeof(STaosHeader));
+      uint32_t id = pThead->sourceId; pThead->sourceId = pThead->destId; pThead->destId = id;
       pMonitor->ip = pTransfer->ip;
       pMonitor->port = pTransfer->port;
       pMonitor->pSet = pSet;

src/util/src/version.c

 char version[64] = "1.6.4.0";
 char compatible_version[64] = "1.6.1.0";
-char gitinfo[128] = "b6e308866e315483915f4c42a2717547ed0b9d36";
-char buildinfo[512] = "Built by ubuntu at 2019-11-26 21:56";
+char gitinfo[128] = "6d27c11e3b23ae69366df366a6517853648c41f7";
+char buildinfo[512] = "Built by ubuntu at 2019-12-01 12:27";