Merge pull request #2464 from taosdata/feature/query

[td-225] fix bugs in join

src/query/src/qExecutor.c

@@ -5858,11 +5858,13 @@ static int32_t doDumpQueryResult(SQInfo *pQInfo, char *data) {
       int32_t s = lseek(fd, 0, SEEK_END);
       UNUSED(s);
       qTrace("QInfo:%p ts comp data return, file:%s, size:%d", pQInfo, pQuery->sdata[0]->data, s);
-      s = lseek(fd, 0, SEEK_SET);
-      if (s >= 0) {
+      if (lseek(fd, 0, SEEK_SET) >= 0) {
         size_t sz = read(fd, data, s);
         UNUSED(sz);
+      } else {
+        // todo handle error
       }
+
       close(fd);
       unlink(pQuery->sdata[0]->data);
     } else {

src/query/src/qtsbuf.c

@@ -884,7 +884,7 @@ void tsBufDisplay(STSBuf* pTSBuf) {
   
   while (tsBufNextPos(pTSBuf)) {
     STSElem elem = tsBufGetElem(pTSBuf);
-    printf("%d-%" PRId64 "-%" PRId64 "\n", elem.vnode, *(int64_t*) elem.tag, elem.ts);
+    printf("%d-%" PRId64 "-%" PRId64 "\n", elem.vnode, elem.tag, elem.ts);
   }
   
   pTSBuf->cur.order = old;