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

fix compile issue

This commit is contained in:
dapan1121 2022-06-10 20:11:58 +08:00
parent 7923d51f62
commit ffa069e4ed
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/client/src/clientSml.c
View File

@ -2301,18 +2301,18 @@ cleanup:
return code; return code;
} }
static int32_t isSchemalessDb(STscObj *taos, SCatalog *catalog){ static int32_t isSchemalessDb(STscObj *taos, SRequestObj* request, SCatalog *catalog){
SName name; SName name;
tNameSetDbName(&name, taos->acctId, taos->db, strlen(taos->db)); tNameSetDbName(&name, taos->acctId, taos->db, strlen(taos->db));
char dbFname[TSDB_DB_FNAME_LEN] = {0}; char dbFname[TSDB_DB_FNAME_LEN] = {0};
tNameGetFullDbName(&name, dbFname); tNameGetFullDbName(&name, dbFname);
SDbCfgInfo pInfo = {0}; SDbCfgInfo pInfo = {0};
SRequestConnInfo conn = {.pTrans = info->taos->pAppInfo->pTransporter, SRequestConnInfo conn = {.pTrans = taos->pAppInfo->pTransporter,
.requestId = info->pRequest->requestId, .requestId = request->requestId,
.requestObjRefId = info->pRequest->self, .requestObjRefId = request->self,
.mgmtEps = getEpSet_s(&info->taos->pAppInfo->mgmtEp)}; .mgmtEps = getEpSet_s(&taos->pAppInfo->mgmtEp)};
int32_t code = catalogGetDBCfg(info->pCatalog, &conn, dbFname, &pInfo); int32_t code = catalogGetDBCfg(catalog, &conn, dbFname, &pInfo);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
return code; return code;
} }
@ -2396,7 +2396,7 @@ TAOS_RES* taos_schemaless_insert(TAOS* taos, char* lines[], int numLines, int pr
goto end; goto end;
} }
if(isSchemalessDb(((STscObj *)taos), params.catalog) != TSDB_CODE_SUCCESS){ if(isSchemalessDb(((STscObj *)taos), request, params.catalog) != TSDB_CODE_SUCCESS){
request->code = TSDB_CODE_SML_INVALID_DB_CONF; request->code = TSDB_CODE_SML_INVALID_DB_CONF;
smlBuildInvalidDataMsg(&msg, "Cannot write data to a non schemaless database", NULL); smlBuildInvalidDataMsg(&msg, "Cannot write data to a non schemaless database", NULL);
goto end; goto end;