Merge branch 'develop' of git://github.com/taosdata/TDengine into develop

CMakeLists.txt

@@ -163,7 +163,7 @@ IF (NOT DEFINED TD_CLUSTER)
     SET(RELEASE_FLAGS "-O0")
     IF (NOT TD_ARM)
       IF (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -g -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
       ELSE ()
         SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -malign-stringops -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
       ENDIF ()
@@ -207,7 +207,11 @@ IF (NOT DEFINED TD_CLUSTER)
     ADD_DEFINITIONS(-DPTW32_BUILD)
     ADD_DEFINITIONS(-D_MBCS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
   ELSEIF (TD_DARWIN_64)
-    SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+    IF (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+      SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -g -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+    ELSE ()
+      SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -malign-stringops -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+    ENDIF ()
     SET(DEBUG_FLAGS "-O0 -DDEBUG")
     SET(RELEASE_FLAGS "-O0")
     ADD_DEFINITIONS(-DDARWIN)

src/connector/grafana/tdengine/dist/datasource.js

@@ -136,8 +136,10 @@ var GenericDatasource = exports.GenericDatasource = function () {
       if (options != null && options.range != null && options.range.to != null) {
         queryEnd = options.range.to.toISOString();
       }
-      var intervalMs = options.intervalMs || "20000";
-
+      var intervalMs = Math.max(options.intervalMs,15000);
+      if (isNaN(intervalMs)) {
+        intervalMs = 15000;
+      }
       intervalMs += "a";
       sql = sql.replace(/^\s+|\s+$/gm, '');
       sql = sql.replace("$from", "'" + queryStart + "'");

src/connector/grafana/tdengine/src/datasource.js

@@ -110,8 +110,10 @@ export class GenericDatasource {
     if (options != null && options.range != null && options.range.to != null){
       queryEnd = options.range.to.toISOString();
     }
-    var intervalMs = options.intervalMs || "20000";
-
+    var intervalMs = Math.max(options.intervalMs,15000);
+    if (isNaN(intervalMs)) {
+      intervalMs = 15000;
+    }
     intervalMs += "a";
     sql = sql.replace(/^\s+|\s+$/gm, '');
     sql = sql.replace("$from", "'" + queryStart + "'");

src/modules/http/src/gcJson.c

@@ -126,10 +126,10 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
 
     // for group by
     if (groupFields != -1) {
-      char target[HTTP_GC_TARGET_SIZE];
+      char target[HTTP_GC_TARGET_SIZE] = {0};
       int len;
-      len = snprintf(target,HTTP_GC_TARGET_SIZE,"%s{",aliasBuffer);
-      for (int i = dataFields + 1; i<num_fields; i++){
+      len = snprintf(target, HTTP_GC_TARGET_SIZE, "%s{", aliasBuffer);
+      for (int i = dataFields + 1; i < num_fields; i++) {
           switch (fields[i].type) {
           case TSDB_DATA_TYPE_BOOL:
           case TSDB_DATA_TYPE_TINYINT:
@@ -152,7 +152,9 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
             break;
           case TSDB_DATA_TYPE_BINARY:
           case TSDB_DATA_TYPE_NCHAR:
-            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%s", fields[i].name, (char *)row[i]);
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:", fields[i].name);
+            memcpy(target + len, (char *) row[i], fields[i].bytes);
+            len = strlen(target);
             break;
           default:
             len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%s", fields[i].name, "-");

src/system/detail/src/vnodeCommit.c

@@ -97,7 +97,7 @@ int vnodeRenewCommitLog(int vnode) {
 
 void vnodeRemoveCommitLog(int vnode) { remove(vnodeList[vnode].logOFn); }
 
-size_t vnodeRestoreDataFromLog(int vnode, char *fileName, uint64_t *firstV) {
+int32_t vnodeRestoreDataFromLog(int vnode, char *fileName, uint64_t *firstV) {
   int    fd, ret;
   char * cont = NULL;
   size_t totalLen = 0;
@@ -204,7 +204,7 @@ _error:
 }
 
 int vnodeInitCommit(int vnode) {
-  size_t     size = 0;
+  int32_t    size = 0;
   uint64_t   firstV = 0;
   SVnodeObj *pVnode = vnodeList + vnode;
 

src/system/detail/src/vnodeShell.c

@@ -456,6 +456,9 @@ void vnodeExecuteRetrieveReq(SSchedMsg *pSched) {
       taosSendSimpleRsp(pObj->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
       goto _exit;
     }
+  } else {
+    taosSendSimpleRsp(pObj->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, code);
+    goto _exit;
   }
 
   pMsg = pStart;