diff --git a/source/client/src/clientStmt.c b/source/client/src/clientStmt.c index 74aba3074b..646dab6b9f 100644 --- a/source/client/src/clientStmt.c +++ b/source/client/src/clientStmt.c @@ -471,6 +471,8 @@ int32_t stmtTryAddTableVgroupInfo(STscStmt* pStmt, int32_t* vgId) { if (TSDB_CODE_SUCCESS != code) { return code; } + + *vgId = vgInfo.vgId; return TSDB_CODE_SUCCESS; } @@ -848,9 +850,6 @@ int stmtSetTbName(TAOS_STMT* stmt, const char* tbName) { if (!pStmt->sql.stbInterlaceMode || NULL == pStmt->sql.siInfo.pDataCtx) { STMT_ERR_RET(stmtCreateRequest(pStmt)); - strncpy(pStmt->bInfo.tbName, tbName, sizeof(pStmt->bInfo.tbName) - 1); - pStmt->bInfo.tbName[sizeof(pStmt->bInfo.tbName) - 1] = 0; - STMT_ERR_RET(qCreateSName(&pStmt->bInfo.sname, tbName, pStmt->taos->acctId, pStmt->exec.pRequest->pDb, pStmt->exec.pRequest->msgBuf, pStmt->exec.pRequest->msgBufLen)); tNameExtractFullName(&pStmt->bInfo.sname, pStmt->bInfo.tbFName); @@ -858,6 +857,9 @@ int stmtSetTbName(TAOS_STMT* stmt, const char* tbName) { STMT_ERR_RET(stmtGetFromCache(pStmt)); if (pStmt->bInfo.needParse) { + strncpy(pStmt->bInfo.tbName, tbName, sizeof(pStmt->bInfo.tbName) - 1); + pStmt->bInfo.tbName[sizeof(pStmt->bInfo.tbName) - 1] = 0; + STMT_ERR_RET(stmtParseSql(pStmt)); } } else { @@ -1052,8 +1054,7 @@ int stmtBindBatch(TAOS_STMT* stmt, TAOS_MULTI_BIND* bind, int32_t colIdx) { } if (pStmt->exec.pRequest && STMT_TYPE_QUERY == pStmt->sql.type && pStmt->sql.runTimes) { - taos_free_result(pStmt->exec.pRequest); - pStmt->exec.pRequest = NULL; + pStmt->exec.pRequest->requestId++; } if (pStmt->bInfo.needParse) { diff --git a/source/libs/scheduler/src/schRemote.c b/source/libs/scheduler/src/schRemote.c index 7771dbc0ac..4b8695e8ae 100644 --- a/source/libs/scheduler/src/schRemote.c +++ b/source/libs/scheduler/src/schRemote.c @@ -1268,7 +1268,7 @@ int32_t schBuildAndSendMsg(SSchJob *pJob, SSchTask *pTask, SQueryNodeAddr *addr, SCH_ERR_RET(TSDB_CODE_SCH_INTERNAL_ERROR); } -#if 0 +#if 1 SSchTrans trans = {.pTrans = pJob->conn.pTrans, .pHandle = SCH_GET_TASK_HANDLE(pTask)}; code = schAsyncSendMsg(pJob, pTask, &trans, addr, msgType, msg, (uint32_t)msgSize, persistHandle, (rpcCtx.args ? &rpcCtx : NULL)); msg = NULL; diff --git a/tests/script/api/batchprepare.c b/tests/script/api/batchprepare.c index 0e3b50974a..773326fbb3 100644 --- a/tests/script/api/batchprepare.c +++ b/tests/script/api/batchprepare.c @@ -231,9 +231,9 @@ typedef struct { int32_t caseRunNum; // total run case num } CaseCtrl; -#if 0 +#if 1 CaseCtrl gCaseCtrl = { - .precision = TIME_PRECISION_MICRO, + .precision = TIME_PRECISION_MILLI, .bindNullNum = 0, .printCreateTblSql = true, .printQuerySql = true, @@ -256,7 +256,7 @@ CaseCtrl gCaseCtrl = { .funcIdxList = NULL, .checkParamNum = false, .runTimes = 0, - .caseIdx = 26, + .caseIdx = 24, .caseNum = 1, .caseRunIdx = -1, .caseRunNum = -1, @@ -264,11 +264,11 @@ CaseCtrl gCaseCtrl = { #endif -#if 1 +#if 0 CaseCtrl gCaseCtrl = { // default .precision = TIME_PRECISION_MILLI, .bindNullNum = 0, - .printCreateTblSql = false, + .printCreateTblSql = true, .printQuerySql = true, .printStmtSql = true, .printVerbose = false, @@ -456,9 +456,6 @@ void generateInsertSQL(BindData *data) { case TSDB_DATA_TYPE_UBIGINT: len += sprintf(data->sql + len, "tubigdata"); break; - case TSDB_DATA_TYPE_GEOMETRY: - len += sprintf(data->sql + len, "tgeometrydata"); - break; default: printf("!!!invalid tag type:%d", data->pTags[c].buffer_type); exit(1); @@ -527,9 +524,6 @@ void generateInsertSQL(BindData *data) { case TSDB_DATA_TYPE_UBIGINT: len += sprintf(data->sql + len, "ubigdata"); break; - case TSDB_DATA_TYPE_GEOMETRY: - len += sprintf(data->sql + len, "tgeometrydata"); - break; default: printf("!!!invalid col type:%d", data->pBind[c].buffer_type); exit(1); @@ -644,9 +638,6 @@ int32_t bpAppendColumnName(BindData *data, int32_t type, int32_t len) { case TSDB_DATA_TYPE_UBIGINT: return sprintf(data->sql + len, "ubigdata"); break; - case TSDB_DATA_TYPE_GEOMETRY: - len += sprintf(data->sql + len, "tgeometrydata"); - break; default: printf("!!!invalid col type:%d", type); exit(1); @@ -777,7 +768,7 @@ void generateColDataType(BindData *data, int32_t bindIdx, int32_t colIdx, int32_ *dataType = rand() % (TSDB_DATA_TYPE_MAX - 1) + 1; if (*dataType == TSDB_DATA_TYPE_JSON || *dataType == TSDB_DATA_TYPE_DECIMAL || *dataType == TSDB_DATA_TYPE_BLOB || *dataType == TSDB_DATA_TYPE_MEDIUMBLOB - || *dataType == TSDB_DATA_TYPE_VARBINARY) { + || *dataType == TSDB_DATA_TYPE_VARBINARY || *dataType == TSDB_DATA_TYPE_GEOMETRY) { continue; } @@ -806,7 +797,7 @@ void generateTagDataType(BindData *data, int32_t bindIdx, int32_t colIdx, int32_ *dataType = rand() % (TSDB_DATA_TYPE_MAX - 1) + 1; if (*dataType == TSDB_DATA_TYPE_JSON || *dataType == TSDB_DATA_TYPE_DECIMAL || *dataType == TSDB_DATA_TYPE_BLOB || *dataType == TSDB_DATA_TYPE_MEDIUMBLOB - || *dataType == TSDB_DATA_TYPE_VARBINARY) { + || *dataType == TSDB_DATA_TYPE_VARBINARY || *dataType == TSDB_DATA_TYPE_GEOMETRY) { continue; } @@ -2556,9 +2547,6 @@ void generateCreateTableSQL(char *buf, int32_t tblIdx, int32_t colNum, int32_t * case TSDB_DATA_TYPE_UBIGINT: blen += sprintf(buf + blen, "ubigdata bigint unsigned"); break; - case TSDB_DATA_TYPE_GEOMETRY: - blen += sprintf(buf + blen, "geometrydata geometry(%d)", gVarCharSize); - break; default: printf("invalid col type:%d", colList[c]); exit(1); @@ -2617,9 +2605,6 @@ void generateCreateTableSQL(char *buf, int32_t tblIdx, int32_t colNum, int32_t * case TSDB_DATA_TYPE_UBIGINT: blen += sprintf(buf + blen, "tubigdata bigint unsigned"); break; - case TSDB_DATA_TYPE_GEOMETRY: - blen += sprintf(buf + blen, "tgeometrydata geometry(%d)", gVarCharSize); - break; default: printf("invalid col type:%d", colList[c]); exit(1); @@ -2678,9 +2663,6 @@ void generateCreateTableSQL(char *buf, int32_t tblIdx, int32_t colNum, int32_t * case TSDB_DATA_TYPE_UBIGINT: blen += sprintf(buf + blen, "%d", rand() % 128); break; - case TSDB_DATA_TYPE_GEOMETRY: - blen += sprintf(buf + blen, "'geo%d'", rand() % 128); - break; default: printf("invalid col type:%d", colList[c]); exit(1);