From 04ad350559252ca5af1f31971b93382045d613f1 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 27 Jun 2020 17:05:08 +0800 Subject: [PATCH 1/2] [td-225] fix bugs in join --- src/query/src/qExecutor.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index cdb56e1469..e72034eb62 100644 --- a/src/query/src/qExecutor.c +++ b/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 { From 1d3a13b4c97d7471c2bb23203c20fe123127e44e Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 27 Jun 2020 17:08:20 +0800 Subject: [PATCH 2/2] [td-225] fix bugs in display data --- src/query/src/qtsbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query/src/qtsbuf.c b/src/query/src/qtsbuf.c index 1b589a0085..2ea27fbb53 100644 --- a/src/query/src/qtsbuf.c +++ b/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;