Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
b73d2139
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
未验证
提交
b73d2139
编写于
4月 26, 2023
作者:
D
dapan1121
提交者:
GitHub
4月 26, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #21088 from taosdata/fix/TD-23873
fix: schema/tag version update to int32
上级
8d0a4772
5db5205e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
7 deletion
+7
-7
include/libs/catalog/catalog.h
include/libs/catalog/catalog.h
+2
-2
include/libs/qcom/query.h
include/libs/qcom/query.h
+2
-2
source/libs/executor/src/tsort.c
source/libs/executor/src/tsort.c
+2
-2
source/libs/qcom/src/querymsg.c
source/libs/qcom/src/querymsg.c
+1
-1
未找到文件。
include/libs/catalog/catalog.h
浏览文件 @
b73d2139
...
@@ -124,8 +124,8 @@ typedef struct SSTableVersion {
...
@@ -124,8 +124,8 @@ typedef struct SSTableVersion {
char
stbName
[
TSDB_TABLE_NAME_LEN
];
char
stbName
[
TSDB_TABLE_NAME_LEN
];
uint64_t
dbId
;
uint64_t
dbId
;
uint64_t
suid
;
uint64_t
suid
;
int
16
_t
sversion
;
int
32
_t
sversion
;
int
16
_t
tversion
;
int
32
_t
tversion
;
int32_t
smaVer
;
int32_t
smaVer
;
}
SSTableVersion
;
}
SSTableVersion
;
...
...
include/libs/qcom/query.h
浏览文件 @
b73d2139
...
@@ -116,8 +116,8 @@ typedef struct STableMeta {
...
@@ -116,8 +116,8 @@ typedef struct STableMeta {
// if the table is TSDB_CHILD_TABLE, the following information is acquired from the corresponding super table meta
// if the table is TSDB_CHILD_TABLE, the following information is acquired from the corresponding super table meta
// info
// info
int
16
_t
sversion
;
int
32
_t
sversion
;
int
16
_t
tversion
;
int
32
_t
tversion
;
STableComInfo
tableInfo
;
STableComInfo
tableInfo
;
SSchema
schema
[];
SSchema
schema
[];
}
STableMeta
;
}
STableMeta
;
...
...
source/libs/executor/src/tsort.c
浏览文件 @
b73d2139
...
@@ -155,7 +155,7 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
...
@@ -155,7 +155,7 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
int64_t
fetchUs
=
0
,
fetchNum
=
0
;
int64_t
fetchUs
=
0
,
fetchNum
=
0
;
tsortClearOrderdSource
(
pSortHandle
->
pOrderedSource
,
&
fetchUs
,
&
fetchNum
);
tsortClearOrderdSource
(
pSortHandle
->
pOrderedSource
,
&
fetchUs
,
&
fetchNum
);
q
Error
(
"all source fetch time: %"
PRId64
"us num:%"
PRId64
" %s"
,
fetchUs
,
fetchNum
,
pSortHandle
->
idStr
);
q
Debug
(
"all source fetch time: %"
PRId64
"us num:%"
PRId64
" %s"
,
fetchUs
,
fetchNum
,
pSortHandle
->
idStr
);
taosArrayDestroy
(
pSortHandle
->
pOrderedSource
);
taosArrayDestroy
(
pSortHandle
->
pOrderedSource
);
taosMemoryFreeClear
(
pSortHandle
);
taosMemoryFreeClear
(
pSortHandle
);
...
@@ -316,7 +316,7 @@ static int32_t sortComparInit(SMsortComparParam* pParam, SArray* pSources, int32
...
@@ -316,7 +316,7 @@ static int32_t sortComparInit(SMsortComparParam* pParam, SArray* pSources, int32
}
}
int64_t
et
=
taosGetTimestampUs
();
int64_t
et
=
taosGetTimestampUs
();
q
Error
(
"init for merge sort completed, elapsed time:%.2f ms, %s"
,
(
et
-
st
)
/
1000
.
0
,
pHandle
->
idStr
);
q
Debug
(
"init for merge sort completed, elapsed time:%.2f ms, %s"
,
(
et
-
st
)
/
1000
.
0
,
pHandle
->
idStr
);
}
}
return
code
;
return
code
;
...
...
source/libs/qcom/src/querymsg.c
浏览文件 @
b73d2139
...
@@ -407,7 +407,7 @@ int32_t queryCreateTableMetaFromMsg(STableMetaRsp *msg, bool isStb, STableMeta *
...
@@ -407,7 +407,7 @@ int32_t queryCreateTableMetaFromMsg(STableMetaRsp *msg, bool isStb, STableMeta *
pTableMeta
->
tableInfo
.
rowSize
+=
pTableMeta
->
schema
[
i
].
bytes
;
pTableMeta
->
tableInfo
.
rowSize
+=
pTableMeta
->
schema
[
i
].
bytes
;
}
}
qDebug
(
"table %s uid %"
PRIx64
" meta returned, type %d vgId:%d db %s stb %s suid %"
PRIx64
" sver %d tver %d"
PRIx64
qDebug
(
"table %s uid %"
PRIx64
" meta returned, type %d vgId:%d db %s stb %s suid %"
PRIx64
" sver %d tver %d"
" tagNum %d colNum %d precision %d rowSize %d"
,
" tagNum %d colNum %d precision %d rowSize %d"
,
msg
->
tbName
,
pTableMeta
->
uid
,
pTableMeta
->
tableType
,
pTableMeta
->
vgId
,
msg
->
dbFName
,
msg
->
stbName
,
msg
->
tbName
,
pTableMeta
->
uid
,
pTableMeta
->
tableType
,
pTableMeta
->
vgId
,
msg
->
dbFName
,
msg
->
stbName
,
pTableMeta
->
suid
,
pTableMeta
->
sversion
,
pTableMeta
->
tversion
,
pTableMeta
->
tableInfo
.
numOfTags
,
pTableMeta
->
suid
,
pTableMeta
->
sversion
,
pTableMeta
->
tversion
,
pTableMeta
->
tableInfo
.
numOfTags
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录