Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
KASAKI11
TDengine
提交
eb6b6e0c
T
TDengine
项目概览
KASAKI11
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
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,发现更多精彩内容 >>
提交
eb6b6e0c
编写于
5月 24, 2020
作者:
T
Tao Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-90] alter tag function develop
上级
df01a390
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
51 addition
and
8 deletion
+51
-8
src/common/inc/tdataformat.h
src/common/inc/tdataformat.h
+12
-8
src/common/src/tdataformat.c
src/common/src/tdataformat.c
+39
-0
未找到文件。
src/common/inc/tdataformat.h
浏览文件 @
eb6b6e0c
...
@@ -202,11 +202,15 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD
...
@@ -202,11 +202,15 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD
// ----------------- Tag row structure
// ----------------- Tag row structure
/* A tag row, the format is like below:
/* A tag row, the format is like below:
+----------+-------------------------------------------------------------+---------------------------------+
+----------+----------------------------------------------------------------+
| int16 | int16 | int64 | int16 | int64 | ...| int16 | int64 | char |
| STagRow | STagCol | STagCol | STagCol | STagCol | ...| STagCol | STagCol |
+----------+-------------------------------------------------------------+---------------------------------+
+----------+----------------------------------------------------------------+
| ncols | colId1 | offset1 | colId2 | offset2 | ...| colIdN | offsetN | values |
+----------+-------------------------------------------------------------+---------------------------------+
pData
+----------+----------------------------------------------------------------+
| value 1 | value 2 | value 3 | value 4 | ....|value n |
+----------+----------------------------------------------------------------+
*/
*/
...
@@ -221,8 +225,8 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD
...
@@ -221,8 +225,8 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD
typedef
struct
{
typedef
struct
{
int16_t
colId
;
// column ID
int16_t
colId
;
// column ID
int
8
_t
colType
;
int
16
_t
colType
;
int
8
_t
colLen
;
// if col type is binary/Nchar, this is the length of binary/Nchar
int
16
_t
colLen
;
// if col type is binary/Nchar, this is the length of binary/Nchar
int16_t
offset
;
//to store value for numeric col or offset for binary/Nchar
int16_t
offset
;
//to store value for numeric col or offset for binary/Nchar
}
STagCol
;
}
STagCol
;
...
@@ -238,7 +242,7 @@ typedef struct {
...
@@ -238,7 +242,7 @@ typedef struct {
int
tdInsertTagCol
(
SDataRow
row
,
void
*
value
,
int16_t
len
,
int8_t
type
,
int16_t
colId
);
//insert tag value and update all the information
int
tdInsertTagCol
(
SDataRow
row
,
void
*
value
,
int16_t
len
,
int8_t
type
,
int16_t
colId
);
//insert tag value and update all the information
int
tdDeleteTagCol
(
SDataRow
row
,
int16_t
colId
);
// delete tag value and update all the information
int
tdDeleteTagCol
(
SDataRow
row
,
int16_t
colId
);
// delete tag value and update all the information
int
tdQuerTagByID
(
SDataRow
row
,
int16_t
colId
,
void
*
value
);
//if find tag, return value length
, else return -1;
int
tdQuerTagByID
(
SDataRow
row
,
int16_t
colId
,
void
*
value
,
int16_t
*
type
,
int16_t
*
len
);
//if find tag, 0
, else return -1;
int
tdAppendTagColVal
(
SDataRow
row
,
void
*
value
,
int8_t
type
,
int32_t
bytes
);
int
tdAppendTagColVal
(
SDataRow
row
,
void
*
value
,
int8_t
type
,
int32_t
bytes
);
SDataRow
tdNewTagRowFromSchema
(
STSchema
*
pSchema
);
SDataRow
tdNewTagRowFromSchema
(
STSchema
*
pSchema
);
...
...
src/common/src/tdataformat.c
浏览文件 @
eb6b6e0c
...
@@ -151,6 +151,26 @@ SDataRow tdNewDataRowFromSchema(STSchema *pSchema) {
...
@@ -151,6 +151,26 @@ SDataRow tdNewDataRowFromSchema(STSchema *pSchema) {
return
row
;
return
row
;
}
}
int
tdInsertTagCol
(
SDataRow
row
,
void
*
value
,
int16_t
len
,
int8_t
type
,
int16_t
colId
){
//insert tag value and update all the information
return
0
;
};
int
tdDeleteTagCol
(
SDataRow
row
,
int16_t
colId
){
// delete tag value and update all the information
return
o
;
};
int
tdQuerTagByID
(
SDataRow
row
,
int16_t
colId
,
void
*
value
,
int16_t
*
type
,
int16_t
*
len
){
//if find tag, 0, else return -1;
return
0
;
};
int
tdAppendTagColVal
(
SDataRow
row
,
void
*
value
,
int8_t
type
,
int32_t
bytes
){
return
0
;
};
SDataRow
tdNewTagRowFromSchema
(
STSchema
*
pSchema
)
{
//todo
}
/**
/**
* Free the SDataRow object
* Free the SDataRow object
*/
*/
...
@@ -183,6 +203,25 @@ int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_
...
@@ -183,6 +203,25 @@ int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_
return
0
;
return
0
;
}
}
int
tdAppendColVal
(
SDataRow
row
,
void
*
value
,
int8_t
type
,
int32_t
bytes
,
int32_t
offset
)
{
ASSERT
(
value
!=
NULL
);
int32_t
toffset
=
offset
+
TD_DATA_ROW_HEAD_SIZE
;
char
*
ptr
=
POINTER_SHIFT
(
row
,
dataRowLen
(
row
));
switch
(
type
)
{
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_NCHAR
:
*
(
VarDataOffsetT
*
)
POINTER_SHIFT
(
row
,
toffset
)
=
dataRowLen
(
row
);
memcpy
(
ptr
,
value
,
varDataTLen
(
value
));
dataRowLen
(
row
)
+=
varDataTLen
(
value
);
break
;
default:
memcpy
(
POINTER_SHIFT
(
row
,
toffset
),
value
,
TYPE_BYTES
[
type
]);
break
;
}
return
0
;
}
SDataRow
tdDataRowDup
(
SDataRow
row
)
{
SDataRow
tdDataRowDup
(
SDataRow
row
)
{
SDataRow
trow
=
malloc
(
dataRowLen
(
row
));
SDataRow
trow
=
malloc
(
dataRowLen
(
row
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录