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

fix: merge conflict

This commit is contained in:
Xiaoyu Wang 2022-12-07 19:12:55 +08:00
parent 9e5274df99
commit eff1b07886
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/libs/parser/src/parInsertSql.c
View File

@ -41,7 +41,7 @@ typedef struct SInsertParseContext {
SParseContext* pComCxt; SParseContext* pComCxt;
SMsgBuf msg; SMsgBuf msg;
char tmpTokenBuf[TSDB_MAX_BYTES_PER_ROW]; char tmpTokenBuf[TSDB_MAX_BYTES_PER_ROW];
SParsedDataColInfo tags; // for stmt SBoundColInfo tags; // for stmt
bool missCache; bool missCache;
bool usingDuplicateTable; bool usingDuplicateTable;
bool forceUpdate; bool forceUpdate;
@ -1846,13 +1846,11 @@ static int32_t setNextStageInfo(SInsertParseContext* pCxt, SQuery* pQuery, SCata
} }
int32_t parseInsertSql(SParseContext* pCxt, SQuery** pQuery, SCatalogReq* pCatalogReq, const SMetaData* pMetaData) { int32_t parseInsertSql(SParseContext* pCxt, SQuery** pQuery, SCatalogReq* pCatalogReq, const SMetaData* pMetaData) {
SInsertParseContext context = { SInsertParseContext context = {.pComCxt = pCxt,
.pComCxt = pCxt,
.msg = {.buf = pCxt->pMsg, .len = pCxt->msgLen}, .msg = {.buf = pCxt->pMsg, .len = pCxt->msgLen},
.missCache = false, .missCache = false,
.usingDuplicateTable = false, .usingDuplicateTable = false,
.forceUpdate = (NULL != pCatalogReq ? pCatalogReq->forceUpdate : false) .forceUpdate = (NULL != pCatalogReq ? pCatalogReq->forceUpdate : false)};
};
int32_t code = initInsertQuery(&context, pCatalogReq, pMetaData, pQuery); int32_t code = initInsertQuery(&context, pCatalogReq, pMetaData, pQuery);
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {