Merge branch 'develop' into feature/slguan

documentation/webdocs/markdowndocs/TAOS SQL-ch.md

@@ -18,6 +18,7 @@ TDengine提供类似SQL语法，用户可以在TDengine Shell中使用SQL语句
 - 插入记录时，如果时间戳为0，插入数据时使用服务器当前时间
 - Epoch Time: 时间戳也可以是一个长整数，表示从1970-01-01 08:00:00.000开始的毫秒数
 - 时间可以加减，比如 now-2h，表明查询时刻向前推2个小时(最近2小时)。数字后面的时间单位：a(毫秒), s(秒), m(分), h(小时), d(天)，w(周), n(月), y(年)。比如select * from t1 where ts > now-2w and ts <= now-1w, 表示查询两周前整整一周的数据
+- TDengine暂不支持时间窗口按照自然年和自然月切分。Where条件中的时间窗口单位的换算关系如下：interval(1y) 等效于 interval(365d), interval(1n) 等效于 interval(30d), interval(1w) 等效于 interval(7d)
 
 TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMicrosecond就可支持微秒。
 

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

@@ -1,3 +1,14 @@
+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/system/detail/src/vnodeImport.c

@@ -466,8 +466,6 @@ static int vnodeLoadNeededBlockData(SMeterObj *pObj, SImportHandle *pHandle, int
   SCompBlock *pBlock = pHandle->pBlocks + blockId;
   *code = TSDB_CODE_SUCCESS;
 
-  assert(pBlock->sversion == pObj->sversion);
-
   SVnodeObj *pVnode = vnodeList + pObj->vnode;
 
   int dfd = pBlock->last ? pVnode->lfd : pVnode->dfd;
@@ -989,6 +987,13 @@ static int vnodeMergeDataIntoFile(SImportInfo *pImport, const char *payload, int
           }
         }
 
+        int aslot = MIN(blockIter.slot, importHandle.compInfo.numOfBlocks - 1);
+        int64_t sversion = importHandle.pBlocks[aslot].sversion;
+        if (sversion != pObj->sversion) {
+          code = TSDB_CODE_OTHERS;
+          goto _error_merge;
+        }
+
         // Open the new .t file if not opened yet.
         if (pVnode->nfd <= 0) {
           if (vnodeOpenTempFilesForImport(&importHandle, pObj, fid) < 0) {

src/util/src/version.c

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