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

fix some review problem

This commit is contained in:
Pengrongkun 2024-11-16 09:27:52 +08:00
parent 8d5508a7a6
commit a774d3b428
3 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/tdataformat.h
View File

@ -155,7 +155,7 @@ int32_t tDecodeTag(SDecoder *pDecoder, STag **ppTag);
int32_t tTagToValArray(const STag *pTag, SArray **ppArray); int32_t tTagToValArray(const STag *pTag, SArray **ppArray);
void debugPrintSTag(STag *pTag, const char *tag, int32_t ln); // TODO: remove void debugPrintSTag(STag *pTag, const char *tag, int32_t ln); // TODO: remove
int32_t parseJsontoTagData(const char *json, SArray *pTagVals, STag **ppTag, void *pMsgBuf); int32_t parseJsontoTagData(const char *json, SArray *pTagVals, STag **ppTag, void *pMsgBuf);
int32_t parseGeotoTagData(const char *g, SArray *pTagVals, SSchema *pTagSchema, unsigned char *output); int32_t parseGeotoTagData(const char *g, SArray *pTagVals, SSchema *pTagSchema);
// SColData ================================ // SColData ================================
typedef struct { typedef struct {

28
source/libs/parser/src/parInsertStmt.c
View File

@ -189,19 +189,7 @@ int32_t qBindStmtTagsValue(void* pBlock, void* boundTags, int64_t suid, const ch
goto end; goto end;
} }
} else if (pTagSchema->type == TSDB_DATA_TYPE_GEOMETRY) { } else if (pTagSchema->type == TSDB_DATA_TYPE_GEOMETRY) {
char* tmp = taosMemoryCalloc(1, colLen); code = parseGeotoTagData(bind[c].buffer, pTagArray, pTagSchema);
if (!tmp) {
code = terrno;
goto end;
}
memcpy(tmp, bind[c].buffer, colLen);
unsigned char* out = NULL;
code = parseGeotoTagData(tmp, pTagArray, pTagSchema, out);
taosMemoryFree(tmp);
if (code != TSDB_CODE_SUCCESS) {
geosFreeBuffer(out);
goto end;
}
} else { } else {
STagVal val = {.cid = pTagSchema->colId, .type = pTagSchema->type}; STagVal val = {.cid = pTagSchema->colId, .type = pTagSchema->type};
// strcpy(val.colName, pTagSchema->name); // strcpy(val.colName, pTagSchema->name);
@ -590,19 +578,7 @@ int32_t qBindStmtTagsValue2(void* pBlock, void* boundTags, int64_t suid, const c
goto end; goto end;
} }
} else if (pTagSchema->type == TSDB_DATA_TYPE_GEOMETRY) { } else if (pTagSchema->type == TSDB_DATA_TYPE_GEOMETRY) {
char* tmp = taosMemoryCalloc(1, colLen); code = parseGeotoTagData(bind[c].buffer, pTagArray, pTagSchema);
if (!tmp) {
code = terrno;
goto end;
}
memcpy(tmp, bind[c].buffer, colLen);
unsigned char* out = NULL;
code = parseGeotoTagData(tmp, pTagArray, pTagSchema, out);
taosMemoryFree(tmp);
if (code != TSDB_CODE_SUCCESS) {
geosFreeBuffer(out);
goto end;
}
} else { } else {
STagVal val = {.cid = pTagSchema->colId, .type = pTagSchema->type}; STagVal val = {.cid = pTagSchema->colId, .type = pTagSchema->type};
// strcpy(val.colName, pTagSchema->name); // strcpy(val.colName, pTagSchema->name);

12
source/libs/parser/src/parUtil.c
View File

@ -519,13 +519,14 @@ end:
return retCode; return retCode;
} }
int32_t parseGeotoTagData(const char* g, SArray* pTagVals, SSchema* pTagSchema, unsigned char* output) { int32_t parseGeotoTagData(const char* g, SArray* pTagVals, SSchema* pTagSchema) {
int32_t code = 0; int32_t code = 0;
size_t size = 0; size_t size = 0;
STagVal val = {.cid = pTagSchema->colId, .type = pTagSchema->type}; unsigned char* output = NULL;
STagVal val = {.cid = pTagSchema->colId, .type = pTagSchema->type};
code = initCtxGeomFromText(); code = initCtxGeomFromText();
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
goto end; return code;
} }
code = doGeomFromText(g, &output, &size); code = doGeomFromText(g, &output, &size);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
@ -541,6 +542,7 @@ int32_t parseGeotoTagData(const char* g, SArray* pTagVals, SSchema* pTagSchema,
if (NULL == taosArrayPush(pTagVals, &val)) { if (NULL == taosArrayPush(pTagVals, &val)) {
code = terrno; code = terrno;
geosFreeBuffer(output);
goto end; goto end;
} }