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

Merge branch 'feature/compressData' of https://github.com/taosdata/TDengine into feature/compressData

This commit is contained in:
yihaoDeng 2024-03-08 09:12:57 +00:00
parent b304d1ea6b
commit 8004616a52
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/common/src/tmsg.c
View File

@ -7644,16 +7644,11 @@ int tEncodeSVCreateTbReq(SEncoder *pCoder, const SVCreateTbReq *pReq) {
if (tEncodeI32(pCoder, pReq->sqlLen) < 0) return -1;
if (tEncodeBinary(pCoder, pReq->sql, pReq->sqlLen) < 0) return -1;
}
<<<<<<< HEAD
// Encode Column Options: encode compress level
if (pReq->type == TSDB_SUPER_TABLE || pReq->type == TSDB_NORMAL_TABLE) {
if (tEncodeSColCmprWrapper(pCoder, &pReq->colCmpr) < 0) return -1;
}
// Encode Column Options: encode compress level
=======
if (tEncodeSColCmprWrapper(pCoder, &pReq->colCmpr) < 0) return -1;
>>>>>>> cbd4dc2961a37ce1e04a9b609d3549fbee31ab61
tEndEncode(pCoder);
return 0;
}