Merge pull request #824 from taosdata/hotfix/restful1

Hotfix/restful1

src/modules/http/src/httpHandle.c

@@ -293,19 +293,14 @@ bool httpReadChunkedBody(HttpContext* pContext, HttpParser* pParser) {
 int httpReadUnChunkedBody(HttpContext* pContext, HttpParser* pParser) {
   int dataReadLen = pParser->bufsize - (int)(pParser->data.pos - pParser->buffer);
   if (dataReadLen > pParser->data.len) {
-    httpError("context:%p, fd:%d, ip:%s, un-chunked body length invalid, dataReadLen:%d > pContext->data.len:%d",
-              pContext, pContext->fd, pContext->ipstr, dataReadLen, pParser->data.len);
+    httpError("context:%p, fd:%d, ip:%s, un-chunked body length invalid, read size:%d dataReadLen:%d > pContext->data.len:%d",
+              pContext, pContext->fd, pContext->ipstr, pContext->parser.bufsize, dataReadLen, pParser->data.len);
     httpSendErrorResp(pContext, HTTP_PARSE_BODY_ERROR);
     return HTTP_CHECK_BODY_ERROR;
   } else if (dataReadLen < pParser->data.len) {
-    httpTrace("context:%p, fd:%d, ip:%s, un-chunked body not finished, dataReadLen:%d < pContext->data.len:%d, continue read",
-              pContext, pContext->fd, pContext->ipstr, dataReadLen, pParser->data.len);
-    if (!httpReadDataImp(pContext)) {
-      httpError("context:%p, fd:%d, ip:%s, read chunked request error", pContext, pContext->fd, pContext->ipstr);
-      return HTTP_CHECK_BODY_ERROR;
-    } else {
-      return HTTP_CHECK_BODY_CONTINUE;
-    }
+    httpTrace("context:%p, fd:%d, ip:%s, un-chunked body not finished, read size:%d dataReadLen:%d < pContext->data.len:%d, continue read",
+              pContext, pContext->fd, pContext->ipstr, pContext->parser.bufsize, dataReadLen, pParser->data.len);
+    return HTTP_CHECK_BODY_CONTINUE;
   } else {
     return HTTP_CHECK_BODY_SUCCESS;
   }

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) {