Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
d0600e31
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看板
提交
d0600e31
编写于
12月 14, 2021
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
retrigger jenkins
上级
f9673f56
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
13 deletion
+13
-13
src/common/src/tvariant.c
src/common/src/tvariant.c
+13
-13
未找到文件。
src/common/src/tvariant.c
浏览文件 @
d0600e31
...
@@ -209,7 +209,7 @@ void tVariantCreateFromBinary(tVariant *pVar, const char *pz, size_t len, uint32
...
@@ -209,7 +209,7 @@ void tVariantCreateFromBinary(tVariant *pVar, const char *pz, size_t len, uint32
void
tVariantDestroy
(
tVariant
*
pVar
)
{
void
tVariantDestroy
(
tVariant
*
pVar
)
{
if
(
pVar
==
NULL
)
return
;
if
(
pVar
==
NULL
)
return
;
if
(
pVar
->
nType
==
TSDB_DATA_TYPE_BINARY
||
pVar
->
nType
==
TSDB_DATA_TYPE_NCHAR
||
pVar
->
nType
==
TSDB_DATA_TYPE_JSON
)
{
if
(
pVar
->
nType
==
TSDB_DATA_TYPE_BINARY
||
pVar
->
nType
==
TSDB_DATA_TYPE_NCHAR
||
pVar
->
nType
==
TSDB_DATA_TYPE_JSON
)
{
tfree
(
pVar
->
pz
);
tfree
(
pVar
->
pz
);
pVar
->
nLen
=
0
;
pVar
->
nLen
=
0
;
...
@@ -267,7 +267,7 @@ bool tVariantTypeMatch(tVariant *pVar, int8_t dbType){
...
@@ -267,7 +267,7 @@ bool tVariantTypeMatch(tVariant *pVar, int8_t dbType){
void
tVariantAssign
(
tVariant
*
pDst
,
const
tVariant
*
pSrc
)
{
void
tVariantAssign
(
tVariant
*
pDst
,
const
tVariant
*
pSrc
)
{
if
(
pSrc
==
NULL
||
pDst
==
NULL
)
return
;
if
(
pSrc
==
NULL
||
pDst
==
NULL
)
return
;
pDst
->
nType
=
pSrc
->
nType
;
pDst
->
nType
=
pSrc
->
nType
;
if
(
pSrc
->
nType
==
TSDB_DATA_TYPE_BINARY
||
pSrc
->
nType
==
TSDB_DATA_TYPE_NCHAR
||
pSrc
->
nType
==
TSDB_DATA_TYPE_JSON
)
{
if
(
pSrc
->
nType
==
TSDB_DATA_TYPE_BINARY
||
pSrc
->
nType
==
TSDB_DATA_TYPE_NCHAR
||
pSrc
->
nType
==
TSDB_DATA_TYPE_JSON
)
{
int32_t
len
=
pSrc
->
nLen
+
TSDB_NCHAR_SIZE
;
int32_t
len
=
pSrc
->
nLen
+
TSDB_NCHAR_SIZE
;
...
@@ -351,14 +351,14 @@ int32_t tVariantCompare(const tVariant* p1, const tVariant* p2) {
...
@@ -351,14 +351,14 @@ int32_t tVariantCompare(const tVariant* p1, const tVariant* p2) {
int32_t
tVariantToString
(
tVariant
*
pVar
,
char
*
dst
)
{
int32_t
tVariantToString
(
tVariant
*
pVar
,
char
*
dst
)
{
if
(
pVar
==
NULL
||
dst
==
NULL
)
return
0
;
if
(
pVar
==
NULL
||
dst
==
NULL
)
return
0
;
switch
(
pVar
->
nType
)
{
switch
(
pVar
->
nType
)
{
case
TSDB_DATA_TYPE_BINARY
:
{
case
TSDB_DATA_TYPE_BINARY
:
{
int32_t
len
=
sprintf
(
dst
,
"
\'
%s
\'
"
,
pVar
->
pz
);
int32_t
len
=
sprintf
(
dst
,
"
\'
%s
\'
"
,
pVar
->
pz
);
assert
(
len
<=
pVar
->
nLen
+
sizeof
(
"
\'
"
)
*
2
);
// two more chars
assert
(
len
<=
pVar
->
nLen
+
sizeof
(
"
\'
"
)
*
2
);
// two more chars
return
len
;
return
len
;
}
}
case
TSDB_DATA_TYPE_NCHAR
:
{
case
TSDB_DATA_TYPE_NCHAR
:
{
dst
[
0
]
=
'\''
;
dst
[
0
]
=
'\''
;
taosUcs4ToMbs
(
pVar
->
wpz
,
(
twcslen
(
pVar
->
wpz
)
+
1
)
*
TSDB_NCHAR_SIZE
,
dst
+
1
);
taosUcs4ToMbs
(
pVar
->
wpz
,
(
twcslen
(
pVar
->
wpz
)
+
1
)
*
TSDB_NCHAR_SIZE
,
dst
+
1
);
...
@@ -367,7 +367,7 @@ int32_t tVariantToString(tVariant *pVar, char *dst) {
...
@@ -367,7 +367,7 @@ int32_t tVariantToString(tVariant *pVar, char *dst) {
dst
[
len
+
1
]
=
0
;
dst
[
len
+
1
]
=
0
;
return
len
+
1
;
return
len
+
1
;
}
}
case
TSDB_DATA_TYPE_BOOL
:
case
TSDB_DATA_TYPE_BOOL
:
case
TSDB_DATA_TYPE_TINYINT
:
case
TSDB_DATA_TYPE_TINYINT
:
case
TSDB_DATA_TYPE_SMALLINT
:
case
TSDB_DATA_TYPE_SMALLINT
:
...
@@ -376,7 +376,7 @@ int32_t tVariantToString(tVariant *pVar, char *dst) {
...
@@ -376,7 +376,7 @@ int32_t tVariantToString(tVariant *pVar, char *dst) {
case
TSDB_DATA_TYPE_USMALLINT
:
case
TSDB_DATA_TYPE_USMALLINT
:
case
TSDB_DATA_TYPE_UINT
:
case
TSDB_DATA_TYPE_UINT
:
return
sprintf
(
dst
,
"%d"
,
(
int32_t
)
pVar
->
i64
);
return
sprintf
(
dst
,
"%d"
,
(
int32_t
)
pVar
->
i64
);
case
TSDB_DATA_TYPE_BIGINT
:
case
TSDB_DATA_TYPE_BIGINT
:
return
sprintf
(
dst
,
"%"
PRId64
,
pVar
->
i64
);
return
sprintf
(
dst
,
"%"
PRId64
,
pVar
->
i64
);
case
TSDB_DATA_TYPE_UBIGINT
:
case
TSDB_DATA_TYPE_UBIGINT
:
...
@@ -384,7 +384,7 @@ int32_t tVariantToString(tVariant *pVar, char *dst) {
...
@@ -384,7 +384,7 @@ int32_t tVariantToString(tVariant *pVar, char *dst) {
case
TSDB_DATA_TYPE_FLOAT
:
case
TSDB_DATA_TYPE_FLOAT
:
case
TSDB_DATA_TYPE_DOUBLE
:
case
TSDB_DATA_TYPE_DOUBLE
:
return
sprintf
(
dst
,
"%.9lf"
,
pVar
->
dKey
);
return
sprintf
(
dst
,
"%.9lf"
,
pVar
->
dKey
);
default:
default:
return
0
;
return
0
;
}
}
...
@@ -422,21 +422,21 @@ static int32_t toBinary(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
...
@@ -422,21 +422,21 @@ static int32_t toBinary(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
if
(
*
pDest
==
pVariant
->
pz
)
{
if
(
*
pDest
==
pVariant
->
pz
)
{
pBuf
=
calloc
(
1
,
INITIAL_ALLOC_SIZE
);
pBuf
=
calloc
(
1
,
INITIAL_ALLOC_SIZE
);
}
}
if
(
pVariant
->
nType
==
TSDB_DATA_TYPE_NCHAR
)
{
if
(
pVariant
->
nType
==
TSDB_DATA_TYPE_NCHAR
)
{
size_t
newSize
=
pVariant
->
nLen
*
TSDB_NCHAR_SIZE
;
size_t
newSize
=
pVariant
->
nLen
*
TSDB_NCHAR_SIZE
;
if
(
pBuf
!=
NULL
)
{
if
(
pBuf
!=
NULL
)
{
if
(
newSize
>=
INITIAL_ALLOC_SIZE
)
{
if
(
newSize
>=
INITIAL_ALLOC_SIZE
)
{
pBuf
=
realloc
(
pBuf
,
newSize
+
1
);
pBuf
=
realloc
(
pBuf
,
newSize
+
1
);
}
}
taosUcs4ToMbs
(
pVariant
->
wpz
,
(
int32_t
)
newSize
,
pBuf
);
taosUcs4ToMbs
(
pVariant
->
wpz
,
(
int32_t
)
newSize
,
pBuf
);
free
(
pVariant
->
wpz
);
free
(
pVariant
->
wpz
);
pBuf
[
newSize
]
=
0
;
pBuf
[
newSize
]
=
0
;
}
else
{
}
else
{
taosUcs4ToMbs
(
pVariant
->
wpz
,
(
int32_t
)
newSize
,
*
pDest
);
taosUcs4ToMbs
(
pVariant
->
wpz
,
(
int32_t
)
newSize
,
*
pDest
);
}
}
}
else
{
}
else
{
if
(
IS_SIGNED_NUMERIC_TYPE
(
pVariant
->
nType
))
{
if
(
IS_SIGNED_NUMERIC_TYPE
(
pVariant
->
nType
))
{
sprintf
(
pBuf
==
NULL
?
*
pDest
:
pBuf
,
"%"
PRId64
,
pVariant
->
i64
);
sprintf
(
pBuf
==
NULL
?
*
pDest
:
pBuf
,
"%"
PRId64
,
pVariant
->
i64
);
...
@@ -448,18 +448,18 @@ static int32_t toBinary(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
...
@@ -448,18 +448,18 @@ static int32_t toBinary(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
setNull
(
pBuf
==
NULL
?
*
pDest
:
pBuf
,
TSDB_DATA_TYPE_BINARY
,
0
);
setNull
(
pBuf
==
NULL
?
*
pDest
:
pBuf
,
TSDB_DATA_TYPE_BINARY
,
0
);
}
}
}
}
if
(
pBuf
!=
NULL
)
{
if
(
pBuf
!=
NULL
)
{
*
pDest
=
pBuf
;
*
pDest
=
pBuf
;
}
}
*
pDestSize
=
(
int32_t
)
strlen
(
*
pDest
);
*
pDestSize
=
(
int32_t
)
strlen
(
*
pDest
);
return
0
;
return
0
;
}
}
static
int32_t
toNchar
(
tVariant
*
pVariant
,
char
**
pDest
,
int32_t
*
pDestSize
)
{
static
int32_t
toNchar
(
tVariant
*
pVariant
,
char
**
pDest
,
int32_t
*
pDestSize
)
{
char
tmpBuf
[
40
]
=
{
0
};
char
tmpBuf
[
40
]
=
{
0
};
char
*
pDst
=
tmpBuf
;
char
*
pDst
=
tmpBuf
;
int32_t
nLen
=
0
;
int32_t
nLen
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录