Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
925ac93e
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
925ac93e
编写于
4月 12, 2022
作者:
wafwerar
提交者:
GitHub
4月 12, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #11393 from taosdata/fix/ZhiqiangWang/TD-13756-fix-macro-name-error
fix: correct macro name error
上级
fc58e239
c11946fd
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
41 addition
and
41 deletion
+41
-41
include/os/osFile.h
include/os/osFile.h
+1
-1
source/common/src/ttszip.c
source/common/src/ttszip.c
+1
-1
source/dnode/mgmt/dm/dmFile.c
source/dnode/mgmt/dm/dmFile.c
+1
-1
source/dnode/mgmt/main/dndFile.c
source/dnode/mgmt/main/dndFile.c
+3
-3
source/dnode/mgmt/mm/mmFile.c
source/dnode/mgmt/mm/mmFile.c
+1
-1
source/dnode/mgmt/vm/vmFile.c
source/dnode/mgmt/vm/vmFile.c
+1
-1
source/dnode/mnode/impl/test/trans/trans.cpp
source/dnode/mnode/impl/test/trans/trans.cpp
+1
-1
source/dnode/mnode/sdb/src/sdbFile.c
source/dnode/mnode/sdb/src/sdbFile.c
+1
-1
source/dnode/vnode/src/tq/tqMetaStore.c
source/dnode/vnode/src/tq/tqMetaStore.c
+2
-2
source/dnode/vnode/src/tsdb/tsdbFS.c
source/dnode/vnode/src/tsdb/tsdbFS.c
+1
-1
source/dnode/vnode/src/tsdb/tsdbFile.c
source/dnode/vnode/src/tsdb/tsdbFile.c
+2
-2
source/libs/index/src/indexFstCountingWriter.c
source/libs/index/src/indexFstCountingWriter.c
+1
-1
source/libs/sync/src/syncRaftStore.c
source/libs/sync/src/syncRaftStore.c
+1
-1
source/libs/tdb/src/inc/tdbOs.h
source/libs/tdb/src/inc/tdbOs.h
+1
-1
source/libs/tfs/test/tfsTest.cpp
source/libs/tfs/test/tfsTest.cpp
+2
-2
source/libs/transport/test/pushServer.c
source/libs/transport/test/pushServer.c
+1
-1
source/libs/transport/test/rserver.c
source/libs/transport/test/rserver.c
+1
-1
source/libs/wal/src/walMeta.c
source/libs/wal/src/walMeta.c
+1
-1
source/libs/wal/src/walSeek.c
source/libs/wal/src/walSeek.c
+4
-4
source/libs/wal/src/walWrite.c
source/libs/wal/src/walWrite.c
+2
-2
source/os/src/osFile.c
source/os/src/osFile.c
+2
-2
source/util/src/tlog.c
source/util/src/tlog.c
+3
-3
source/util/src/tpagedbuf.c
source/util/src/tpagedbuf.c
+1
-1
tests/test/c/tmqDemo.c
tests/test/c/tmqDemo.c
+1
-1
tests/tsim/src/simExe.c
tests/tsim/src/simExe.c
+2
-2
tools/shell/src/backup/shellCheck.c
tools/shell/src/backup/shellCheck.c
+1
-1
tools/shell/src/shellEngine.c
tools/shell/src/shellEngine.c
+2
-2
未找到文件。
include/os/osFile.h
浏览文件 @
925ac93e
...
...
@@ -44,7 +44,7 @@ extern "C" {
typedef
struct
TdFile
*
TdFilePtr
;
#define TD_FILE_C
T
EATE 0x0001
#define TD_FILE_C
R
EATE 0x0001
#define TD_FILE_WRITE 0x0002
#define TD_FILE_READ 0x0004
#define TD_FILE_TRUNC 0x0008
...
...
source/common/src/ttszip.c
浏览文件 @
925ac93e
...
...
@@ -39,7 +39,7 @@ STSBuf* tsBufCreate(bool autoDelete, int32_t order) {
taosGetTmpfilePath
(
tsTempDir
,
"join"
,
pTSBuf
->
path
);
// pTSBuf->pFile = fopen(pTSBuf->path, "wb+");
pTSBuf
->
pFile
=
taosOpenFile
(
pTSBuf
->
path
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_READ
|
TD_FILE_TRUNC
);
pTSBuf
->
pFile
=
taosOpenFile
(
pTSBuf
->
path
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_READ
|
TD_FILE_TRUNC
);
if
(
pTSBuf
->
pFile
==
NULL
)
{
taosMemoryFree
(
pTSBuf
);
return
NULL
;
...
...
source/dnode/mgmt/dm/dmFile.c
浏览文件 @
925ac93e
...
...
@@ -162,7 +162,7 @@ int32_t dmWriteFile(SDnodeMgmt *pMgmt) {
char
file
[
PATH_MAX
];
snprintf
(
file
,
sizeof
(
file
),
"%s%sdnode.json.bak"
,
pMgmt
->
path
,
TD_DIRSEP
);
TdFilePtr
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
dError
(
"failed to write %s since %s"
,
file
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
...
...
source/dnode/mgmt/main/dndFile.c
浏览文件 @
925ac93e
...
...
@@ -75,7 +75,7 @@ int32_t dndWriteFile(SMgmtWrapper *pWrapper, bool deployed) {
snprintf
(
file
,
sizeof
(
file
),
"%s%s%s.json"
,
pWrapper
->
path
,
TD_DIRSEP
,
pWrapper
->
name
);
snprintf
(
realfile
,
sizeof
(
realfile
),
"%s%s%s.json"
,
pWrapper
->
path
,
TD_DIRSEP
,
pWrapper
->
name
);
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
dError
(
"failed to write %s since %s"
,
file
,
terrstr
());
...
...
@@ -121,7 +121,7 @@ TdFilePtr dndCheckRunning(const char *dataDir) {
char
filepath
[
PATH_MAX
]
=
{
0
};
snprintf
(
filepath
,
sizeof
(
filepath
),
"%s%s.running"
,
dataDir
,
TD_DIRSEP
);
TdFilePtr
pFile
=
taosOpenFile
(
filepath
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
filepath
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
dError
(
"failed to lock file:%s since %s"
,
filepath
,
terrstr
());
...
...
@@ -218,7 +218,7 @@ int32_t dndWriteShmFile(SDnode *pDnode) {
snprintf
(
file
,
sizeof
(
file
),
"%s%s.shmfile.bak"
,
pDnode
->
dataDir
,
TD_DIRSEP
);
snprintf
(
realfile
,
sizeof
(
realfile
),
"%s%s.shmfile"
,
pDnode
->
dataDir
,
TD_DIRSEP
);
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
dError
(
"failed to open file:%s since %s"
,
file
,
terrstr
());
...
...
source/dnode/mgmt/mm/mmFile.c
浏览文件 @
925ac93e
...
...
@@ -109,7 +109,7 @@ int32_t mmWriteFile(SMnodeMgmt *pMgmt, bool deployed) {
char
file
[
PATH_MAX
];
snprintf
(
file
,
sizeof
(
file
),
"%s%smnode.json.bak"
,
pMgmt
->
path
,
TD_DIRSEP
);
TdFilePtr
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
dError
(
"failed to write %s since %s"
,
file
,
terrstr
());
...
...
source/dnode/mgmt/vm/vmFile.c
浏览文件 @
925ac93e
...
...
@@ -154,7 +154,7 @@ int32_t vmWriteVnodesToFile(SVnodesMgmt *pMgmt) {
snprintf
(
file
,
sizeof
(
file
),
"%s%svnodes.json.bak"
,
pMgmt
->
path
,
TD_DIRSEP
);
snprintf
(
realfile
,
sizeof
(
file
),
"%s%svnodes.json"
,
pMgmt
->
path
,
TD_DIRSEP
);
TdFilePtr
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
dError
(
"failed to write %s since %s"
,
file
,
terrstr
());
...
...
source/dnode/mnode/impl/test/trans/trans.cpp
浏览文件 @
925ac93e
...
...
@@ -38,7 +38,7 @@ class MndTestTrans : public ::testing::Test {
test
.
ServerStop
();
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
int32_t
writeLen
=
taosWriteFile
(
pFile
,
buffer
,
readLen
);
if
(
writeLen
<
0
||
writeLen
==
readLen
)
{
ASSERT
(
1
);
...
...
source/dnode/mnode/sdb/src/sdbFile.c
浏览文件 @
925ac93e
...
...
@@ -232,7 +232,7 @@ static int32_t sdbWriteFileImp(SSdb *pSdb) {
mDebug
(
"start to write file:%s, current ver:%"
PRId64
", commit ver:%"
PRId64
,
curfile
,
pSdb
->
curVer
,
pSdb
->
lastCommitVer
);
TdFilePtr
pFile
=
taosOpenFile
(
tmpfile
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
tmpfile
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
mError
(
"failed to open file:%s for write since %s"
,
tmpfile
,
terrstr
());
...
...
source/dnode/vnode/src/tq/tqMetaStore.c
浏览文件 @
925ac93e
...
...
@@ -95,7 +95,7 @@ STqMetaStore* tqStoreOpen(STQ* pTq, const char* path, FTqSerialize serializer, F
tqError
(
"failed to create dir:%s since %s "
,
name
,
terrstr
());
}
strcat
(
name
,
"/"
TQ_IDX_NAME
);
TdFilePtr
pIdxFile
=
taosOpenFile
(
name
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_READ
);
TdFilePtr
pIdxFile
=
taosOpenFile
(
name
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_READ
);
if
(
pIdxFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
tqError
(
"failed to open file:%s since %s "
,
name
,
terrstr
());
...
...
@@ -113,7 +113,7 @@ STqMetaStore* tqStoreOpen(STQ* pTq, const char* path, FTqSerialize serializer, F
strcpy
(
name
,
path
);
strcat
(
name
,
"/"
TQ_META_NAME
);
TdFilePtr
pFile
=
taosOpenFile
(
name
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_READ
);
TdFilePtr
pFile
=
taosOpenFile
(
name
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_READ
);
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
tqError
(
"failed to open file:%s since %s"
,
name
,
terrstr
());
...
...
source/dnode/vnode/src/tsdb/tsdbFS.c
浏览文件 @
925ac93e
...
...
@@ -416,7 +416,7 @@ static int tsdbSaveFSStatus(STsdb *pRepo, SFSStatus *pStatus) {
tsdbGetTxnFname
(
pRepo
,
TSDB_TXN_TEMP_FILE
,
tfname
);
tsdbGetTxnFname
(
pRepo
,
TSDB_TXN_CURR_FILE
,
cfname
);
TdFilePtr
pFile
=
taosOpenFile
(
tfname
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
tfname
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
...
...
source/dnode/vnode/src/tsdb/tsdbFile.c
浏览文件 @
925ac93e
...
...
@@ -360,7 +360,7 @@ static void *tsdbDecodeSDFileEx(void *buf, SDFile *pDFile) {
int
tsdbCreateDFile
(
STsdb
*
pRepo
,
SDFile
*
pDFile
,
bool
updateHeader
,
TSDB_FILE_T
fType
)
{
ASSERT
(
pDFile
->
info
.
size
==
0
&&
pDFile
->
info
.
magic
==
TSDB_FILE_INIT_MAGIC
);
pDFile
->
pFile
=
taosOpenFile
(
TSDB_FILE_FULL_NAME
(
pDFile
),
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
pDFile
->
pFile
=
taosOpenFile
(
TSDB_FILE_FULL_NAME
(
pDFile
),
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pDFile
->
pFile
==
NULL
)
{
if
(
errno
==
ENOENT
)
{
// Try to create directory recursively
...
...
@@ -371,7 +371,7 @@ int tsdbCreateDFile(STsdb *pRepo, SDFile *pDFile, bool updateHeader, TSDB_FILE_T
}
taosMemoryFreeClear
(
s
);
pDFile
->
pFile
=
taosOpenFile
(
TSDB_FILE_FULL_NAME
(
pDFile
),
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
pDFile
->
pFile
=
taosOpenFile
(
TSDB_FILE_FULL_NAME
(
pDFile
),
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pDFile
->
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
...
...
source/libs/index/src/indexFstCountingWriter.c
浏览文件 @
925ac93e
...
...
@@ -92,7 +92,7 @@ WriterCtx* writerCtxCreate(WriterType type, const char* path, bool readOnly, int
ctx
->
file
.
readOnly
=
readOnly
;
if
(
readOnly
==
false
)
{
// ctx->file.pFile = open(path, O_WRONLY | O_CREAT | O_APPEND, S_IRWXU | S_IRWXG | S_IRWXO);
ctx
->
file
.
pFile
=
taosOpenFile
(
path
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
ctx
->
file
.
pFile
=
taosOpenFile
(
path
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
taosFtruncateFile
(
ctx
->
file
.
pFile
,
0
);
int64_t
file_size
;
taosStatFile
(
path
,
&
file_size
,
NULL
);
...
...
source/libs/sync/src/syncRaftStore.c
浏览文件 @
925ac93e
...
...
@@ -57,7 +57,7 @@ SRaftStore *raftStoreOpen(const char *path) {
static
int32_t
raftStoreInit
(
SRaftStore
*
pRaftStore
)
{
assert
(
pRaftStore
!=
NULL
);
pRaftStore
->
pFile
=
taosOpenFile
(
pRaftStore
->
path
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
);
pRaftStore
->
pFile
=
taosOpenFile
(
pRaftStore
->
path
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
);
assert
(
pRaftStore
->
pFile
!=
NULL
);
pRaftStore
->
currentTerm
=
0
;
...
...
source/libs/tdb/src/inc/tdbOs.h
浏览文件 @
925ac93e
...
...
@@ -37,7 +37,7 @@ extern "C" {
/* file */
typedef
TdFilePtr
tdb_fd_t
;
#define TDB_O_CREAT TD_FILE_C
T
EATE
#define TDB_O_CREAT TD_FILE_C
R
EATE
#define TDB_O_WRITE TD_FILE_WRITE
#define TDB_O_READ TD_FILE_READ
#define TDB_O_TRUNC TD_FILE_TRUNC
...
...
source/libs/tfs/test/tfsTest.cpp
浏览文件 @
925ac93e
...
...
@@ -231,7 +231,7 @@ TEST_F(TfsTest, 04_File) {
EXPECT_EQ
(
tfsMkdir
(
pTfs
,
"t3"
),
0
);
// FILE *fp = fopen(f1.aname, "w");
TdFilePtr
pFile
=
taosOpenFile
(
f1
.
aname
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
f1
.
aname
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
ASSERT_NE
(
pFile
,
nullptr
);
taosWriteFile
(
pFile
,
"12345678"
,
5
);
taosCloseFile
(
&
pFile
);
...
...
@@ -640,7 +640,7 @@ TEST_F(TfsTest, 05_MultiDisk) {
EXPECT_EQ
(
tfsMkdir
(
pTfs
,
"t3"
),
0
);
// FILE *fp = fopen(f1.aname, "w");
TdFilePtr
pFile
=
taosOpenFile
(
f1
.
aname
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
f1
.
aname
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
ASSERT_NE
(
pFile
,
nullptr
);
taosWriteFile
(
pFile
,
"12345678"
,
5
);
taosCloseFile
(
&
pFile
);
...
...
source/libs/transport/test/pushServer.c
浏览文件 @
925ac93e
...
...
@@ -181,7 +181,7 @@ int main(int argc, char *argv[]) {
tInfo
(
"RPC server is running, ctrl-c to exit"
);
if
(
commit
)
{
pDataFile
=
taosOpenFile
(
dataName
,
TD_FILE_APPEND
|
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
);
pDataFile
=
taosOpenFile
(
dataName
,
TD_FILE_APPEND
|
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
);
if
(
pDataFile
==
NULL
)
tInfo
(
"failed to open data file, reason:%s"
,
strerror
(
errno
));
}
qhandle
=
taosOpenQueue
();
...
...
source/libs/transport/test/rserver.c
浏览文件 @
925ac93e
...
...
@@ -177,7 +177,7 @@ int main(int argc, char *argv[]) {
tInfo
(
"RPC server is running, ctrl-c to exit"
);
if
(
commit
)
{
pDataFile
=
taosOpenFile
(
dataName
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
pDataFile
=
taosOpenFile
(
dataName
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
if
(
pDataFile
==
NULL
)
tInfo
(
"failed to open data file, reason:%s"
,
strerror
(
errno
));
}
qhandle
=
taosOpenQueue
();
...
...
source/libs/wal/src/walMeta.c
浏览文件 @
925ac93e
...
...
@@ -360,7 +360,7 @@ int walSaveMeta(SWal* pWal) {
int
metaVer
=
walFindCurMetaVer
(
pWal
);
char
fnameStr
[
WAL_FILE_LEN
];
walBuildMetaName
(
pWal
,
metaVer
+
1
,
fnameStr
);
TdFilePtr
pMataFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
);
TdFilePtr
pMataFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
);
if
(
pMataFile
==
NULL
)
{
return
-
1
;
}
...
...
source/libs/wal/src/walSeek.c
浏览文件 @
925ac93e
...
...
@@ -56,13 +56,13 @@ int walSetWrite(SWal* pWal) {
char
fnameStr
[
WAL_FILE_LEN
];
walBuildIdxName
(
pWal
,
fileFirstVer
,
fnameStr
);
pIdxTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
pIdxTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
if
(
pIdxTFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
}
walBuildLogName
(
pWal
,
fileFirstVer
,
fnameStr
);
pLogTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
pLogTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
if
(
pLogTFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
...
...
@@ -102,14 +102,14 @@ int walChangeWrite(SWal* pWal, int64_t ver) {
int64_t
fileFirstVer
=
pFileInfo
->
firstVer
;
walBuildIdxName
(
pWal
,
fileFirstVer
,
fnameStr
);
pIdxTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
pIdxTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
if
(
pIdxTFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
pWal
->
pWriteIdxTFile
=
NULL
;
return
-
1
;
}
walBuildLogName
(
pWal
,
fileFirstVer
,
fnameStr
);
pLogTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
pLogTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
if
(
pLogTFile
==
NULL
)
{
taosCloseFile
(
&
pIdxTFile
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
...
...
source/libs/wal/src/walWrite.c
浏览文件 @
925ac93e
...
...
@@ -216,13 +216,13 @@ int walRoll(SWal *pWal) {
int64_t
newFileFirstVersion
=
pWal
->
vers
.
lastVer
+
1
;
char
fnameStr
[
WAL_FILE_LEN
];
walBuildIdxName
(
pWal
,
newFileFirstVersion
,
fnameStr
);
pIdxTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
pIdxTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
if
(
pIdxTFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
}
walBuildLogName
(
pWal
,
newFileFirstVersion
,
fnameStr
);
pLogTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
pLogTFile
=
taosOpenFile
(
fnameStr
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
);
if
(
pLogTFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
...
...
source/os/src/osFile.c
浏览文件 @
925ac93e
...
...
@@ -129,7 +129,7 @@ int64_t taosCopyFile(const char *from, const char *to) {
if
(
pFileFrom
==
NULL
)
goto
_err
;
// fidto = open(to, O_WRONLY | O_CREAT | O_EXCL, 0755);
TdFilePtr
pFileTo
=
taosOpenFile
(
to
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_EXCL
);
TdFilePtr
pFileTo
=
taosOpenFile
(
to
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_EXCL
);
if
(
pFileTo
==
NULL
)
goto
_err
;
while
(
true
)
{
...
...
@@ -246,7 +246,7 @@ TdFilePtr taosOpenFile(const char *path, int32_t tdFileOptions) {
}
}
else
{
int
access
=
O_BINARY
;
access
|=
(
tdFileOptions
&
TD_FILE_C
T
EATE
)
?
O_CREAT
:
0
;
access
|=
(
tdFileOptions
&
TD_FILE_C
R
EATE
)
?
O_CREAT
:
0
;
if
((
tdFileOptions
&
TD_FILE_WRITE
)
&&
(
tdFileOptions
&
TD_FILE_READ
))
{
access
|=
O_RDWR
;
}
else
if
(
tdFileOptions
&
TD_FILE_WRITE
)
{
...
...
source/util/src/tlog.c
浏览文件 @
925ac93e
...
...
@@ -199,7 +199,7 @@ static void *taosThreadToOpenNewFile(void *param) {
taosUmaskFile
(
0
);
TdFilePtr
pFile
=
taosOpenFile
(
name
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
name
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
tsLogObj
.
openInProgress
=
0
;
tsLogObj
.
lines
=
tsLogObj
.
maxLines
-
1000
;
...
...
@@ -348,7 +348,7 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) {
taosThreadMutexInit
(
&
tsLogObj
.
logMutex
,
NULL
);
taosUmaskFile
(
0
);
tsLogObj
.
logHandle
->
pFile
=
taosOpenFile
(
fileName
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
);
tsLogObj
.
logHandle
->
pFile
=
taosOpenFile
(
fileName
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
);
if
(
tsLogObj
.
logHandle
->
pFile
==
NULL
)
{
printf
(
"
\n
failed to open log file:%s, reason:%s
\n
"
,
fileName
,
strerror
(
errno
));
...
...
@@ -699,7 +699,7 @@ int32_t taosCompressFile(char *srcFileName, char *destFileName) {
goto
cmp_end
;
}
TdFilePtr
pFile
=
taosOpenFile
(
destFileName
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
destFileName
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
ret
=
-
2
;
goto
cmp_end
;
...
...
source/util/src/tpagedbuf.c
浏览文件 @
925ac93e
...
...
@@ -48,7 +48,7 @@ struct SDiskbasedBuf {
};
static
int32_t
createDiskFile
(
SDiskbasedBuf
*
pBuf
)
{
pBuf
->
pFile
=
taosOpenFile
(
pBuf
->
path
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_READ
|
TD_FILE_TRUNC
|
TD_FILE_AUTO_DEL
);
pBuf
->
pFile
=
taosOpenFile
(
pBuf
->
path
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_READ
|
TD_FILE_TRUNC
|
TD_FILE_AUTO_DEL
);
if
(
pBuf
->
pFile
==
NULL
)
{
return
TAOS_SYSTEM_ERROR
(
errno
);
}
...
...
tests/test/c/tmqDemo.c
浏览文件 @
925ac93e
...
...
@@ -588,7 +588,7 @@ int32_t syncWriteDataByRatio() {
void
printParaIntoFile
()
{
// FILE *fp = fopen(g_stConfInfo.resultFileName, "a");
TdFilePtr
pFile
=
taosOpenFile
(
g_stConfInfo
.
resultFileName
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
|
TD_FILE_STREAM
);
TdFilePtr
pFile
=
taosOpenFile
(
g_stConfInfo
.
resultFileName
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_APPEND
|
TD_FILE_STREAM
);
if
(
NULL
==
pFile
)
{
fprintf
(
stderr
,
"Failed to open %s for save result
\n
"
,
g_stConfInfo
.
resultFileName
);
exit
-
1
;
...
...
tests/tsim/src/simExe.c
浏览文件 @
925ac93e
...
...
@@ -22,7 +22,7 @@ void simLogSql(char *sql, bool useSharp) {
sprintf
(
filename
,
"%s/sim.sql"
,
simScriptDir
);
if
(
pFile
==
NULL
)
{
// fp = fopen(filename, "w");
pFile
=
taosOpenFile
(
filename
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
|
TD_FILE_STREAM
);
pFile
=
taosOpenFile
(
filename
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
|
TD_FILE_STREAM
);
if
(
pFile
==
NULL
)
{
fprintf
(
stderr
,
"ERROR: failed to open file: %s
\n
"
,
filename
);
return
;
...
...
@@ -773,7 +773,7 @@ bool simExecuteRestfulCmd(SScript *script, char *rest) {
char
filename
[
256
];
sprintf
(
filename
,
"%s/tmp.sql"
,
simScriptDir
);
// fp = fopen(filename, "w");
pFile
=
taosOpenFile
(
filename
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
|
TD_FILE_STREAM
);
pFile
=
taosOpenFile
(
filename
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
|
TD_FILE_STREAM
);
if
(
pFile
==
NULL
)
{
fprintf
(
stderr
,
"ERROR: failed to open file: %s
\n
"
,
filename
);
return
false
;
...
...
tools/shell/src/backup/shellCheck.c
浏览文件 @
925ac93e
...
...
@@ -116,7 +116,7 @@ static void *shellCheckThreadFp(void *arg) {
char
file
[
32
]
=
{
0
};
snprintf
(
file
,
32
,
"tb%d.txt"
,
pThread
->
threadIndex
);
TdFilePtr
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
TdFilePtr
pFile
=
taosOpenFile
(
file
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
!
fp
)
{
fprintf
(
stdout
,
"failed to open %s, reason:%s"
,
file
,
strerror
(
errno
));
return
NULL
;
...
...
tools/shell/src/shellEngine.c
浏览文件 @
925ac93e
...
...
@@ -518,7 +518,7 @@ static int dumpResultToFile(const char *fname, TAOS_RES *tres) {
}
// FILE *fp = fopen(full_path.we_wordv[0], "w");
TdFilePtr
pFile
=
taosOpenFile
(
full_path
.
we_wordv
[
0
],
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
|
TD_FILE_STREAM
);
TdFilePtr
pFile
=
taosOpenFile
(
full_path
.
we_wordv
[
0
],
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
|
TD_FILE_STREAM
);
if
(
pFile
==
NULL
)
{
fprintf
(
stderr
,
"ERROR: failed to open file: %s
\n
"
,
full_path
.
we_wordv
[
0
]);
wordfree
(
&
full_path
);
...
...
@@ -935,7 +935,7 @@ void write_history() {
get_history_path
(
f_history
);
// FILE *f = fopen(f_history, "w");
TdFilePtr
pFile
=
taosOpenFile
(
f_history
,
TD_FILE_C
T
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
|
TD_FILE_STREAM
);
TdFilePtr
pFile
=
taosOpenFile
(
f_history
,
TD_FILE_C
R
EATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
|
TD_FILE_STREAM
);
if
(
pFile
==
NULL
)
{
#ifndef WINDOWS
fprintf
(
stderr
,
"Failed to open file %s for write, reason:%s
\n
"
,
f_history
,
strerror
(
errno
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录