From ac1d7c2bdba33b027af257b1fde7c7599a675221 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Tue, 27 Feb 2024 10:08:02 +0800 Subject: [PATCH] fix compile error --- source/common/src/trow.c | 20 ++++++++---------- source/common/test/dataformatTest.cpp | 30 +++++++++++++-------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/source/common/src/trow.c b/source/common/src/trow.c index 6e9278c630..13409585c6 100644 --- a/source/common/src/trow.c +++ b/source/common/src/trow.c @@ -17,8 +17,8 @@ #include "trow.h" #include "tlog.h" -static bool tdSTSRowIterGetTpVal(STSRowIter *pIter, col_type_t colType, int32_t offset, SCellVal *pVal); -static bool tdSTSRowIterGetKvVal(STSRowIter *pIter, col_id_t colId, col_id_t *nIdx, SCellVal *pVal); +static bool tdSTSRowIterGetTpVal(STSRowIter *pIter, col_type_t colType, int32_t offset, SCellVal *pVal); +static bool tdSTSRowIterGetKvVal(STSRowIter *pIter, col_id_t colId, col_id_t *nIdx, SCellVal *pVal); void tdSTSRowIterInit(STSRowIter *pIter, STSchema *pSchema) { pIter->pSchema = pSchema; @@ -416,7 +416,6 @@ bool tdSTpRowGetVal(STSRow *pRow, col_id_t colId, col_type_t colType, int32_t fl return true; } - bool tdSTSRowIterNext(STSRowIter *pIter, SCellVal *pVal) { if (pIter->colIdx >= pIter->pSchema->numOfCols) { return false; @@ -481,7 +480,8 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow, int8_t r } } else { varDataLen += sizeof(VarDataLenT); - if (pTColumn->type == TSDB_DATA_TYPE_VARCHAR || pTColumn->type == TSDB_DATA_TYPE_VARBINARY || pTColumn->type == TSDB_DATA_TYPE_GEOMETRY) { + if (pTColumn->type == TSDB_DATA_TYPE_VARCHAR || pTColumn->type == TSDB_DATA_TYPE_VARBINARY || + pTColumn->type == TSDB_DATA_TYPE_GEOMETRY) { varDataLen += CHAR_BYTES; if (maxVarDataLen < CHAR_BYTES + sizeof(VarDataLenT)) { maxVarDataLen = CHAR_BYTES + sizeof(VarDataLenT); @@ -494,7 +494,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow, int8_t r } } } else { - if(pColVal && COL_VAL_IS_VALUE(pColVal)) { + if (pColVal && COL_VAL_IS_VALUE(pColVal)) { nonVarDataLen += TYPE_BYTES[pTColumn->type]; } } @@ -510,9 +510,9 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow, int8_t r rowTotalLen = sizeof(STSRow) + sizeof(col_id_t) + varDataLen + nonVarDataLen + (nBound - 1) * sizeof(SKvRowIdx) + TD_BITMAP_BYTES(nBound - 1); } - if (!(*ppRow)) { - *ppRow = (STSRow *)taosMemoryCalloc(1, rowTotalLen); - isAlloc = true; + if (!(*ppRow)) { + *ppRow = (STSRow *)taosMemoryCalloc(1, rowTotalLen); + isAlloc = true; } if (!(*ppRow)) { @@ -1084,8 +1084,6 @@ int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT valType, int return TSDB_CODE_SUCCESS; } - - void tTSRowGetVal(STSRow *pRow, STSchema *pTSchema, int16_t iCol, SColVal *pColVal) { STColumn *pTColumn = &pTSchema->columns[iCol]; SCellVal cv = {0}; @@ -1106,9 +1104,9 @@ void tTSRowGetVal(STSRow *pRow, STSchema *pTSchema, int16_t iCol, SColVal *pColV *pColVal = COL_VAL_NULL(pTColumn->colId, pTColumn->type); } else { pColVal->cid = pTColumn->colId; - pColVal->type = pTColumn->type; pColVal->flag = CV_FLAG_VALUE; + pColVal->value.type = pTColumn->type; if (IS_VAR_DATA_TYPE(pTColumn->type)) { pColVal->value.nData = varDataLen(cv.val); pColVal->value.pData = varDataVal(cv.val); diff --git a/source/common/test/dataformatTest.cpp b/source/common/test/dataformatTest.cpp index 8bc7d47ebf..2dfa706728 100644 --- a/source/common/test/dataformatTest.cpp +++ b/source/common/test/dataformatTest.cpp @@ -143,73 +143,73 @@ static int32_t genTestData(const char **data, int16_t nCols, SArray **pArray) { } switch (i) { case 0: - colVal.type = TSDB_DATA_TYPE_TIMESTAMP; + colVal.value.type = TSDB_DATA_TYPE_TIMESTAMP; sscanf(data[i], "%" PRIi64, &colVal.value.val); break; case 1: - colVal.type = TSDB_DATA_TYPE_INT; + colVal.value.type = TSDB_DATA_TYPE_INT; sscanf(data[i], "%" PRIi32, (int32_t *)&colVal.value.val); break; case 2: - colVal.type = TSDB_DATA_TYPE_BIGINT; + colVal.value.type = TSDB_DATA_TYPE_BIGINT; sscanf(data[i], "%" PRIi64, &colVal.value.val); break; case 3: - colVal.type = TSDB_DATA_TYPE_FLOAT; + colVal.value.type = TSDB_DATA_TYPE_FLOAT; sscanf(data[i], "%f", (float *)&colVal.value.val); break; case 4: - colVal.type = TSDB_DATA_TYPE_DOUBLE; + colVal.value.type = TSDB_DATA_TYPE_DOUBLE; sscanf(data[i], "%lf", (double *)&colVal.value.val); break; case 5: { - colVal.type = TSDB_DATA_TYPE_BINARY; + colVal.value.type = TSDB_DATA_TYPE_BINARY; int16_t dataLen = strlen(data[i]) + 1; colVal.value.nData = dataLen < 10 ? dataLen : 10; colVal.value.pData = (uint8_t *)data[i]; } break; case 6: { - colVal.type = TSDB_DATA_TYPE_NCHAR; + colVal.value.type = TSDB_DATA_TYPE_NCHAR; int16_t dataLen = strlen(data[i]) + 1; colVal.value.nData = dataLen < 40 ? dataLen : 40; colVal.value.pData = (uint8_t *)data[i]; // just for test, not real nchar } break; case 7: { - colVal.type = TSDB_DATA_TYPE_TINYINT; + colVal.value.type = TSDB_DATA_TYPE_TINYINT; int32_t d8; sscanf(data[i], "%" PRId32, &d8); colVal.value.val = (int8_t)d8; } case 8: { - colVal.type = TSDB_DATA_TYPE_SMALLINT; + colVal.value.type = TSDB_DATA_TYPE_SMALLINT; int32_t d16; sscanf(data[i], "%" PRId32, &d16); colVal.value.val = (int16_t)d16; } break; case 9: { - colVal.type = TSDB_DATA_TYPE_BOOL; + colVal.value.type = TSDB_DATA_TYPE_BOOL; int32_t d8; sscanf(data[i], "%" PRId32, &d8); colVal.value.val = (int8_t)d8; } break; case 10: { - colVal.type = TSDB_DATA_TYPE_UTINYINT; + colVal.value.type = TSDB_DATA_TYPE_UTINYINT; uint32_t u8; sscanf(data[i], "%" PRId32, &u8); colVal.value.val = (uint8_t)u8; } break; case 11: { - colVal.type = TSDB_DATA_TYPE_USMALLINT; + colVal.value.type = TSDB_DATA_TYPE_USMALLINT; uint32_t u16; sscanf(data[i], "%" PRId32, &u16); colVal.value.val = (uint16_t)u16; } break; case 12: { - colVal.type = TSDB_DATA_TYPE_UINT; + colVal.value.type = TSDB_DATA_TYPE_UINT; sscanf(data[i], "%" PRIu32, (uint32_t *)&colVal.value.val); } break; case 13: { - colVal.type = TSDB_DATA_TYPE_UBIGINT; + colVal.value.type = TSDB_DATA_TYPE_UBIGINT; sscanf(data[i], "%" PRIu64, (uint64_t *)&colVal.value.val); } break; default: @@ -430,7 +430,7 @@ static void checkTSRow(const char **data, STSRow *row, STSchema *pTSchema) { } colVal.cid = pCol->colId; - colVal.type = pCol->type; + colVal.value.type = pCol->type; if (tdValTypeIsNone(cv.valType)) { colVal.flag = CV_FLAG_NONE; } else if (tdValTypeIsNull(cv.valType)) {