Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
35c0cf9d
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
35c0cf9d
编写于
7月 19, 2021
作者:
W
wpan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix windows compile error
上级
15248304
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
1 addition
and
44 deletion
+1
-44
src/client/src/tscPrepare.c
src/client/src/tscPrepare.c
+1
-44
未找到文件。
src/client/src/tscPrepare.c
浏览文件 @
35c0cf9d
...
...
@@ -1010,32 +1010,12 @@ static int32_t insertStmtGenLastBlock(STableDataBlocks** lastBlock, STableDataBl
memcpy
(
*
lastBlock
,
pBlock
,
sizeof
(
STableDataBlocks
));
(
*
lastBlock
)
->
cloned
=
true
;
#if 0
void* tmp = malloc((*pBlock)->numOfAllocedParams * sizeof(SParamInfo));
memcpy(tmp, (*pBlock)->params, (*pBlock)->numOfAllocedParams * sizeof(SParamInfo));
(*pBlock)->params = tmp;
#endif
(
*
lastBlock
)
->
pData
=
NULL
;
(
*
lastBlock
)
->
ordered
=
true
;
(
*
lastBlock
)
->
prevTS
=
INT64_MIN
;
(
*
lastBlock
)
->
size
=
sizeof
(
SSubmitBlk
);
(
*
lastBlock
)
->
tsSource
=
-
1
;
#if 0
if ((*pBlock)->boundColumnInfo.boundedColumns) {
tmp = malloc((*pBlock)->boundColumnInfo.numOfCols * sizeof(int32_t));
memcpy(tmp, (*pBlock)->boundColumnInfo.boundedColumns, (*pBlock)->boundColumnInfo.numOfCols * sizeof(int32_t));
(*pBlock)->boundColumnInfo.boundedColumns = tmp;
}
if ((*pBlock)->boundColumnInfo.cols) {
tmp = malloc((*pBlock)->boundColumnInfo.numOfCols * sizeof(SBoundColumn));
memcpy(tmp, (*pBlock)->boundColumnInfo.cols, (*pBlock)->boundColumnInfo.numOfCols * sizeof(SBoundColumn));
(*pBlock)->boundColumnInfo.cols = tmp;
}
#endif
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -1054,39 +1034,16 @@ static int32_t insertStmtGenBlock(STscStmt* pStmt, STableDataBlocks** pBlock, ST
void
*
t
=
malloc
(
tsize
);
*
pBlock
=
t
;
//*pBlock = (STableDataBlocks*)malloc(sizeof(STableDataBlocks));
memcpy
(
*
pBlock
,
pStmt
->
mtb
.
lastBlock
,
sizeof
(
STableDataBlocks
));
#if 0
void* tmp = malloc((*pBlock)->numOfAllocedParams * sizeof(SParamInfo));
memcpy(tmp, (*pBlock)->params, (*pBlock)->numOfAllocedParams * sizeof(SParamInfo));
(*pBlock)->params = tmp;
#endif
t
=
(
char
*
)
t
+
sizeof
(
STableDataBlocks
);
(
*
pBlock
)
->
pTableMeta
=
t
;
memcpy
((
*
pBlock
)
->
pTableMeta
,
pTableMeta
,
msize
);
(
*
pBlock
)
->
pData
=
malloc
((
*
pBlock
)
->
nAllocSize
);
//(*pBlock)->pTableMeta = tscTableMetaDup(pTableMeta);
//(*pBlock)->pTableMeta = pTableMeta;
(
*
pBlock
)
->
vgId
=
(
*
pBlock
)
->
pTableMeta
->
vgId
;
#if 0
if ((*pBlock)->boundColumnInfo.boundedColumns) {
tmp = malloc((*pBlock)->boundColumnInfo.numOfCols * sizeof(int32_t));
memcpy(tmp, (*pBlock)->boundColumnInfo.boundedColumns, (*pBlock)->boundColumnInfo.numOfCols * sizeof(int32_t));
(*pBlock)->boundColumnInfo.boundedColumns = tmp;
}
if ((*pBlock)->boundColumnInfo.cols) {
tmp = malloc((*pBlock)->boundColumnInfo.numOfCols * sizeof(SBoundColumn));
memcpy(tmp, (*pBlock)->boundColumnInfo.cols, (*pBlock)->boundColumnInfo.numOfCols * sizeof(SBoundColumn));
(*pBlock)->boundColumnInfo.cols = tmp;
}
#endif
tNameAssign
(
&
(
*
pBlock
)
->
tableName
,
name
);
SSubmitBlk
*
blk
=
(
SSubmitBlk
*
)(
*
pBlock
)
->
pData
;
...
...
@@ -1881,7 +1838,7 @@ int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_BIND* tags
SStrToken
tname
=
{
0
};
tname
.
type
=
TK_STRING
;
tname
.
z
=
(
char
*
)
name
;
tname
.
n
=
strlen
(
name
);
tname
.
n
=
(
uint32_t
)
strlen
(
name
);
SName
fullname
=
{
0
};
tscSetTableFullName
(
&
fullname
,
&
tname
,
pSql
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录