xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #2464 from taosdata/feature/query 

[td-225] fix bugs in join
This commit is contained in:
Shengliang Guan 2020-06-27 18:05:18 +08:00 committed by GitHub
parent 38ce13015c 1d3a13b4c9
commit 108e53f431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/query/src/qExecutor.c
View File

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

2
src/query/src/qtsbuf.c
View File

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