Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
4e954c9e
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
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看板
提交
4e954c9e
编写于
11月 27, 2021
作者:
A
Alex Duan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TS-530]<fix> support CQ write to supertable
上级
94b021ce
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
115 addition
and
8 deletion
+115
-8
src/client/src/tscSql.c
src/client/src/tscSql.c
+83
-0
src/client/src/tscStream.c
src/client/src/tscStream.c
+28
-8
src/inc/taos.h
src/inc/taos.h
+3
-0
src/query/src/queryMain.c
src/query/src/queryMain.c
+1
-0
未找到文件。
src/client/src/tscSql.c
浏览文件 @
4e954c9e
...
...
@@ -894,6 +894,89 @@ int taos_print_row_ex(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_field
return
len
;
}
// print field value to str
int
taos_print_field
(
char
*
str
,
void
*
value
,
TAOS_FIELD
*
field
)
{
// check valid
if
(
str
==
NULL
||
value
==
NULL
||
field
==
NULL
)
{
return
0
;
}
// get value
int
len
=
0
;
switch
(
field
->
type
)
{
//
// fixed length
//
case
TSDB_DATA_TYPE_TINYINT
:
len
=
sprintf
(
str
,
"%d"
,
*
((
int8_t
*
)
value
));
break
;
case
TSDB_DATA_TYPE_UTINYINT
:
len
=
sprintf
(
str
,
"%u"
,
*
((
uint8_t
*
)
value
));
break
;
case
TSDB_DATA_TYPE_SMALLINT
:
len
=
sprintf
(
str
,
"%d"
,
*
((
int16_t
*
)
value
));
break
;
case
TSDB_DATA_TYPE_USMALLINT
:
len
=
sprintf
(
str
,
"%u"
,
*
((
uint16_t
*
)
value
));
break
;
case
TSDB_DATA_TYPE_INT
:
len
=
sprintf
(
str
,
"%d"
,
*
((
int32_t
*
)
value
));
break
;
case
TSDB_DATA_TYPE_UINT
:
len
=
sprintf
(
str
,
"%u"
,
*
((
uint32_t
*
)
value
));
break
;
case
TSDB_DATA_TYPE_BIGINT
:
len
=
sprintf
(
str
,
"%"
PRId64
,
*
((
int64_t
*
)
value
));
break
;
case
TSDB_DATA_TYPE_UBIGINT
:
len
=
sprintf
(
str
,
"%"
PRIu64
,
*
((
uint64_t
*
)
value
));
break
;
case
TSDB_DATA_TYPE_FLOAT
:
{
float
fv
=
0
;
fv
=
GET_FLOAT_VAL
(
value
);
len
=
sprintf
(
str
,
"%f"
,
fv
);
}
break
;
case
TSDB_DATA_TYPE_DOUBLE
:
{
double
dv
=
0
;
dv
=
GET_DOUBLE_VAL
(
value
);
len
=
sprintf
(
str
,
"%lf"
,
dv
);
}
break
;
case
TSDB_DATA_TYPE_TIMESTAMP
:
len
=
sprintf
(
str
,
"%"
PRId64
,
*
((
int64_t
*
)
value
));
break
;
case
TSDB_DATA_TYPE_BOOL
:
len
=
sprintf
(
str
,
"%d"
,
*
((
int8_t
*
)
value
));
//
// variant length
//
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_NCHAR
:
{
len
=
varDataLen
((
char
*
)
value
-
VARSTR_HEADER_SIZE
);
if
(
field
->
type
==
TSDB_DATA_TYPE_BINARY
)
{
assert
(
len
<=
field
->
bytes
&&
len
>=
0
);
}
else
{
assert
(
len
<=
field
->
bytes
*
TSDB_NCHAR_SIZE
&&
len
>=
0
);
}
memcpy
(
str
,
value
,
len
);
}
break
;
default:
break
;
}
return
len
;
}
static
void
asyncCallback
(
void
*
param
,
TAOS_RES
*
tres
,
int
code
)
{
assert
(
param
!=
NULL
);
SSqlObj
*
pSql
=
((
SSqlObj
*
)
param
);
...
...
src/client/src/tscStream.c
浏览文件 @
4e954c9e
...
...
@@ -461,17 +461,30 @@ bool toAnotherTable(STscObj *pTscObj, char *superName, TAOS_FIELD *fields, int32
// add row to hash to group by tbname
bool
tbHashAdd
(
SHashObj
*
tbHash
,
TAOS_ROW
row
,
TAOS_FIELD
*
fields
,
int32_t
idx
,
int32_t
numCols
)
{
void
*
v
=
row
[
idx
];
VarDataLenT
len
=
varDataLen
((
char
*
)
v
-
VARSTR_HEADER_SIZE
);
char
*
key
=
v
;
TAOS_FIELD
*
field
=
&
fields
[
idx
];
VarDataLenT
len
=
0
;
char
str
[
128
];
memset
(
str
,
0
,
sizeof
(
str
));
char
*
key
=
str
;
// get key and len
if
(
field
->
type
==
TSDB_DATA_TYPE_BINARY
||
field
->
type
==
TSDB_DATA_TYPE_NCHAR
)
{
key
=
v
;
len
=
varDataLen
((
char
*
)
v
-
VARSTR_HEADER_SIZE
);
}
else
{
len
=
taos_print_field
(
str
,
v
,
field
);
}
if
(
len
==
0
)
{
return
false
;
}
//
get array point from hash
//
append key with len
SArray
*
arr
=
NULL
;
// get arr from hash
void
*
pdata
=
taosHashGet
(
tbHash
,
key
,
len
);
if
(
pdata
)
{
arr
=
*
(
SArray
**
)
pdata
;
}
//
get arr from
new
//
if group is null create
new
if
(
arr
==
NULL
)
{
arr
=
(
SArray
*
)
taosArrayInit
(
10
,
sizeof
(
TAOS_ROW
));
if
(
arr
==
NULL
)
{
...
...
@@ -481,7 +494,7 @@ bool tbHashAdd(SHashObj *tbHash, TAOS_ROW row, TAOS_FIELD* fields, int32_t idx,
taosHashPut
(
tbHash
,
key
,
len
,
&
arr
,
sizeof
(
SArray
*
));
}
// a
dd to array
// a
ppend to group
int32_t
new_len
=
sizeof
(
void
*
)
*
numCols
;
TAOS_ROW
new_row
=
(
TAOS_ROW
)
tmalloc
(
new_len
);
memcpy
(
new_row
,
row
,
new_len
);
...
...
@@ -507,7 +520,7 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
if
(
numOfRows
>
0
)
{
// when reaching here the first execution of stream computing is successful.
// init hash
SHashObj
*
tbHash
=
NULL
;
int32_t
colIdx
=
1
;
int32_t
colIdx
=
-
1
;
TAOS_FIELD
*
fields
=
NULL
;
int32_t
dstColsNum
=
pStream
->
dstCols
;
int32_t
fieldsNum
=
0
;
...
...
@@ -529,6 +542,11 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
break
;
}
}
// set default with last fields if
if
(
colIdx
==
-
1
)
{
colIdx
=
fieldsNum
-
1
;
}
}
// save rows
...
...
@@ -560,7 +578,9 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
pStream
->
stime
=
taosTimeAdd
(
pStream
->
stime
,
pStream
->
interval
.
sliding
,
pStream
->
interval
.
slidingUnit
,
pStream
->
precision
);
}
// actually only one row is returned. this following is not necessary
taos_fetch_rows_a
(
res
,
tscProcessStreamRetrieveResult
,
pStream
);
if
(
pQueryInfo
->
pQInfo
->
code
==
TSDB_CODE_SUCCESS
)
{
taos_fetch_rows_a
(
res
,
tscProcessStreamRetrieveResult
,
pStream
);
}
}
else
{
// numOfRows == 0, all data has been retrieved
pStream
->
useconds
+=
pSql
->
res
.
useconds
;
if
(
pStream
->
numOfRes
==
0
)
{
...
...
src/inc/taos.h
浏览文件 @
4e954c9e
...
...
@@ -137,8 +137,11 @@ DLL_EXPORT int taos_num_fields(TAOS_RES *res);
DLL_EXPORT
int
taos_affected_rows
(
TAOS_RES
*
res
);
DLL_EXPORT
TAOS_FIELD
*
taos_fetch_fields
(
TAOS_RES
*
res
);
DLL_EXPORT
int
taos_select_db
(
TAOS
*
taos
,
const
char
*
db
);
// row to string
DLL_EXPORT
int
taos_print_row
(
char
*
str
,
TAOS_ROW
row
,
TAOS_FIELD
*
fields
,
int
num_fields
);
DLL_EXPORT
int
taos_print_row_ex
(
char
*
str
,
TAOS_ROW
row
,
TAOS_FIELD
*
fields
,
int
num_fields
,
char
split
,
bool
addQuota
);
// one field to string
DLL_EXPORT
int
taos_print_field
(
char
*
str
,
void
*
value
,
TAOS_FIELD
*
field
);
DLL_EXPORT
void
taos_stop_query
(
TAOS_RES
*
res
);
DLL_EXPORT
bool
taos_is_null
(
TAOS_RES
*
res
,
int32_t
row
,
int32_t
col
);
DLL_EXPORT
int
taos_fetch_block
(
TAOS_RES
*
res
,
TAOS_ROW
*
rows
);
...
...
src/query/src/queryMain.c
浏览文件 @
4e954c9e
...
...
@@ -220,6 +220,7 @@ bool qTableQuery(qinfo_t qinfo, uint64_t *qId) {
if
(
isQueryKilled
(
pQInfo
))
{
qDebug
(
"QInfo:0x%"
PRIx64
" it is already killed, abort"
,
pQInfo
->
qId
);
setQueryKilled
(
pQInfo
);
return
doBuildResCheck
(
pQInfo
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录