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

Fix(insert): keep product behavior consistent with previous.

This commit is contained in:
xiao-77 2025-03-05 09:45:43 +08:00
parent 7f5d687882
commit 21269eb366
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,8 +104,8 @@ static int32_t skipTableOptions(SInsertParseContext* pCxt, const char** pSql) {
} }
// pSql -> stb_name [(tag1_name, ...)] TAGS (tag1_value, ...) // pSql -> stb_name [(tag1_name, ...)] TAGS (tag1_value, ...)
#if 0 static int32_t ignoreUsingClause(SInsertParseContext* pCxt, SVnodeModifyOpStmt* pStmt) {
static int32_t ignoreUsingClause(SInsertParseContext* pCxt, const char** pSql) { const char** pSql = &pStmt->pSql;
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
SToken token; SToken token;
NEXT_TOKEN(*pSql, token); NEXT_TOKEN(*pSql, token);
@ -140,8 +140,8 @@ static int32_t ignoreUsingClause(SInsertParseContext* pCxt, const char** pSql) {
return code; return code;
} }
#else
static int32_t ignoreUsingClause(SInsertParseContext* pCxt, SVnodeModifyOpStmt* pStmt) { static int32_t ignoreUsingClauseAndCheckTagValues(SInsertParseContext* pCxt, SVnodeModifyOpStmt* pStmt) {
const char** pSql = &pStmt->pSql; const char** pSql = &pStmt->pSql;
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
code = parseBoundTagsClause(pCxt, pStmt); code = parseBoundTagsClause(pCxt, pStmt);
@ -160,7 +160,6 @@ static int32_t ignoreUsingClause(SInsertParseContext* pCxt, SVnodeModifyOpStmt*
return code; return code;
} }
#endif
static int32_t parseDuplicateUsingClause(SInsertParseContext* pCxt, SVnodeModifyOpStmt* pStmt, bool* pDuplicate) { static int32_t parseDuplicateUsingClause(SInsertParseContext* pCxt, SVnodeModifyOpStmt* pStmt, bool* pDuplicate) {
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
@ -179,8 +178,6 @@ static int32_t parseDuplicateUsingClause(SInsertParseContext* pCxt, SVnodeModify
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS != code) {
return code; return code;
} }
SToken token;
NEXT_TOKEN(pStmt->pSql, token);
return ignoreUsingClause(pCxt, pStmt); return ignoreUsingClause(pCxt, pStmt);
} }
@ -1385,7 +1382,7 @@ static int32_t parseUsingTableNameImpl(SInsertParseContext* pCxt, SVnodeModifyOp
code = getUsingTableSchema(pCxt, pStmt, &ctbCacheHit); code = getUsingTableSchema(pCxt, pStmt, &ctbCacheHit);
if (TSDB_CODE_SUCCESS == code && ctbCacheHit) { if (TSDB_CODE_SUCCESS == code && ctbCacheHit) {
pStmt->usingTableProcessing = false; pStmt->usingTableProcessing = false;
return ignoreUsingClause(pCxt, pStmt); return ignoreUsingClauseAndCheckTagValues(pCxt, pStmt);
} }
} }
if (TSDB_CODE_SUCCESS == code && !pCxt->missCache) { if (TSDB_CODE_SUCCESS == code && !pCxt->missCache) {