Merge branch 'hotfix/#523' of https://github.com/taosdata/TDengine into hotfix/#523

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/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;