From 7f56eb9de3af7461d1d0318ba09dc464242bba37 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 15:29:30 +0800 Subject: [PATCH] [TD-225]fix compiler error. --- src/inc/ttype.h | 70 +++++++++++++++++++-------------------- src/query/src/qExecutor.c | 11 ------ 2 files changed, 35 insertions(+), 46 deletions(-) diff --git a/src/inc/ttype.h b/src/inc/ttype.h index 32638ebb9d..3a70a970e3 100644 --- a/src/inc/ttype.h +++ b/src/inc/ttype.h @@ -67,41 +67,41 @@ typedef struct tstr { } \ } while (0) -#define SET_TYPED_DATA(_v, _type, _data) \ - do { \ - switch (_type) { \ - case TSDB_DATA_TYPE_BOOL: \ - case TSDB_DATA_TYPE_TINYINT: \ - *(int8_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_UTINYINT: \ - *(uint8_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_SMALLINT: \ - *(int16_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_USMALLINT: \ - *(uint16_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_BIGINT: \ - *(int64_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_UBIGINT: \ - *(uint64_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_FLOAT: \ - *(float *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_DOUBLE: \ - *(double *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_UINT: \ - *(uint32_t *)(_v) = (_data); \ - break; \ - default: \ - *(int32_t *)(_v) = (_data); \ - break; \ - } \ +#define SET_TYPED_DATA(_v, _type, _data) \ + do { \ + switch (_type) { \ + case TSDB_DATA_TYPE_BOOL: \ + case TSDB_DATA_TYPE_TINYINT: \ + *(int8_t *)(_v) = (int8_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_UTINYINT: \ + *(uint8_t *)(_v) = (uint8_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_SMALLINT: \ + *(int16_t *)(_v) = (int16_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_USMALLINT: \ + *(uint16_t *)(_v) = (uint16_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_BIGINT: \ + *(int64_t *)(_v) = (int64_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_UBIGINT: \ + *(uint64_t *)(_v) = (uint64_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_FLOAT: \ + *(float *)(_v) = (float)(_data); \ + break; \ + case TSDB_DATA_TYPE_DOUBLE: \ + *(double *)(_v) = (double)(_data); \ + break; \ + case TSDB_DATA_TYPE_UINT: \ + *(uint32_t *)(_v) = (uint32_t)(_data); \ + break; \ + default: \ + *(int32_t *)(_v) = (_data); \ + break; \ + } \ } while (0) #define IS_SIGNED_NUMERIC_TYPE(_t) ((_t) >= TSDB_DATA_TYPE_TINYINT && (_t) <= TSDB_DATA_TYPE_BIGINT) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 77eb4e1cc7..33e13d77cc 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -5805,18 +5805,7 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) { } } - // TODO opt performance -// if (isPointInterpoQuery(pQuery)) { -// SArray *prev = tsdbGetExternalRow(pRuntimeEnv->pQueryHandle, &pQInfo->memRef, TSDB_PREV_ROW); -// -// for(int32_t i = 0; i < pQuery->numOfCols; ++i) { -// SColumnInfoData *p = taosArrayGet(prev, i); -// memcpy(pRuntimeEnv->prevRow[i], p->pData, p->info.bytes); -// } -// } - scanOneTableDataBlocks(pRuntimeEnv, newStartKey); - finalizeQueryResult(pRuntimeEnv); // skip offset result rows -- GitLab