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

fix:conflict from 3.0

This commit is contained in:
wangmm0220 2023-02-13 14:05:53 +08:00
parent b054ef9a9f
commit 997f41c854
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/client/src/clientRawBlockWrite.c
View File

@ -694,11 +694,7 @@ static int32_t taosCreateStb(TAOS* taos, void* meta, int32_t metaLen) {
pReq.numOfColumns = req.schemaRow.nCols; pReq.numOfColumns = req.schemaRow.nCols;
pReq.numOfTags = req.schemaTag.nCols; pReq.numOfTags = req.schemaTag.nCols;
pReq.commentLen = -1; pReq.commentLen = -1;
<<<<<<< HEAD
pReq.suid = processSuid(req.suid, pRequest->pDb);;
=======
pReq.suid = processSuid(req.suid, pRequest->pDb); pReq.suid = processSuid(req.suid, pRequest->pDb);
>>>>>>> 6483b92f0c645b36facfb2f3415b8df9449264cf
pReq.source = TD_REQ_FROM_TAOX; pReq.source = TD_REQ_FROM_TAOX;
pReq.igExists = true; pReq.igExists = true;