提交 e6e7a89d 编写于 作者: D dapan1121

fix crash issue

上级 e2ec3fd3
...@@ -262,7 +262,8 @@ typedef struct { ...@@ -262,7 +262,8 @@ typedef struct {
uint8_t msgType; uint8_t msgType;
char reserve1[3]; // fix bus error on arm32 char reserve1[3]; // fix bus error on arm32
bool autoCreated; // create table if it is not existed during retrieve table meta in mnode bool autoCreated; // create table if it is not existed during retrieve table meta in mnode
bool subCmd;
union { union {
int32_t count; int32_t count;
int32_t numOfTablesInSubmit; int32_t numOfTablesInSubmit;
......
...@@ -497,7 +497,11 @@ void tscResetSqlCmd(SSqlCmd* pCmd, bool removeMeta) { ...@@ -497,7 +497,11 @@ void tscResetSqlCmd(SSqlCmd* pCmd, bool removeMeta) {
pCmd->pTableBlockHashList = tscDestroyBlockHashTable(pCmd->pTableBlockHashList, removeMeta); pCmd->pTableBlockHashList = tscDestroyBlockHashTable(pCmd->pTableBlockHashList, removeMeta);
pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks); pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
pCmd->pUdfInfo = tscDestroyUdfArrayList(pCmd->pUdfInfo); if (pCmd->subCmd) {
pCmd->pUdfInfo = taosArrayDestroy(pCmd->pUdfInfo);
} else {
pCmd->pUdfInfo = tscDestroyUdfArrayList(pCmd->pUdfInfo);
}
tscFreeQueryInfo(pCmd, removeMeta); tscFreeQueryInfo(pCmd, removeMeta);
} }
...@@ -2281,6 +2285,8 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t ...@@ -2281,6 +2285,8 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
SSqlCmd* pnCmd = &pNew->cmd; SSqlCmd* pnCmd = &pNew->cmd;
memcpy(pnCmd, pCmd, sizeof(SSqlCmd)); memcpy(pnCmd, pCmd, sizeof(SSqlCmd));
pnCmd->subCmd = true;
pnCmd->command = cmd; pnCmd->command = cmd;
pnCmd->payload = NULL; pnCmd->payload = NULL;
......
...@@ -51,6 +51,8 @@ typedef struct SUdfInfo { ...@@ -51,6 +51,8 @@ typedef struct SUdfInfo {
SUdfInit init; SUdfInit init;
char *content; char *content;
char *path; char *path;
bool cloned;
} SUdfInfo; } SUdfInfo;
//script //script
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册