Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
65471ac1
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,发现更多精彩内容 >>
提交
65471ac1
编写于
5月 14, 2021
作者:
H
hope
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix some type error, and add compile-instruction in order to reduce potential errors
上级
91249c2e
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
59 addition
and
53 deletion
+59
-53
.gitignore
.gitignore
+1
-0
CMakeLists.txt
CMakeLists.txt
+6
-1
packaging/release.sh
packaging/release.sh
+2
-2
src/client/src/tscSubquery.c
src/client/src/tscSubquery.c
+2
-2
src/kit/taosdemo/taosdemo.c
src/kit/taosdemo/taosdemo.c
+1
-1
src/mnode/src/mnodeDnode.c
src/mnode/src/mnodeDnode.c
+3
-3
src/plugins/http/src/httpGzip.c
src/plugins/http/src/httpGzip.c
+2
-2
src/plugins/http/src/httpParser.c
src/plugins/http/src/httpParser.c
+3
-3
src/plugins/http/src/httpTgHandle.c
src/plugins/http/src/httpTgHandle.c
+1
-1
src/rpc/src/rpcTcp.c
src/rpc/src/rpcTcp.c
+1
-1
src/sync/src/syncMain.c
src/sync/src/syncMain.c
+7
-7
src/sync/src/syncMsg.c
src/sync/src/syncMsg.c
+2
-2
src/tsdb/inc/tsdbMeta.h
src/tsdb/inc/tsdbMeta.h
+4
-4
src/tsdb/src/tsdbFS.c
src/tsdb/src/tsdbFS.c
+6
-6
src/tsdb/src/tsdbFile.c
src/tsdb/src/tsdbFile.c
+5
-5
src/tsdb/src/tsdbMeta.c
src/tsdb/src/tsdbMeta.c
+5
-5
src/util/src/tdes.c
src/util/src/tdes.c
+7
-7
src/wal/src/walWrite.c
src/wal/src/walWrite.c
+1
-1
未找到文件。
.gitignore
浏览文件 @
65471ac1
...
...
@@ -2,6 +2,7 @@ build/
.vscode/
.idea/
cmake-build-debug/
cmake-build-release/
cscope.out
.DS_Store
debug/
...
...
CMakeLists.txt
浏览文件 @
65471ac1
...
...
@@ -3,7 +3,7 @@ IF (CMAKE_VERSION VERSION_LESS 3.0)
PROJECT
(
TDengine CXX
)
SET
(
PROJECT_VERSION_MAJOR
"
${
LIB_MAJOR_VERSION
}
"
)
SET
(
PROJECT_VERSION_MINOR
"
${
LIB_MINOR_VERSION
}
"
)
SET
(
PROJECT_VERSION_PATCH
"
${
LIB_PATCH_VERSION
}
"
)
SET
(
PROJECT_VERSION_PATCH
"
${
LIB_PATCH_VERSION
}
"
)
SET
(
PROJECT_VERSION
"
${
LIB_VERSION_STRING
}
"
)
ELSE
()
CMAKE_POLICY
(
SET CMP0048 NEW
)
...
...
@@ -42,6 +42,11 @@ INCLUDE(cmake/env.inc)
INCLUDE
(
cmake/version.inc
)
INCLUDE
(
cmake/install.inc
)
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -Wshadow -Wextra -Werror")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -Wall -Wshadow -Wextra -Werror")
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-pipe -Wall -Wshadow -Werror"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-pipe -Wall -Wshadow -Werror"
)
ADD_SUBDIRECTORY
(
deps
)
ADD_SUBDIRECTORY
(
src
)
ADD_SUBDIRECTORY
(
tests
)
...
...
packaging/release.sh
浏览文件 @
65471ac1
#!/bin/bash
#
# Generate the deb package for ubunt, or rpm package for centos, or tar.gz package for other linux os
# Generate the deb package for ubunt
u
, or rpm package for centos, or tar.gz package for other linux os
set
-e
#set -x
# releas
h.sh -v [cluster | edge]
# releas
e.sh -v [cluster | edge]
# -c [aarch32 | aarch64 | x64 | x86 | mips64 ...]
# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
# -V [stable | beta]
...
...
src/client/src/tscSubquery.c
浏览文件 @
65471ac1
...
...
@@ -55,9 +55,9 @@ static void skipRemainValue(STSBuf* pTSBuf, tVariant* tag1) {
}
while
(
tsBufNextPos
(
pTSBuf
))
{
STSElem
el1
=
tsBufGetElem
(
pTSBuf
);
el1
=
tsBufGetElem
(
pTSBuf
);
int32_t
res
=
tVariantCompare
(
el1
.
tag
,
tag1
);
res
=
tVariantCompare
(
el1
.
tag
,
tag1
);
if
(
res
!=
0
)
{
// it is a record with new tag
return
;
}
...
...
src/kit/taosdemo/taosdemo.c
浏览文件 @
65471ac1
...
...
@@ -4661,7 +4661,7 @@ static int64_t generateData(char *recBuf, char **data_type,
double
t
=
rand_double
();
pstr
+=
sprintf
(
pstr
,
",%20.8f"
,
t
);
}
else
if
(
strcasecmp
(
data_type
[
i
%
c
],
"BOOL"
)
==
0
)
{
bool
b
=
rand_bool
()
&
1
;
bool
b
=
taosRandom
()
&
1
;
pstr
+=
sprintf
(
pstr
,
",%s"
,
b
?
"true"
:
"false"
);
}
else
if
(
strcasecmp
(
data_type
[
i
%
c
],
"BINARY"
)
==
0
)
{
char
*
s
=
malloc
(
lenOfBinary
);
...
...
src/mnode/src/mnodeDnode.c
浏览文件 @
65471ac1
...
...
@@ -522,13 +522,13 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
pStatus
->
lastReboot
=
htonl
(
pStatus
->
lastReboot
);
pStatus
->
numOfCores
=
htons
(
pStatus
->
numOfCores
);
uint32_t
version
=
htonl
(
pStatus
->
version
);
if
(
version
!=
tsVersion
)
{
uint32_t
_
version
=
htonl
(
pStatus
->
version
);
if
(
_
version
!=
tsVersion
)
{
pDnode
=
mnodeGetDnodeByEp
(
pStatus
->
dnodeEp
);
if
(
pDnode
!=
NULL
&&
pDnode
->
status
!=
TAOS_DN_STATUS_READY
)
{
pDnode
->
offlineReason
=
TAOS_DN_OFF_VERSION_NOT_MATCH
;
}
mError
(
"dnode:%d, status msg version:%d not equal with cluster:%d"
,
pStatus
->
dnodeId
,
version
,
tsVersion
);
mError
(
"dnode:%d, status msg version:%d not equal with cluster:%d"
,
pStatus
->
dnodeId
,
_
version
,
tsVersion
);
return
TSDB_CODE_MND_INVALID_MSG_VERSION
;
}
...
...
src/plugins/http/src/httpGzip.c
浏览文件 @
65471ac1
...
...
@@ -132,10 +132,10 @@ int32_t ehttp_gzip_write(ehttp_gzip_t *gzip, const char *buf, int32_t len) {
if
(
ret
!=
Z_STREAM_END
)
continue
;
}
int32_t
len
=
(
int32_t
)(
gzip
->
gzip
->
next_out
-
(
z_const
Bytef
*
)
gzip
->
chunk
);
int32_t
_
len
=
(
int32_t
)(
gzip
->
gzip
->
next_out
-
(
z_const
Bytef
*
)
gzip
->
chunk
);
gzip
->
gzip
->
next_out
[
0
]
=
'\0'
;
gzip
->
callbacks
.
on_data
(
gzip
,
gzip
->
arg
,
gzip
->
chunk
,
len
);
gzip
->
callbacks
.
on_data
(
gzip
,
gzip
->
arg
,
gzip
->
chunk
,
_
len
);
gzip
->
gzip
->
next_out
=
(
z_const
Bytef
*
)
gzip
->
chunk
;
gzip
->
gzip
->
avail_out
=
gzip
->
conf
.
chunk_size
;
}
...
...
src/plugins/http/src/httpParser.c
浏览文件 @
65471ac1
...
...
@@ -163,9 +163,9 @@ static int32_t httpOnRequestLine(HttpParser *pParser, char *method, char *target
// parse decode method
for
(
int32_t
i
=
0
;
i
<
tsHttpServer
.
methodScannerLen
;
i
++
)
{
HttpDecodeMethod
*
method
=
tsHttpServer
.
methodScanner
[
i
];
if
(
strcmp
(
method
->
module
,
pParser
->
path
[
0
].
str
)
==
0
)
{
pContext
->
decodeMethod
=
method
;
HttpDecodeMethod
*
_
method
=
tsHttpServer
.
methodScanner
[
i
];
if
(
strcmp
(
_
method
->
module
,
pParser
->
path
[
0
].
str
)
==
0
)
{
pContext
->
decodeMethod
=
_
method
;
break
;
}
}
...
...
src/plugins/http/src/httpTgHandle.c
浏览文件 @
65471ac1
...
...
@@ -209,7 +209,7 @@ void tgParseSchemaMetric(cJSON *metric) {
parsedOk
=
false
;
goto
ParseEnd
;
}
int32_t
nameLen
=
(
int32_t
)
strlen
(
field
->
valuestring
);
nameLen
=
(
int32_t
)
strlen
(
field
->
valuestring
);
if
(
nameLen
==
0
||
nameLen
>=
TSDB_TABLE_NAME_LEN
)
{
parsedOk
=
false
;
goto
ParseEnd
;
...
...
src/rpc/src/rpcTcp.c
浏览文件 @
65471ac1
...
...
@@ -576,7 +576,7 @@ static void *taosProcessTcpData(void *param) {
}
while
(
pThreadObj
->
pHead
)
{
SFdObj
*
pFdObj
=
pThreadObj
->
pHead
;
pFdObj
=
pThreadObj
->
pHead
;
pThreadObj
->
pHead
=
pFdObj
->
next
;
taosReportBrokenLink
(
pFdObj
);
}
...
...
src/sync/src/syncMain.c
浏览文件 @
65471ac1
...
...
@@ -389,17 +389,17 @@ int32_t syncForwardToPeer(int64_t rid, void *data, void *mhandle, int32_t qtype,
return
code
;
}
void
syncConfirmForward
(
int64_t
rid
,
uint64_t
version
,
int32_t
code
,
bool
force
)
{
void
syncConfirmForward
(
int64_t
rid
,
uint64_t
_
version
,
int32_t
code
,
bool
force
)
{
SSyncNode
*
pNode
=
syncAcquireNode
(
rid
);
if
(
pNode
==
NULL
)
return
;
SSyncPeer
*
pPeer
=
pNode
->
pMaster
;
if
(
pPeer
&&
(
pNode
->
quorum
>
1
||
force
))
{
SFwdRsp
rsp
;
syncBuildSyncFwdRsp
(
&
rsp
,
pNode
->
vgId
,
version
,
code
);
syncBuildSyncFwdRsp
(
&
rsp
,
pNode
->
vgId
,
_
version
,
code
);
if
(
taosWriteMsg
(
pPeer
->
peerFd
,
&
rsp
,
sizeof
(
SFwdRsp
))
==
sizeof
(
SFwdRsp
))
{
sTrace
(
"%s, forward-rsp is sent, code:0x%x hver:%"
PRIu64
,
pPeer
->
id
,
code
,
version
);
sTrace
(
"%s, forward-rsp is sent, code:0x%x hver:%"
PRIu64
,
pPeer
->
id
,
code
,
_
version
);
}
else
{
sDebug
(
"%s, failed to send forward-rsp, restart"
,
pPeer
->
id
);
syncRestartConnection
(
pPeer
);
...
...
@@ -1302,14 +1302,14 @@ static void syncProcessBrokenLink(int64_t rid) {
syncReleasePeer
(
pPeer
);
}
static
int32_t
syncSaveFwdInfo
(
SSyncNode
*
pNode
,
uint64_t
version
,
void
*
mhandle
)
{
static
int32_t
syncSaveFwdInfo
(
SSyncNode
*
pNode
,
uint64_t
_
version
,
void
*
mhandle
)
{
SSyncFwds
*
pSyncFwds
=
pNode
->
pSyncFwds
;
int64_t
time
=
taosGetTimestampMs
();
if
(
pSyncFwds
->
fwds
>=
SYNC_MAX_FWDS
)
{
// pSyncFwds->first = (pSyncFwds->first + 1) % SYNC_MAX_FWDS;
// pSyncFwds->fwds--;
sError
(
"vgId:%d, failed to save fwd info, hver:%"
PRIu64
" fwds:%d"
,
pNode
->
vgId
,
version
,
pSyncFwds
->
fwds
);
sError
(
"vgId:%d, failed to save fwd info, hver:%"
PRIu64
" fwds:%d"
,
pNode
->
vgId
,
_
version
,
pSyncFwds
->
fwds
);
return
TSDB_CODE_SYN_TOO_MANY_FWDINFO
;
}
...
...
@@ -1319,12 +1319,12 @@ static int32_t syncSaveFwdInfo(SSyncNode *pNode, uint64_t version, void *mhandle
SFwdInfo
*
pFwdInfo
=
pSyncFwds
->
fwdInfo
+
pSyncFwds
->
last
;
memset
(
pFwdInfo
,
0
,
sizeof
(
SFwdInfo
));
pFwdInfo
->
version
=
version
;
pFwdInfo
->
version
=
_
version
;
pFwdInfo
->
mhandle
=
mhandle
;
pFwdInfo
->
time
=
time
;
pSyncFwds
->
fwds
++
;
sTrace
(
"vgId:%d, fwd info is saved, hver:%"
PRIu64
" fwds:%d "
,
pNode
->
vgId
,
version
,
pSyncFwds
->
fwds
);
sTrace
(
"vgId:%d, fwd info is saved, hver:%"
PRIu64
" fwds:%d "
,
pNode
->
vgId
,
_
version
,
pSyncFwds
->
fwds
);
return
0
;
}
...
...
src/sync/src/syncMsg.c
浏览文件 @
65471ac1
...
...
@@ -61,13 +61,13 @@ void syncBuildSyncFwdMsg(SSyncHead *pHead, int32_t vgId, int32_t len) {
syncBuildHead
(
pHead
);
}
void
syncBuildSyncFwdRsp
(
SFwdRsp
*
pMsg
,
int32_t
vgId
,
uint64_t
version
,
int32_t
code
)
{
void
syncBuildSyncFwdRsp
(
SFwdRsp
*
pMsg
,
int32_t
vgId
,
uint64_t
_
version
,
int32_t
code
)
{
pMsg
->
head
.
type
=
TAOS_SMSG_SYNC_FWD_RSP
;
pMsg
->
head
.
vgId
=
vgId
;
pMsg
->
head
.
len
=
sizeof
(
SFwdRsp
)
-
sizeof
(
SSyncHead
);
syncBuildHead
(
&
pMsg
->
head
);
pMsg
->
version
=
version
;
pMsg
->
version
=
_
version
;
pMsg
->
code
=
code
;
}
...
...
src/tsdb/inc/tsdbMeta.h
浏览文件 @
65471ac1
...
...
@@ -69,7 +69,7 @@ void tsdbFreeMeta(STsdbMeta* pMeta);
int
tsdbOpenMeta
(
STsdbRepo
*
pRepo
);
int
tsdbCloseMeta
(
STsdbRepo
*
pRepo
);
STable
*
tsdbGetTableByUid
(
STsdbMeta
*
pMeta
,
uint64_t
uid
);
STSchema
*
tsdbGetTableSchemaByVersion
(
STable
*
pTable
,
int16_t
version
);
STSchema
*
tsdbGetTableSchemaByVersion
(
STable
*
pTable
,
int16_t
_
version
);
int
tsdbWLockRepoMeta
(
STsdbRepo
*
pRepo
);
int
tsdbRLockRepoMeta
(
STsdbRepo
*
pRepo
);
int
tsdbUnlockRepoMeta
(
STsdbRepo
*
pRepo
);
...
...
@@ -89,16 +89,16 @@ static FORCE_INLINE int tsdbCompareSchemaVersion(const void *key1, const void *k
}
}
static
FORCE_INLINE
STSchema
*
tsdbGetTableSchemaImpl
(
STable
*
pTable
,
bool
lock
,
bool
copy
,
int16_t
version
)
{
static
FORCE_INLINE
STSchema
*
tsdbGetTableSchemaImpl
(
STable
*
pTable
,
bool
lock
,
bool
copy
,
int16_t
_
version
)
{
STable
*
pDTable
=
(
TABLE_TYPE
(
pTable
)
==
TSDB_CHILD_TABLE
)
?
pTable
->
pSuper
:
pTable
;
STSchema
*
pSchema
=
NULL
;
STSchema
*
pTSchema
=
NULL
;
if
(
lock
)
TSDB_RLOCK_TABLE
(
pDTable
);
if
(
version
<
0
)
{
// get the latest version of schema
if
(
_
version
<
0
)
{
// get the latest version of schema
pTSchema
=
pDTable
->
schema
[
pDTable
->
numOfSchemas
-
1
];
}
else
{
// get the schema with version
void
*
ptr
=
taosbsearch
(
&
version
,
pDTable
->
schema
,
pDTable
->
numOfSchemas
,
sizeof
(
STSchema
*
),
void
*
ptr
=
taosbsearch
(
&
_
version
,
pDTable
->
schema
,
pDTable
->
numOfSchemas
,
sizeof
(
STSchema
*
),
tsdbCompareSchemaVersion
,
TD_EQ
);
if
(
ptr
==
NULL
)
{
terrno
=
TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION
;
...
...
src/tsdb/src/tsdbFS.c
浏览文件 @
65471ac1
...
...
@@ -957,10 +957,10 @@ static int tsdbRestoreMeta(STsdbRepo *pRepo) {
regfree
(
&
regex
);
return
-
1
;
}
else
{
uint32_t
version
=
0
;
uint32_t
_
version
=
0
;
if
(
strcmp
(
bname
,
"meta"
)
!=
0
)
{
sscanf
(
bname
,
"meta-ver%"
PRIu32
,
&
version
);
pfs
->
cstatus
->
meta
.
version
=
version
;
sscanf
(
bname
,
"meta-ver%"
PRIu32
,
&
_
version
);
pfs
->
cstatus
->
meta
.
version
=
_
version
;
}
pfs
->
cstatus
->
pmf
=
&
(
pfs
->
cstatus
->
mf
);
...
...
@@ -1103,10 +1103,10 @@ static int tsdbRestoreDFileSet(STsdbRepo *pRepo) {
int
tvid
,
tfid
;
TSDB_FILE_T
ttype
;
uint32_t
tversion
;
char
bname
[
TSDB_FILENAME_LEN
];
char
_
bname
[
TSDB_FILENAME_LEN
];
tfsbasename
(
pf
,
bname
);
tsdbParseDFilename
(
bname
,
&
tvid
,
&
tfid
,
&
ttype
,
&
tversion
);
tfsbasename
(
pf
,
_
bname
);
tsdbParseDFilename
(
_
bname
,
&
tvid
,
&
tfid
,
&
ttype
,
&
tversion
);
ASSERT
(
tvid
==
REPO_ID
(
pRepo
));
...
...
src/tsdb/src/tsdbFile.c
浏览文件 @
65471ac1
...
...
@@ -410,7 +410,7 @@ int tsdbUpdateDFileHeader(SDFile *pDFile) {
int
tsdbLoadDFileHeader
(
SDFile
*
pDFile
,
SDFInfo
*
pInfo
)
{
char
buf
[
TSDB_FILE_HEAD_SIZE
]
=
"
\0
"
;
uint32_t
version
;
uint32_t
_
version
;
ASSERT
(
TSDB_FILE_OPENED
(
pDFile
));
...
...
@@ -428,7 +428,7 @@ int tsdbLoadDFileHeader(SDFile *pDFile, SDFInfo *pInfo) {
}
void
*
pBuf
=
buf
;
pBuf
=
taosDecodeFixedU32
(
pBuf
,
&
version
);
pBuf
=
taosDecodeFixedU32
(
pBuf
,
&
_
version
);
pBuf
=
tsdbDecodeDFInfo
(
pBuf
,
pInfo
);
return
0
;
}
...
...
@@ -660,12 +660,12 @@ int tsdbScanAndTryFixDFileSet(STsdbRepo *pRepo, SDFileSet *pSet) {
return
0
;
}
int
tsdbParseDFilename
(
const
char
*
fname
,
int
*
vid
,
int
*
fid
,
TSDB_FILE_T
*
ftype
,
uint32_t
*
version
)
{
int
tsdbParseDFilename
(
const
char
*
fname
,
int
*
vid
,
int
*
fid
,
TSDB_FILE_T
*
ftype
,
uint32_t
*
_
version
)
{
char
*
p
=
NULL
;
*
version
=
0
;
*
_
version
=
0
;
*
ftype
=
TSDB_FILE_MAX
;
sscanf
(
fname
,
"v%df%d.%m[a-z]-ver%"
PRIu32
,
vid
,
fid
,
&
p
,
version
);
sscanf
(
fname
,
"v%df%d.%m[a-z]-ver%"
PRIu32
,
vid
,
fid
,
&
p
,
_
version
);
for
(
TSDB_FILE_T
i
=
0
;
i
<
TSDB_FILE_MAX
;
i
++
)
{
if
(
strcmp
(
p
,
TSDB_FNAME_SUFFIX
[
i
])
==
0
)
{
*
ftype
=
i
;
...
...
src/tsdb/src/tsdbMeta.c
浏览文件 @
65471ac1
...
...
@@ -531,8 +531,8 @@ STable *tsdbGetTableByUid(STsdbMeta *pMeta, uint64_t uid) {
return
*
(
STable
**
)
ptr
;
}
STSchema
*
tsdbGetTableSchemaByVersion
(
STable
*
pTable
,
int16_t
version
)
{
return
tsdbGetTableSchemaImpl
(
pTable
,
true
,
false
,
version
);
STSchema
*
tsdbGetTableSchemaByVersion
(
STable
*
pTable
,
int16_t
_
version
)
{
return
tsdbGetTableSchemaImpl
(
pTable
,
true
,
false
,
_
version
);
}
int
tsdbWLockRepoMeta
(
STsdbRepo
*
pRepo
)
{
...
...
@@ -891,9 +891,9 @@ static void tsdbRemoveTableFromMeta(STsdbRepo *pRepo, STable *pTable, bool rmFro
maxCols
=
0
;
maxRowBytes
=
0
;
for
(
int
i
=
0
;
i
<
pMeta
->
maxTables
;
i
++
)
{
STable
*
pTable
=
pMeta
->
tables
[
i
];
if
(
pTable
!=
NULL
)
{
pSchema
=
tsdbGetTableSchemaImpl
(
pTable
,
false
,
false
,
-
1
);
STable
*
_
pTable
=
pMeta
->
tables
[
i
];
if
(
_
pTable
!=
NULL
)
{
pSchema
=
tsdbGetTableSchemaImpl
(
_
pTable
,
false
,
false
,
-
1
);
maxCols
=
MAX
(
maxCols
,
schemaNCols
(
pSchema
));
maxRowBytes
=
MAX
(
maxRowBytes
,
schemaTLen
(
pSchema
));
}
...
...
src/util/src/tdes.c
浏览文件 @
65471ac1
...
...
@@ -155,26 +155,26 @@ void generate_key(unsigned char* key) {
}
}
void
print_key_set
(
key_set
key_set
)
{
void
print_key_set
(
key_set
_
key_set
)
{
int
i
;
printf
(
"K:
\n
"
);
for
(
i
=
0
;
i
<
8
;
i
++
)
{
printf
(
"%02X : "
,
key_set
.
k
[
i
]);
print_char_as_binary
(
key_set
.
k
[
i
]);
printf
(
"%02X : "
,
_
key_set
.
k
[
i
]);
print_char_as_binary
(
_
key_set
.
k
[
i
]);
printf
(
"
\n
"
);
}
printf
(
"
\n
C:
\n
"
);
for
(
i
=
0
;
i
<
4
;
i
++
)
{
printf
(
"%02X : "
,
key_set
.
c
[
i
]);
print_char_as_binary
(
key_set
.
c
[
i
]);
printf
(
"%02X : "
,
_
key_set
.
c
[
i
]);
print_char_as_binary
(
_
key_set
.
c
[
i
]);
printf
(
"
\n
"
);
}
printf
(
"
\n
D:
\n
"
);
for
(
i
=
0
;
i
<
4
;
i
++
)
{
printf
(
"%02X : "
,
key_set
.
d
[
i
]);
print_char_as_binary
(
key_set
.
d
[
i
]);
printf
(
"%02X : "
,
_
key_set
.
d
[
i
]);
print_char_as_binary
(
_
key_set
.
d
[
i
]);
printf
(
"
\n
"
);
}
printf
(
"
\n
"
);
...
...
src/wal/src/walWrite.c
浏览文件 @
65471ac1
...
...
@@ -199,7 +199,7 @@ int32_t walRestore(void *handle, void *pVnode, FWalWrite writeFp) {
snprintf
(
walName
,
sizeof
(
pWal
->
name
),
"%s/%s%"
PRId64
,
pWal
->
path
,
WAL_PREFIX
,
fileId
);
wInfo
(
"vgId:%d, file:%s, will be restored"
,
pWal
->
vgId
,
walName
);
int32_t
code
=
walRestoreWalFile
(
pWal
,
pVnode
,
writeFp
,
walName
,
fileId
);
code
=
walRestoreWalFile
(
pWal
,
pVnode
,
writeFp
,
walName
,
fileId
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
wError
(
"vgId:%d, file:%s, failed to restore since %s"
,
pWal
->
vgId
,
walName
,
tstrerror
(
code
));
continue
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录