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

[td-168] merge develop

This commit is contained in:
hjxilinx 2020-05-02 22:18:32 +08:00
parent c7215cf1c8
commit 45ec7eaf53
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/inc/tscUtil.h
View File

@ -136,7 +136,7 @@ void addRequiredTagColumn(STableMetaInfo* pTableMetaInfo, SColumnIndex* index);
int32_t tscSetTableId(STableMetaInfo* pTableMetaInfo, SSQLToken* pzTableName, SSqlObj* pSql); int32_t tscSetTableId(STableMetaInfo* pTableMetaInfo, SSQLToken* pzTableName, SSqlObj* pSql);
void tscClearInterpInfo(SQueryInfo* pQueryInfo); void tscClearInterpInfo(SQueryInfo* pQueryInfo);
bool tscIsInsertOrImportData(char* sqlstr); bool tscIsInsertData(char* sqlstr);
/* use for keep current db info temporarily, for handle table with db prefix */ /* use for keep current db info temporarily, for handle table with db prefix */
// todo remove it // todo remove it

2
src/client/src/tscParseInsert.c
View File

@ -1307,7 +1307,7 @@ int tsParseSql(SSqlObj *pSql, bool initialParse) {
tscTrace("continue parse sql: %s", pSql->cmd.curSql); tscTrace("continue parse sql: %s", pSql->cmd.curSql);
} }
if (tscIsInsertOrImportData(pSql->sqlstr)) { if (tscIsInsertData(pSql->sqlstr)) {
/* /*
* Set the fp before parse the sql string, in case of getTableMeta failed, in which * Set the fp before parse the sql string, in case of getTableMeta failed, in which
* the error handle callback function can rightfully restore the user-defined callback function (fp). * the error handle callback function can rightfully restore the user-defined callback function (fp).

2
src/client/src/tscPrepare.c
View File

@ -510,7 +510,7 @@ int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
strtolower(sqlstr, sqlstr); strtolower(sqlstr, sqlstr);
pStmt->pSql->sqlstr = sqlstr; pStmt->pSql->sqlstr = sqlstr;
if (tscIsInsertOrImportData(sqlstr)) { if (tscIsInsertData(sqlstr)) {
pStmt->isInsert = true; pStmt->isInsert = true;
return insertStmtPrepare(pStmt); return insertStmtPrepare(pStmt);
} }

2
src/client/src/tscUtil.c
View File

@ -730,7 +730,7 @@ void tscCloseTscObj(STscObj* pObj) {
tfree(pObj); tfree(pObj);
} }
bool tscIsInsertOrImportData(char* sqlstr) { bool tscIsInsertData(char* sqlstr) {
int32_t index = 0; int32_t index = 0;
do { do {