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

fix compile error

This commit is contained in:
Hongze Cheng 2024-02-27 10:08:02 +08:00
parent 793ee02cbc
commit ac1d7c2bdb
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/common/src/trow.c
View File

@ -17,8 +17,8 @@
#include "trow.h" #include "trow.h"
#include "tlog.h" #include "tlog.h"
static bool tdSTSRowIterGetTpVal(STSRowIter *pIter, col_type_t colType, int32_t offset, 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); static bool tdSTSRowIterGetKvVal(STSRowIter *pIter, col_id_t colId, col_id_t *nIdx, SCellVal *pVal);
void tdSTSRowIterInit(STSRowIter *pIter, STSchema *pSchema) { void tdSTSRowIterInit(STSRowIter *pIter, STSchema *pSchema) {
pIter->pSchema = 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; return true;
} }
bool tdSTSRowIterNext(STSRowIter *pIter, SCellVal *pVal) { bool tdSTSRowIterNext(STSRowIter *pIter, SCellVal *pVal) {
if (pIter->colIdx >= pIter->pSchema->numOfCols) { if (pIter->colIdx >= pIter->pSchema->numOfCols) {
return false; return false;
@ -481,7 +480,8 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow, int8_t r
} }
} else { } else {
varDataLen += sizeof(VarDataLenT); 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; varDataLen += CHAR_BYTES;
if (maxVarDataLen < CHAR_BYTES + sizeof(VarDataLenT)) { if (maxVarDataLen < CHAR_BYTES + sizeof(VarDataLenT)) {
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 { } else {
if(pColVal && COL_VAL_IS_VALUE(pColVal)) { if (pColVal && COL_VAL_IS_VALUE(pColVal)) {
nonVarDataLen += TYPE_BYTES[pTColumn->type]; 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) + rowTotalLen = sizeof(STSRow) + sizeof(col_id_t) + varDataLen + nonVarDataLen + (nBound - 1) * sizeof(SKvRowIdx) +
TD_BITMAP_BYTES(nBound - 1); TD_BITMAP_BYTES(nBound - 1);
} }
if (!(*ppRow)) { if (!(*ppRow)) {
*ppRow = (STSRow *)taosMemoryCalloc(1, rowTotalLen); *ppRow = (STSRow *)taosMemoryCalloc(1, rowTotalLen);
isAlloc = true; isAlloc = true;
} }
if (!(*ppRow)) { if (!(*ppRow)) {
@ -1084,8 +1084,6 @@ int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT valType, int
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
void tTSRowGetVal(STSRow *pRow, STSchema *pTSchema, int16_t iCol, SColVal *pColVal) { void tTSRowGetVal(STSRow *pRow, STSchema *pTSchema, int16_t iCol, SColVal *pColVal) {
STColumn *pTColumn = &pTSchema->columns[iCol]; STColumn *pTColumn = &pTSchema->columns[iCol];
SCellVal cv = {0}; 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); *pColVal = COL_VAL_NULL(pTColumn->colId, pTColumn->type);
} else { } else {
pColVal->cid = pTColumn->colId; pColVal->cid = pTColumn->colId;
pColVal->type = pTColumn->type;
pColVal->flag = CV_FLAG_VALUE; pColVal->flag = CV_FLAG_VALUE;
pColVal->value.type = pTColumn->type;
if (IS_VAR_DATA_TYPE(pTColumn->type)) { if (IS_VAR_DATA_TYPE(pTColumn->type)) {
pColVal->value.nData = varDataLen(cv.val); pColVal->value.nData = varDataLen(cv.val);
pColVal->value.pData = varDataVal(cv.val); pColVal->value.pData = varDataVal(cv.val);

30
source/common/test/dataformatTest.cpp
View File

@ -143,73 +143,73 @@ static int32_t genTestData(const char **data, int16_t nCols, SArray **pArray) {
} }
switch (i) { switch (i) {
case 0: case 0:
colVal.type = TSDB_DATA_TYPE_TIMESTAMP; colVal.value.type = TSDB_DATA_TYPE_TIMESTAMP;
sscanf(data[i], "%" PRIi64, &colVal.value.val); sscanf(data[i], "%" PRIi64, &colVal.value.val);
break; break;
case 1: case 1:
colVal.type = TSDB_DATA_TYPE_INT; colVal.value.type = TSDB_DATA_TYPE_INT;
sscanf(data[i], "%" PRIi32, (int32_t *)&colVal.value.val); sscanf(data[i], "%" PRIi32, (int32_t *)&colVal.value.val);
break; break;
case 2: case 2:
colVal.type = TSDB_DATA_TYPE_BIGINT; colVal.value.type = TSDB_DATA_TYPE_BIGINT;
sscanf(data[i], "%" PRIi64, &colVal.value.val); sscanf(data[i], "%" PRIi64, &colVal.value.val);
break; break;
case 3: case 3:
colVal.type = TSDB_DATA_TYPE_FLOAT; colVal.value.type = TSDB_DATA_TYPE_FLOAT;
sscanf(data[i], "%f", (float *)&colVal.value.val); sscanf(data[i], "%f", (float *)&colVal.value.val);
break; break;
case 4: case 4:
colVal.type = TSDB_DATA_TYPE_DOUBLE; colVal.value.type = TSDB_DATA_TYPE_DOUBLE;
sscanf(data[i], "%lf", (double *)&colVal.value.val); sscanf(data[i], "%lf", (double *)&colVal.value.val);
break; break;
case 5: { case 5: {
colVal.type = TSDB_DATA_TYPE_BINARY; colVal.value.type = TSDB_DATA_TYPE_BINARY;
int16_t dataLen = strlen(data[i]) + 1; int16_t dataLen = strlen(data[i]) + 1;
colVal.value.nData = dataLen < 10 ? dataLen : 10; colVal.value.nData = dataLen < 10 ? dataLen : 10;
colVal.value.pData = (uint8_t *)data[i]; colVal.value.pData = (uint8_t *)data[i];
} break; } break;
case 6: { case 6: {
colVal.type = TSDB_DATA_TYPE_NCHAR; colVal.value.type = TSDB_DATA_TYPE_NCHAR;
int16_t dataLen = strlen(data[i]) + 1; int16_t dataLen = strlen(data[i]) + 1;
colVal.value.nData = dataLen < 40 ? dataLen : 40; colVal.value.nData = dataLen < 40 ? dataLen : 40;
colVal.value.pData = (uint8_t *)data[i]; // just for test, not real nchar colVal.value.pData = (uint8_t *)data[i]; // just for test, not real nchar
} break; } break;
case 7: { case 7: {
colVal.type = TSDB_DATA_TYPE_TINYINT; colVal.value.type = TSDB_DATA_TYPE_TINYINT;
int32_t d8; int32_t d8;
sscanf(data[i], "%" PRId32, &d8); sscanf(data[i], "%" PRId32, &d8);
colVal.value.val = (int8_t)d8; colVal.value.val = (int8_t)d8;
} }
case 8: { case 8: {
colVal.type = TSDB_DATA_TYPE_SMALLINT; colVal.value.type = TSDB_DATA_TYPE_SMALLINT;
int32_t d16; int32_t d16;
sscanf(data[i], "%" PRId32, &d16); sscanf(data[i], "%" PRId32, &d16);
colVal.value.val = (int16_t)d16; colVal.value.val = (int16_t)d16;
} break; } break;
case 9: { case 9: {
colVal.type = TSDB_DATA_TYPE_BOOL; colVal.value.type = TSDB_DATA_TYPE_BOOL;
int32_t d8; int32_t d8;
sscanf(data[i], "%" PRId32, &d8); sscanf(data[i], "%" PRId32, &d8);
colVal.value.val = (int8_t)d8; colVal.value.val = (int8_t)d8;
} break; } break;
case 10: { case 10: {
colVal.type = TSDB_DATA_TYPE_UTINYINT; colVal.value.type = TSDB_DATA_TYPE_UTINYINT;
uint32_t u8; uint32_t u8;
sscanf(data[i], "%" PRId32, &u8); sscanf(data[i], "%" PRId32, &u8);
colVal.value.val = (uint8_t)u8; colVal.value.val = (uint8_t)u8;
} break; } break;
case 11: { case 11: {
colVal.type = TSDB_DATA_TYPE_USMALLINT; colVal.value.type = TSDB_DATA_TYPE_USMALLINT;
uint32_t u16; uint32_t u16;
sscanf(data[i], "%" PRId32, &u16); sscanf(data[i], "%" PRId32, &u16);
colVal.value.val = (uint16_t)u16; colVal.value.val = (uint16_t)u16;
} break; } break;
case 12: { case 12: {
colVal.type = TSDB_DATA_TYPE_UINT; colVal.value.type = TSDB_DATA_TYPE_UINT;
sscanf(data[i], "%" PRIu32, (uint32_t *)&colVal.value.val); sscanf(data[i], "%" PRIu32, (uint32_t *)&colVal.value.val);
} break; } break;
case 13: { case 13: {
colVal.type = TSDB_DATA_TYPE_UBIGINT; colVal.value.type = TSDB_DATA_TYPE_UBIGINT;
sscanf(data[i], "%" PRIu64, (uint64_t *)&colVal.value.val); sscanf(data[i], "%" PRIu64, (uint64_t *)&colVal.value.val);
} break; } break;
default: default:
@ -430,7 +430,7 @@ static void checkTSRow(const char **data, STSRow *row, STSchema *pTSchema) {
} }
colVal.cid = pCol->colId; colVal.cid = pCol->colId;
colVal.type = pCol->type; colVal.value.type = pCol->type;
if (tdValTypeIsNone(cv.valType)) { if (tdValTypeIsNone(cv.valType)) {
colVal.flag = CV_FLAG_NONE; colVal.flag = CV_FLAG_NONE;
} else if (tdValTypeIsNull(cv.valType)) { } else if (tdValTypeIsNull(cv.valType)) {