Merge pull request #3039 from taosdata/develop

Merge from develop into TD-1115_hotfix

src/inc/taosdef.h

@@ -242,6 +242,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_MAX_BYTES_PER_ROW    16384
 #define TSDB_MAX_TAGS_LEN         16384
 #define TSDB_MAX_TAGS             128
+#define TSDB_MAX_TAG_CONDITIONS   1024
 
 #define TSDB_AUTH_LEN             16
 #define TSDB_KEY_LEN              16

src/kit/shell/src/shellEngine.c

@@ -379,6 +379,10 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
   }
   */
 
+#ifdef WINDOWS
+  if (tt < 0) tt = 0;
+#endif
+
   struct tm* ptm = localtime(&tt);
   size_t pos = strftime(buf, 32, "%Y-%m-%d %H:%M:%S", ptm);
 

src/plugins/monitor/src/monitorMain.c

@@ -35,7 +35,7 @@
 
 #define SQL_LENGTH     1024
 #define LOG_LEN_STR    100
-#define IP_LEN_STR     18
+#define IP_LEN_STR     TSDB_EP_LEN
 #define CHECK_INTERVAL 1000
 
 typedef enum {

src/query/src/qExecutor.c

@@ -5547,7 +5547,7 @@ static int32_t buildAirthmeticExprFromMsg(SExprInfo *pArithExprInfo, SQueryTable
   qDebug("qmsg:%p create arithmetic expr from binary string: %s", pQueryMsg, pArithExprInfo->base.arg[0].argValue.pz);
 
   tExprNode* pExprNode = NULL;
-  TRY(TSDB_MAX_TAGS) {
+  TRY(TSDB_MAX_TAG_CONDITIONS) {
     pExprNode = exprTreeFromBinary(pArithExprInfo->base.arg[0].argValue.pz, pArithExprInfo->base.arg[0].argBytes);
   } CATCH( code ) {
     CLEANUP_EXECUTE();

src/tsdb/src/tsdbRead.c

@@ -1115,14 +1115,6 @@ static void doMergeTwoLevelData(STsdbQueryHandle* pQueryHandle, STableCheckInfo*
 
   TSKEY* tsArray = pCols->cols[0].pData;
 
-  if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
-    TSKEY s = tsArray[cur->pos];
-    assert(s >= pQueryHandle->window.skey && s <= pQueryHandle->window.ekey);
-  } else {
-    TSKEY s = tsArray[cur->pos];
-    assert(s <= pQueryHandle->window.skey && s >= pQueryHandle->window.ekey);
-  }
-
   // for search the endPos, so the order needs to reverse
   int32_t order = (pQueryHandle->order == TSDB_ORDER_ASC)? TSDB_ORDER_DESC:TSDB_ORDER_ASC;
 
@@ -2381,7 +2373,7 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, TSKEY skey, co
   int32_t ret = TSDB_CODE_SUCCESS;
   tExprNode* expr = NULL;
 
-  TRY(TSDB_MAX_TAGS) {
+  TRY(TSDB_MAX_TAG_CONDITIONS) {
     expr = exprTreeFromTableName(tbnameCond);
     if (expr == NULL) {
       expr = exprTreeFromBinary(pTagCond, len);
@@ -2575,4 +2567,4 @@ static int tsdbCheckInfoCompar(const void* key1, const void* key2) {
     ASSERT(false);
     return 0;
   }
-}
\ No newline at end of file
+}

src/util/src/version.c

-char version[12] = "2.0.0.0";
+char version[12] = "2.0.0.6";
 char compatible_version[12] = "2.0.0.0";
-char gitinfo[48] = "8df8b7d9930342dd34ba13df160a7d538fad7bc7";
-char gitinfoOfInternal[48] = "bad4f040145fba581d1ab0c5dd718a5ede3e209f";
-char buildinfo[64] = "Built by root at 2020-08-03 17:23";
+char gitinfo[48] = "e9a20fafbe9e3b0b12cbdf55604163b4b9a41b41";
+char gitinfoOfInternal[48] = "dd679db0b9edeedad68574c1e031544711a9831f";
+char buildinfo[64] = "Built by  at 2020-08-12 07:59";
 
-void libtaos_2_0_0_0_Linux_x64() {};
+void libtaos_2_0_0_6_Linux_x64() {};

tests/tsim/src/simExe.c

@@ -791,6 +791,10 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
               }
               */
 
+#ifdef WINDOWS
+              if (tt < 0) tt = 0;
+#endif
+
               tp = localtime(&tt);
               strftime(timeStr, 64, "%y-%m-%d %H:%M:%S", tp);
               sprintf(value, "%s.%03d", timeStr,