Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
93992a76
T
TDengine
项目概览
哥们要飞
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
93992a76
编写于
8月 14, 2020
作者:
B
Bomin Zhang
提交者:
GitHub
8月 14, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3067 from taosdata/bugfix/td-1142
Bugfix/td-1142
上级
19a8d7e2
dce8ec16
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
36 addition
and
26 deletion
+36
-26
src/client/src/tscPrepare.c
src/client/src/tscPrepare.c
+7
-5
src/client/src/tscSub.c
src/client/src/tscSub.c
+8
-6
tests/examples/c/makefile
tests/examples/c/makefile
+13
-11
tests/examples/c/prepare.c
tests/examples/c/prepare.c
+7
-3
tests/examples/c/subscribe.c
tests/examples/c/subscribe.c
+1
-1
未找到文件。
src/client/src/tscPrepare.c
浏览文件 @
93992a76
...
@@ -613,11 +613,13 @@ int taos_stmt_execute(TAOS_STMT* stmt) {
...
@@ -613,11 +613,13 @@ int taos_stmt_execute(TAOS_STMT* stmt) {
if
(
sql
==
NULL
)
{
if
(
sql
==
NULL
)
{
ret
=
TSDB_CODE_TSC_OUT_OF_MEMORY
;
ret
=
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
else
{
}
else
{
taosTFree
(
pStmt
->
pSql
->
sqlstr
);
if
(
pStmt
->
pSql
!=
NULL
)
{
pStmt
->
pSql
->
sqlstr
=
sql
;
taos_free_result
(
pStmt
->
pSql
);
SSqlObj
*
pSql
=
taos_query
((
TAOS
*
)
pStmt
->
taos
,
pStmt
->
pSql
->
sqlstr
);
pStmt
->
pSql
=
NULL
;
ret
=
taos_errno
(
pSql
);
}
taos_free_result
(
pSql
);
pStmt
->
pSql
=
taos_query
((
TAOS
*
)
pStmt
->
taos
,
sql
);
ret
=
taos_errno
(
pStmt
->
pSql
);
free
(
sql
);
}
}
}
}
return
ret
;
return
ret
;
...
...
src/client/src/tscSub.c
浏览文件 @
93992a76
...
@@ -405,16 +405,20 @@ TAOS_SUB *taos_subscribe(TAOS *taos, int restart, const char* topic, const char
...
@@ -405,16 +405,20 @@ TAOS_SUB *taos_subscribe(TAOS *taos, int restart, const char* topic, const char
return
pSub
;
return
pSub
;
}
}
void
taos_free_result_imp
(
SSqlObj
*
pSql
,
int
keepCmd
);
TAOS_RES
*
taos_consume
(
TAOS_SUB
*
tsub
)
{
TAOS_RES
*
taos_consume
(
TAOS_SUB
*
tsub
)
{
SSub
*
pSub
=
(
SSub
*
)
tsub
;
SSub
*
pSub
=
(
SSub
*
)
tsub
;
if
(
pSub
==
NULL
)
return
NULL
;
if
(
pSub
==
NULL
)
return
NULL
;
tscSaveSubscriptionProgress
(
pSub
);
tscSaveSubscriptionProgress
(
pSub
);
SSqlObj
*
pSql
=
pSub
->
pSql
;
SSqlObj
*
pSql
=
pSub
->
pSql
;
SSqlRes
*
pRes
=
&
pSql
->
res
;
SSqlRes
*
pRes
=
&
pSql
->
res
;
SSqlCmd
*
pCmd
=
&
pSql
->
cmd
;
STableMetaInfo
*
pTableMetaInfo
=
tscGetTableMetaInfoFromCmd
(
pCmd
,
pCmd
->
clauseIndex
,
0
);
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfoDetail
(
pCmd
,
0
);
if
(
taosArrayGetSize
(
pSub
->
progress
)
>
0
)
{
// fix crash in single tabel subscription
pQueryInfo
->
window
.
skey
=
((
SSubscriptionProgress
*
)
taosArrayGet
(
pSub
->
progress
,
0
))
->
key
;
}
if
(
pSub
->
pTimer
==
NULL
)
{
if
(
pSub
->
pTimer
==
NULL
)
{
int64_t
duration
=
taosGetTimestampMs
()
-
pSub
->
lastConsumeTime
;
int64_t
duration
=
taosGetTimestampMs
()
-
pSub
->
lastConsumeTime
;
...
@@ -436,8 +440,6 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
...
@@ -436,8 +440,6 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
tscDebug
(
"table synchronization completed"
);
tscDebug
(
"table synchronization completed"
);
}
}
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfoDetail
(
&
pSql
->
cmd
,
0
);
uint32_t
type
=
pQueryInfo
->
type
;
uint32_t
type
=
pQueryInfo
->
type
;
tscFreeSqlResult
(
pSql
);
tscFreeSqlResult
(
pSql
);
pRes
->
numOfRows
=
1
;
pRes
->
numOfRows
=
1
;
...
@@ -445,7 +447,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
...
@@ -445,7 +447,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
pSql
->
cmd
.
command
=
TSDB_SQL_SELECT
;
pSql
->
cmd
.
command
=
TSDB_SQL_SELECT
;
pQueryInfo
->
type
=
type
;
pQueryInfo
->
type
=
type
;
tscGetTableMetaInfoFromCmd
(
&
pSql
->
cmd
,
0
,
0
)
->
vgroupIndex
=
0
;
pTableMetaInfo
->
vgroupIndex
=
0
;
pSql
->
fp
=
asyncCallback
;
pSql
->
fp
=
asyncCallback
;
pSql
->
fetchFp
=
asyncCallback
;
pSql
->
fetchFp
=
asyncCallback
;
...
...
tests/examples/c/makefile
浏览文件 @
93992a76
...
@@ -4,22 +4,24 @@
...
@@ -4,22 +4,24 @@
ROOT
=
./
ROOT
=
./
TARGET
=
exe
TARGET
=
exe
LFLAGS
=
'-Wl,-rpath,/usr/local/taos/driver/'
-ltaos
-lpthread
-lm
-lrt
LFLAGS
=
'-Wl,-rpath,/usr/local/taos/driver/'
-ltaos
-lpthread
-lm
-lrt
CFLAGS
=
-O3
-g
-Wall
-Wno-deprecated
-fPIC
-Wno-unused-result
-Wconversion
-Wno-char-subscripts
-D_REENTRANT
-Wno-format
-D_REENTRANT
-DLINUX
-msse4
.2
-Wno-unused-function
-D_M_X64
\
CFLAGS
=
-O3
-g
-Wall
-Wno-deprecated
-fPIC
-Wno-unused-result
-Wconversion
\
-I
/usr/local/taos/include
-std
=
gnu99
-Wno-char-subscripts
-D_REENTRANT
-Wno-format
-D_REENTRANT
-DLINUX
\
-msse4
.2
-Wno-unused-function
-D_M_X64
-I
/usr/local/taos/include
-std
=
gnu99
all
:
$(TARGET)
all
:
$(TARGET)
exe
:
exe
:
gcc
$(CFLAGS)
./asyncdemo.c
-o
$(ROOT)
/
asyncdemo
$(LFLAGS)
gcc
$(CFLAGS)
./asyncdemo.c
-o
$(ROOT)
asyncdemo
$(LFLAGS)
gcc
$(CFLAGS)
./demo.c
-o
$(ROOT)
/
demo
$(LFLAGS)
gcc
$(CFLAGS)
./demo.c
-o
$(ROOT)
demo
$(LFLAGS)
gcc
$(CFLAGS)
./prepare.c
-o
$(ROOT)
/
prepare
$(LFLAGS)
gcc
$(CFLAGS)
./prepare.c
-o
$(ROOT)
prepare
$(LFLAGS)
gcc
$(CFLAGS)
./stream.c
-o
$(ROOT)
/
stream
$(LFLAGS)
gcc
$(CFLAGS)
./stream.c
-o
$(ROOT)
stream
$(LFLAGS)
gcc
$(CFLAGS)
./subscribe.c
-o
$(ROOT)
subscribe
$(LFLAGS)
gcc
$(CFLAGS)
./subscribe.c
-o
$(ROOT)
subscribe
$(LFLAGS)
gcc
$(CFLAGS)
./apitest.c
-o
$(ROOT)
apitest
$(LFLAGS)
gcc
$(CFLAGS)
./apitest.c
-o
$(ROOT)
apitest
$(LFLAGS)
clean
:
clean
:
rm
$(ROOT)
/asyncdemo
rm
$(ROOT)
asyncdemo
rm
$(ROOT)
/demo
rm
$(ROOT)
demo
rm
$(ROOT)
/prepare
rm
$(ROOT)
prepare
rm
$(ROOT)
/stream
rm
$(ROOT)
stream
rm
$(ROOT)
/subscribe
rm
$(ROOT)
subscribe
rm
$(ROOT)
apitest
tests/examples/c/prepare.c
浏览文件 @
93992a76
...
@@ -195,11 +195,15 @@ int main(int argc, char *argv[])
...
@@ -195,11 +195,15 @@ int main(int argc, char *argv[])
taos_print_row
(
temp
,
row
,
fields
,
num_fields
);
taos_print_row
(
temp
,
row
,
fields
,
num_fields
);
printf
(
"%s
\n
"
,
temp
);
printf
(
"%s
\n
"
,
temp
);
}
}
if
(
rows
==
2
)
{
printf
(
"two rows are fetched as expectation
\n
"
);
}
else
{
printf
(
"expect two rows, but %d rows are fetched
\n
"
,
rows
);
}
taos_free_result
(
result
);
taos_free_result
(
result
);
taos_stmt_close
(
stmt
);
taos_stmt_close
(
stmt
);
printf
(
"Data has been written, Please press enter to return"
);
return
0
;
return
getchar
();
}
}
tests/examples/c/subscribe.c
浏览文件 @
93992a76
...
@@ -56,7 +56,7 @@ void check_row_count(int line, TAOS_RES* res, int expected) {
...
@@ -56,7 +56,7 @@ void check_row_count(int line, TAOS_RES* res, int expected) {
void
do_query
(
TAOS
*
taos
,
const
char
*
sql
)
{
void
do_query
(
TAOS
*
taos
,
const
char
*
sql
)
{
TAOS_RES
*
res
=
taos_query
(
taos
,
"drop database if exists test;"
);
TAOS_RES
*
res
=
taos_query
(
taos
,
sql
);
taos_free_result
(
res
);
taos_free_result
(
res
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录