From c2e2529c41c2ec8ba40ffa95e1a5dd221d5e4b45 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 3 Jun 2020 10:18:14 +0800 Subject: [PATCH 1/3] fix issue deref after free in tscUtil.c [TD-511] --- src/client/src/tscUtil.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 4b9d2b920f..b8fd195aa6 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -759,10 +759,6 @@ void tscCloseTscObj(STscObj* pObj) { taosTmrStopA(&(pObj->pTimer)); tscFreeSqlObj(pSql); - if (pSql) { - sem_destroy(&pSql->rspSem); - } - pthread_mutex_destroy(&pObj->mutex); if (pObj->pDnodeConn != NULL) { From 6a05755dbf0eda59ddbc92d80d97d4eaff9ea2d7 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 3 Jun 2020 11:58:23 +0800 Subject: [PATCH 2/3] increase travis wait to 20 min [TD-513] --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f252f66a4c..b0911716c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ matrix: - make > /dev/null after_success: + - travis_wait 20 - |- case $TRAVIS_OS_NAME in linux) From 233f161f50509545bd99a398943c59c2ae40aeb3 Mon Sep 17 00:00:00 2001 From: haojun Liao Date: Wed, 3 Jun 2020 15:44:27 +0800 Subject: [PATCH 3/3] remove a printf --- src/query/src/qExecutor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 63be743ef4..1b87b691cb 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -4122,7 +4122,6 @@ static int64_t queryOnDataBlocks(SQInfo *pQInfo) { assert(pTableQueryInfo != NULL); restoreIntervalQueryRange(pRuntimeEnv, pTableQueryInfo); - printf("table:%d, groupIndex:%d, rows:%d\n", pTableQueryInfo->id.tid, pTableQueryInfo->groupIndex, blockInfo.tid); SDataStatis *pStatis = NULL;