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

fix windows compile error

This commit is contained in:
wpan 2021-07-19 15:37:06 +08:00
parent 152483045b
commit 35c0cf9df0
1 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/client/src/tscPrepare.c
View File

@ -1010,32 +1010,12 @@ static int32_t insertStmtGenLastBlock(STableDataBlocks** lastBlock, STableDataBl
memcpy(*lastBlock, pBlock, sizeof(STableDataBlocks)); memcpy(*lastBlock, pBlock, sizeof(STableDataBlocks));
(*lastBlock)->cloned = true; (*lastBlock)->cloned = true;
#if 0
void* tmp = malloc((*pBlock)->numOfAllocedParams * sizeof(SParamInfo));
memcpy(tmp, (*pBlock)->params, (*pBlock)->numOfAllocedParams * sizeof(SParamInfo));
(*pBlock)->params = tmp;
#endif
(*lastBlock)->pData = NULL; (*lastBlock)->pData = NULL;
(*lastBlock)->ordered = true; (*lastBlock)->ordered = true;
(*lastBlock)->prevTS = INT64_MIN; (*lastBlock)->prevTS = INT64_MIN;
(*lastBlock)->size = sizeof(SSubmitBlk); (*lastBlock)->size = sizeof(SSubmitBlk);
(*lastBlock)->tsSource = -1; (*lastBlock)->tsSource = -1;
#if 0
if ((*pBlock)->boundColumnInfo.boundedColumns) {
tmp = malloc((*pBlock)->boundColumnInfo.numOfCols * sizeof(int32_t));
memcpy(tmp, (*pBlock)->boundColumnInfo.boundedColumns, (*pBlock)->boundColumnInfo.numOfCols * sizeof(int32_t));
(*pBlock)->boundColumnInfo.boundedColumns = tmp;
}
if ((*pBlock)->boundColumnInfo.cols) {
tmp = malloc((*pBlock)->boundColumnInfo.numOfCols * sizeof(SBoundColumn));
memcpy(tmp, (*pBlock)->boundColumnInfo.cols, (*pBlock)->boundColumnInfo.numOfCols * sizeof(SBoundColumn));
(*pBlock)->boundColumnInfo.cols = tmp;
}
#endif
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -1054,39 +1034,16 @@ static int32_t insertStmtGenBlock(STscStmt* pStmt, STableDataBlocks** pBlock, ST
void *t = malloc(tsize); void *t = malloc(tsize);
*pBlock = t; *pBlock = t;
//*pBlock = (STableDataBlocks*)malloc(sizeof(STableDataBlocks));
memcpy(*pBlock, pStmt->mtb.lastBlock, sizeof(STableDataBlocks)); memcpy(*pBlock, pStmt->mtb.lastBlock, sizeof(STableDataBlocks));
#if 0
void* tmp = malloc((*pBlock)->numOfAllocedParams * sizeof(SParamInfo));
memcpy(tmp, (*pBlock)->params, (*pBlock)->numOfAllocedParams * sizeof(SParamInfo));
(*pBlock)->params = tmp;
#endif
t = (char *)t + sizeof(STableDataBlocks); t = (char *)t + sizeof(STableDataBlocks);
(*pBlock)->pTableMeta = t; (*pBlock)->pTableMeta = t;
memcpy((*pBlock)->pTableMeta, pTableMeta, msize); memcpy((*pBlock)->pTableMeta, pTableMeta, msize);
(*pBlock)->pData = malloc((*pBlock)->nAllocSize); (*pBlock)->pData = malloc((*pBlock)->nAllocSize);
//(*pBlock)->pTableMeta = tscTableMetaDup(pTableMeta);
//(*pBlock)->pTableMeta = pTableMeta;
(*pBlock)->vgId = (*pBlock)->pTableMeta->vgId; (*pBlock)->vgId = (*pBlock)->pTableMeta->vgId;
#if 0
if ((*pBlock)->boundColumnInfo.boundedColumns) {
tmp = malloc((*pBlock)->boundColumnInfo.numOfCols * sizeof(int32_t));
memcpy(tmp, (*pBlock)->boundColumnInfo.boundedColumns, (*pBlock)->boundColumnInfo.numOfCols * sizeof(int32_t));
(*pBlock)->boundColumnInfo.boundedColumns = tmp;
}
if ((*pBlock)->boundColumnInfo.cols) {
tmp = malloc((*pBlock)->boundColumnInfo.numOfCols * sizeof(SBoundColumn));
memcpy(tmp, (*pBlock)->boundColumnInfo.cols, (*pBlock)->boundColumnInfo.numOfCols * sizeof(SBoundColumn));
(*pBlock)->boundColumnInfo.cols = tmp;
}
#endif
tNameAssign(&(*pBlock)->tableName, name); tNameAssign(&(*pBlock)->tableName, name);
SSubmitBlk* blk = (SSubmitBlk*)(*pBlock)->pData; SSubmitBlk* blk = (SSubmitBlk*)(*pBlock)->pData;
@ -1881,7 +1838,7 @@ int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_BIND* tags
SStrToken tname = {0}; SStrToken tname = {0};
tname.type = TK_STRING; tname.type = TK_STRING;
tname.z = (char *)name; tname.z = (char *)name;
tname.n = strlen(name); tname.n = (uint32_t)strlen(name);
SName fullname = {0}; SName fullname = {0};
tscSetTableFullName(&fullname, &tname, pSql); tscSetTableFullName(&fullname, &tname, pSql);