Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
63a23a35
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
63a23a35
编写于
1月 17, 2023
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: insert into select can't be stopped issue
上级
60800c77
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
26 addition
and
9 deletion
+26
-9
source/client/src/clientMain.c
source/client/src/clientMain.c
+1
-2
source/client/src/clientStmt.c
source/client/src/clientStmt.c
+1
-5
source/libs/parser/src/parInsertStmt.c
source/libs/parser/src/parInsertStmt.c
+22
-1
source/util/src/tlog.c
source/util/src/tlog.c
+1
-0
tests/script/api/batchprepare.c
tests/script/api/batchprepare.c
+1
-1
未找到文件。
source/client/src/clientMain.c
浏览文件 @
63a23a35
...
...
@@ -509,9 +509,8 @@ void taos_stop_query(TAOS_RES *res) {
SRequestObj
*
pRequest
=
(
SRequestObj
*
)
res
;
pRequest
->
killed
=
true
;
int32_t
numOfFields
=
taos_num_fields
(
pRequest
);
// It is not a query, no need to stop.
if
(
numOfFields
==
0
)
{
if
(
NULL
==
pRequest
->
pQuery
||
QUERY_EXEC_MODE_SCHEDULE
!=
pRequest
->
pQuery
->
execMode
)
{
tscDebug
(
"request 0x%"
PRIx64
" no need to be killed since not query"
,
pRequest
->
requestId
);
return
;
}
...
...
source/client/src/clientStmt.c
浏览文件 @
63a23a35
...
...
@@ -300,11 +300,7 @@ int32_t stmtCleanExecInfo(STscStmt* pStmt, bool keepTable, bool deepClean) {
continue
;
}
if
(
STMT_TYPE_MULTI_INSERT
==
pStmt
->
sql
.
type
)
{
qFreeStmtDataBlock
(
pBlocks
);
}
else
{
qDestroyStmtDataBlock
(
pBlocks
);
}
taosHashRemove
(
pStmt
->
exec
.
pBlockHash
,
key
,
keyLen
);
pIter
=
taosHashIterate
(
pStmt
->
exec
.
pBlockHash
,
pIter
);
...
...
source/libs/parser/src/parInsertStmt.c
浏览文件 @
63a23a35
...
...
@@ -425,6 +425,27 @@ int32_t qCloneStmtDataBlock(void** pDst, void* pSrc) {
pBlock
->
pTableMeta
=
pNewMeta
;
}
if
(
pBlock
->
boundColumnInfo
.
boundColumns
)
{
int32_t
size
=
pBlock
->
boundColumnInfo
.
numOfCols
*
sizeof
(
col_id_t
);
void
*
tmp
=
taosMemoryMalloc
(
size
);
memcpy
(
tmp
,
pBlock
->
boundColumnInfo
.
boundColumns
,
size
);
pBlock
->
boundColumnInfo
.
boundColumns
=
tmp
;
}
if
(
pBlock
->
boundColumnInfo
.
cols
)
{
int32_t
size
=
pBlock
->
boundColumnInfo
.
numOfCols
*
sizeof
(
SBoundColumn
);
void
*
tmp
=
taosMemoryMalloc
(
size
);
memcpy
(
tmp
,
pBlock
->
boundColumnInfo
.
cols
,
size
);
pBlock
->
boundColumnInfo
.
cols
=
tmp
;
}
if
(
pBlock
->
boundColumnInfo
.
colIdxInfo
)
{
int32_t
size
=
pBlock
->
boundColumnInfo
.
numOfBound
*
sizeof
(
SBoundIdxInfo
);
void
*
tmp
=
taosMemoryMalloc
(
size
);
memcpy
(
tmp
,
pBlock
->
boundColumnInfo
.
colIdxInfo
,
size
);
pBlock
->
boundColumnInfo
.
colIdxInfo
=
tmp
;
}
return
qResetStmtDataBlock
(
*
pDst
,
false
);
}
...
...
@@ -437,7 +458,7 @@ int32_t qRebuildStmtDataBlock(void** pDst, void* pSrc, uint64_t uid, int32_t vgI
STableDataBlocks
*
pBlock
=
(
STableDataBlocks
*
)
*
pDst
;
pBlock
->
pData
=
taosMemoryMalloc
(
pBlock
->
nAllocSize
);
if
(
NULL
==
pBlock
->
pData
)
{
q
Free
StmtDataBlock
(
pBlock
);
q
Destroy
StmtDataBlock
(
pBlock
);
return
TSDB_CODE_OUT_OF_MEMORY
;
}
...
...
source/util/src/tlog.c
浏览文件 @
63a23a35
...
...
@@ -897,6 +897,7 @@ void taosLogCrashInfo(char* nodeType, char* pMsg, int64_t msgLen, int signum, vo
pFile
=
taosOpenFile
(
filepath
,
TD_FILE_CREATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
taosPrintLog
(
flags
,
level
,
dflag
,
"failed to open file:%s since %s"
,
filepath
,
terrstr
());
goto
_return
;
}
...
...
tests/script/api/batchprepare.c
浏览文件 @
63a23a35
...
...
@@ -2828,7 +2828,7 @@ void runAll(TAOS *taos) {
printf
(
"%s Begin
\n
"
,
gCaseCtrl
.
caseCatalog
);
runCaseList
(
taos
);
#if
0
#if
1
strcpy
(
gCaseCtrl
.
caseCatalog
,
"Micro DB precision Test"
);
printf
(
"%s Begin
\n
"
,
gCaseCtrl
.
caseCatalog
);
gCaseCtrl
.
precision
=
TIME_PRECISION_MICRO
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录