From 45ec7eaf533fcc728b21e395412449ff904f54e6 Mon Sep 17 00:00:00 2001
From: hjxilinx <hjxilinx@163.com>
Date: Sat, 2 May 2020 22:18:32 +0800
Subject: [PATCH] [td-168] merge develop

---
 src/client/inc/tscUtil.h        | 2 +-
 src/client/src/tscParseInsert.c | 2 +-
 src/client/src/tscPrepare.c     | 2 +-
 src/client/src/tscUtil.c        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h
index 88988796e9..2b53342e74 100644
--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -136,7 +136,7 @@ void addRequiredTagColumn(STableMetaInfo* pTableMetaInfo, SColumnIndex* index);
 int32_t tscSetTableId(STableMetaInfo* pTableMetaInfo, SSQLToken* pzTableName, SSqlObj* pSql);
 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 */
 // todo remove it
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 9d2458cbc4..ab1869d233 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -1307,7 +1307,7 @@ int tsParseSql(SSqlObj *pSql, bool initialParse) {
     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
      * the error handle callback function can rightfully restore the user-defined callback function (fp).
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index 548c9392b0..fdd032d373 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -510,7 +510,7 @@ int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
   strtolower(sqlstr, sqlstr);
 
   pStmt->pSql->sqlstr = sqlstr;
-  if (tscIsInsertOrImportData(sqlstr)) {
+  if (tscIsInsertData(sqlstr)) {
     pStmt->isInsert = true;
     return insertStmtPrepare(pStmt);
   }
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 9a739333d4..8324a7470a 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -730,7 +730,7 @@ void tscCloseTscObj(STscObj* pObj) {
   tfree(pObj);
 }
 
-bool tscIsInsertOrImportData(char* sqlstr) {
+bool tscIsInsertData(char* sqlstr) {
   int32_t index = 0;
 
   do {
-- 
GitLab