Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
c30ab489
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c30ab489
编写于
6月 09, 2022
作者:
X
xywang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: super table info not removed after dropped by another client
上级
918e12b8
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
29 addition
and
1 deletion
+29
-1
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+1
-0
src/client/src/tscAsync.c
src/client/src/tscAsync.c
+16
-1
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+4
-0
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+8
-0
未找到文件。
src/client/inc/tsclient.h
浏览文件 @
c30ab489
...
@@ -294,6 +294,7 @@ typedef struct {
...
@@ -294,6 +294,7 @@ typedef struct {
SQueryInfo
*
active
;
// current active query info
SQueryInfo
*
active
;
// current active query info
int32_t
batchSize
;
// for parameter ('?') binding and batch processing
int32_t
batchSize
;
// for parameter ('?') binding and batch processing
int32_t
resColumnId
;
int32_t
resColumnId
;
SArray
*
hashedTableNames
;
}
SSqlCmd
;
}
SSqlCmd
;
typedef
struct
{
typedef
struct
{
...
...
src/client/src/tscAsync.c
浏览文件 @
c30ab489
...
@@ -336,6 +336,7 @@ void tscAsyncResultOnError(SSqlObj* pSql) {
...
@@ -336,6 +336,7 @@ void tscAsyncResultOnError(SSqlObj* pSql) {
}
}
int
tscSendMsgToServer
(
SSqlObj
*
pSql
);
int
tscSendMsgToServer
(
SSqlObj
*
pSql
);
void
tscClearTableMeta
(
SSqlObj
*
pSql
);
void
tscTableMetaCallBack
(
void
*
param
,
TAOS_RES
*
res
,
int
code
)
{
void
tscTableMetaCallBack
(
void
*
param
,
TAOS_RES
*
res
,
int
code
)
{
SSqlObj
*
pSql
=
(
SSqlObj
*
)
taosAcquireRef
(
tscObjRef
,
(
int64_t
)
param
);
SSqlObj
*
pSql
=
(
SSqlObj
*
)
taosAcquireRef
(
tscObjRef
,
(
int64_t
)
param
);
...
@@ -355,6 +356,10 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
...
@@ -355,6 +356,10 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
size_t
sz
=
strlen
(
tscGetErrorMsgPayload
(
&
sub
->
cmd
));
size_t
sz
=
strlen
(
tscGetErrorMsgPayload
(
&
sub
->
cmd
));
tscAllocPayload
(
&
pSql
->
cmd
,
(
int
)
sz
+
1
);
tscAllocPayload
(
&
pSql
->
cmd
,
(
int
)
sz
+
1
);
memcpy
(
tscGetErrorMsgPayload
(
&
pSql
->
cmd
),
tscGetErrorMsgPayload
(
&
sub
->
cmd
),
sz
);
memcpy
(
tscGetErrorMsgPayload
(
&
pSql
->
cmd
),
tscGetErrorMsgPayload
(
&
sub
->
cmd
),
sz
);
}
else
if
(
code
==
TSDB_CODE_MND_INVALID_TABLE_NAME
)
{
if
(
sub
->
cmd
.
command
==
TSDB_SQL_MULTI_META
)
{
tscClearTableMeta
(
pSql
);
}
}
}
goto
_error
;
goto
_error
;
}
}
...
@@ -421,3 +426,13 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
...
@@ -421,3 +426,13 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
tscAsyncResultOnError
(
pSql
);
tscAsyncResultOnError
(
pSql
);
taosReleaseRef
(
tscObjRef
,
pSql
->
self
);
taosReleaseRef
(
tscObjRef
,
pSql
->
self
);
}
}
void
tscClearTableMeta
(
SSqlObj
*
pSql
)
{
SSqlCmd
*
pCmd
=
&
pSql
->
cmd
;
int32_t
n
=
taosArrayGetSize
(
pCmd
->
hashedTableNames
);
for
(
int32_t
i
=
0
;
i
<
n
;
i
++
)
{
char
*
t
=
taosArrayGetP
(
pCmd
->
hashedTableNames
,
i
);
taosHashRemove
(
UTIL_GET_TABLEMETA
(
pSql
),
t
,
strlen
(
t
));
}
}
src/client/src/tscSQLParser.c
浏览文件 @
c30ab489
...
@@ -9434,6 +9434,7 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
...
@@ -9434,6 +9434,7 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfo
(
pCmd
);
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfo
(
pCmd
);
pCmd
->
pTableMetaMap
=
taosHashInit
(
4
,
taosGetDefaultHashFunction
(
TSDB_DATA_TYPE_BINARY
),
false
,
HASH_NO_LOCK
);
pCmd
->
pTableMetaMap
=
taosHashInit
(
4
,
taosGetDefaultHashFunction
(
TSDB_DATA_TYPE_BINARY
),
false
,
HASH_NO_LOCK
);
pCmd
->
hashedTableNames
=
taosArrayInit
(
4
,
POINTER_BYTES
);
tableNameList
=
taosArrayInit
(
4
,
sizeof
(
SName
));
tableNameList
=
taosArrayInit
(
4
,
sizeof
(
SName
));
size_t
size
=
taosArrayGetSize
(
pInfo
->
list
);
size_t
size
=
taosArrayGetSize
(
pInfo
->
list
);
...
@@ -9501,6 +9502,9 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
...
@@ -9501,6 +9502,9 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
char
*
t
=
strdup
(
name
);
char
*
t
=
strdup
(
name
);
taosArrayPush
(
pVgroupList
,
&
t
);
taosArrayPush
(
pVgroupList
,
&
t
);
tscDebug
(
"0x%"
PRIx64
" failed to retrieve stable %s vgroup id list in cache, try fetch from mnode"
,
pSql
->
self
,
name
);
tscDebug
(
"0x%"
PRIx64
" failed to retrieve stable %s vgroup id list in cache, try fetch from mnode"
,
pSql
->
self
,
name
);
char
*
tb
=
strdup
(
name
);
taosArrayPush
(
pCmd
->
hashedTableNames
,
&
tb
);
}
else
{
}
else
{
tFilePage
*
pdata
=
(
tFilePage
*
)
pv
;
tFilePage
*
pdata
=
(
tFilePage
*
)
pv
;
pVgroupIdList
=
taosArrayInit
((
size_t
)
pdata
->
num
,
sizeof
(
int32_t
));
pVgroupIdList
=
taosArrayInit
((
size_t
)
pdata
->
num
,
sizeof
(
int32_t
));
...
...
src/client/src/tscUtil.c
浏览文件 @
c30ab489
...
@@ -1609,6 +1609,10 @@ void destroyTableNameList(SInsertStatementParam* pInsertParam) {
...
@@ -1609,6 +1609,10 @@ void destroyTableNameList(SInsertStatementParam* pInsertParam) {
tfree
(
pInsertParam
->
pTableNameList
);
tfree
(
pInsertParam
->
pTableNameList
);
}
}
static
void
freeElem
(
void
*
p
)
{
tfree
(
*
(
char
**
)
p
);
}
void
tscResetSqlCmd
(
SSqlCmd
*
pCmd
,
bool
clearCachedMeta
,
uint64_t
id
)
{
void
tscResetSqlCmd
(
SSqlCmd
*
pCmd
,
bool
clearCachedMeta
,
uint64_t
id
)
{
SSqlObj
*
pSql
=
(
SSqlObj
*
)
taosAcquireRef
(
tscObjRef
,
id
);
SSqlObj
*
pSql
=
(
SSqlObj
*
)
taosAcquireRef
(
tscObjRef
,
id
);
pCmd
->
command
=
0
;
pCmd
->
command
=
0
;
...
@@ -1624,6 +1628,10 @@ void tscResetSqlCmd(SSqlCmd* pCmd, bool clearCachedMeta, uint64_t id) {
...
@@ -1624,6 +1628,10 @@ void tscResetSqlCmd(SSqlCmd* pCmd, bool clearCachedMeta, uint64_t id) {
tfree
(
pCmd
->
insertParam
.
tagData
.
data
);
tfree
(
pCmd
->
insertParam
.
tagData
.
data
);
pCmd
->
insertParam
.
tagData
.
dataLen
=
0
;
pCmd
->
insertParam
.
tagData
.
dataLen
=
0
;
if
(
pCmd
->
hashedTableNames
)
{
taosArrayDestroyEx
(
&
pCmd
->
hashedTableNames
,
freeElem
);
}
tscFreeQueryInfo
(
pCmd
,
clearCachedMeta
,
id
);
tscFreeQueryInfo
(
pCmd
,
clearCachedMeta
,
id
);
pCmd
->
pTableMetaMap
=
tscCleanupTableMetaMap
(
pCmd
->
pTableMetaMap
);
pCmd
->
pTableMetaMap
=
tscCleanupTableMetaMap
(
pCmd
->
pTableMetaMap
);
taosReleaseRef
(
tscObjRef
,
id
);
taosReleaseRef
(
tscObjRef
,
id
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录