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

feat: refact tag api

This commit is contained in:
Hongze Cheng 2022-05-27 14:18:31 +00:00
parent 096e354abf
commit 806ba2cdce
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/tdataformat.h
View File

@ -60,7 +60,7 @@ int32_t tTSRowBuilderPut(STSRowBuilder *pBuilder, int32_t cid, uint8_t *pData, u
int32_t tTSRowBuilderGetRow(STSRowBuilder *pBuilder, const STSRow2 **ppRow); int32_t tTSRowBuilderGetRow(STSRowBuilder *pBuilder, const STSRow2 **ppRow);
// STag // STag
int32_t tTagNew(STagVal *pTagVals, int16_t nTag, int32_t version, int8_t isJson, STag **ppTag); int32_t tTagNew(SArray *pArray, int32_t version, int8_t isJson, STag **ppTag);
void tTagFree(STag *pTag); void tTagFree(STag *pTag);
void tTagGet(STag *pTag, STagVal *pTagVal); void tTagGet(STag *pTag, STagVal *pTagVal);
int32_t tEncodeTag(SEncoder *pEncoder, const STag *pTag); int32_t tEncodeTag(SEncoder *pEncoder, const STag *pTag);

11
source/common/src/tdataformat.c
View File

@ -579,22 +579,23 @@ static int32_t tGetTagVal(uint8_t *p, STagVal *pTagVal, int8_t isJson) {
return n; return n;
} }
int32_t tTagNew(STagVal *pTagVals, int16_t nTag, int32_t version, int8_t isJson, STag **ppTag) { int32_t tTagNew(SArray *pArray, int32_t version, int8_t isJson, STag **ppTag) {
int32_t code = 0; int32_t code = 0;
uint8_t *p = NULL; uint8_t *p = NULL;
int16_t n = 0; int16_t n = 0;
int16_t nTag = taosArrayGetSize(pArray);
int32_t szTag = sizeof(STag) + sizeof(int16_t) * nTag; int32_t szTag = sizeof(STag) + sizeof(int16_t) * nTag;
// sort // sort
if (isJson) { if (isJson) {
qsort(pTagVals, nTag, sizeof(STagVal), tTagValJsonCmprFn); qsort(pArray->pData, nTag, sizeof(STagVal), tTagValJsonCmprFn);
} else { } else {
qsort(pTagVals, nTag, sizeof(STagVal), tTagValCmprFn); qsort(pArray->pData, nTag, sizeof(STagVal), tTagValCmprFn);
} }
// get size // get size
for (int16_t iTag = 0; iTag < nTag; iTag++) { for (int16_t iTag = 0; iTag < nTag; iTag++) {
szTag += tPutTagVal(NULL, &pTagVals[iTag], isJson); szTag += tPutTagVal(NULL, (STagVal *)taosArrayGet(pArray, iTag), isJson);
} }
// TODO // TODO
@ -618,7 +619,7 @@ int32_t tTagNew(STagVal *pTagVals, int16_t nTag, int32_t version, int8_t isJson,
n = 0; n = 0;
for (int16_t iTag = 0; iTag < nTag; iTag++) { for (int16_t iTag = 0; iTag < nTag; iTag++) {
(*ppTag)->idx[iTag] = n; (*ppTag)->idx[iTag] = n;
n += tPutTagVal(p + n, &pTagVals[iTag], isJson); n += tPutTagVal(p + n, (STagVal *)taosArrayGet(pArray, iTag), isJson);
} }
return code; return code;