Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小楼昨夜-听风雨
TDengine
提交
bafad318
T
TDengine
项目概览
小楼昨夜-听风雨
/
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,发现更多精彩内容 >>
提交
bafad318
编写于
9月 08, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
TD-1263 compile in windows
上级
159f59a1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
4 addition
and
41 deletion
+4
-41
src/common/src/tglobal.c
src/common/src/tglobal.c
+1
-1
src/os/inc/osWindows.h
src/os/inc/osWindows.h
+0
-2
src/os/src/detail/osDir.c
src/os/src/detail/osDir.c
+2
-6
src/os/src/windows/wDir.c
src/os/src/windows/wDir.c
+0
-31
src/tsdb/src/tsdbFile.c
src/tsdb/src/tsdbFile.c
+1
-1
未找到文件。
src/common/src/tglobal.c
浏览文件 @
bafad318
...
...
@@ -254,7 +254,7 @@ bool taosCfgDynamicOptions(char *msg) {
//if (!(cfg->cfgType & TSDB_CFG_CTYPE_B_LOG)) continue;
if
(
cfg
->
valType
!=
TAOS_CFG_VTYPE_INT32
)
continue
;
int32_t
cfgLen
=
strlen
(
cfg
->
option
);
int32_t
cfgLen
=
(
int32_t
)
strlen
(
cfg
->
option
);
if
(
cfgLen
!=
olen
)
continue
;
if
(
strncasecmp
(
option
,
cfg
->
option
,
olen
)
!=
0
)
continue
;
*
((
int32_t
*
)
cfg
->
ptr
)
=
vint
;
...
...
src/os/inc/osWindows.h
浏览文件 @
bafad318
...
...
@@ -58,8 +58,6 @@ extern "C" {
int32_t
BUILDIN_CTZL
(
uint64_t
val
);
int32_t
BUILDIN_CTZ
(
uint32_t
val
);
#define TAOS_OS_FUNC_DIR
#define TAOS_OS_FUNC_FILE
#define TAOS_OS_FUNC_FILE_ISREG
#define TAOS_OS_FUNC_FILE_ISDIR
...
...
src/os/src/detail/osDir.c
浏览文件 @
bafad318
...
...
@@ -18,8 +18,6 @@
#include "tglobal.h"
#include "tulog.h"
#ifndef TAOS_OS_FUNC_DIR
void
taosRemoveDir
(
char
*
rootDir
)
{
DIR
*
dir
=
opendir
(
rootDir
);
if
(
dir
==
NULL
)
return
;
...
...
@@ -79,7 +77,7 @@ void taosRemoveOldLogFiles(char *rootDir, int32_t keepDays) {
// if (stat(fname, &fState) < 0) {
// continue;
// }
int32_t
len
=
strlen
(
filename
);
int32_t
len
=
(
int32_t
)
strlen
(
filename
);
int64_t
fileSec
=
0
;
for
(
int
i
=
len
-
1
;
i
>=
0
;
i
--
)
{
if
(
filename
[
i
]
==
'.'
)
{
...
...
@@ -89,7 +87,7 @@ void taosRemoveOldLogFiles(char *rootDir, int32_t keepDays) {
}
if
(
fileSec
<=
100
)
continue
;
int32_t
days
=
ABS
(
sec
-
fileSec
)
/
86400
+
1
;
int32_t
days
=
(
int32_t
)(
ABS
(
sec
-
fileSec
)
/
86400
+
1
)
;
if
(
days
>
keepDays
)
{
(
void
)
remove
(
filename
);
uInfo
(
"file:%s is removed, days:%d keepDays:%d"
,
filename
,
days
,
keepDays
);
...
...
@@ -102,5 +100,3 @@ void taosRemoveOldLogFiles(char *rootDir, int32_t keepDays) {
closedir
(
dir
);
rmdir
(
rootDir
);
}
#endif
src/os/src/windows/wDir.c
已删除
100644 → 0
浏览文件 @
159f59a1
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "tulog.h"
void
taosRemoveDir
(
char
*
rootDir
)
{
uError
(
"%s not implemented yet"
,
__FUNCTION__
);
}
int
taosMkDir
(
const
char
*
path
,
mode_t
mode
)
{
uError
(
"%s not implemented yet"
,
__FUNCTION__
);
return
0
;
}
void
taosMvDir
(
char
*
destDir
,
char
*
srcDir
)
{
uError
(
"%s not implemented yet"
,
__FUNCTION__
);
}
src/tsdb/src/tsdbFile.c
浏览文件 @
bafad318
...
...
@@ -576,5 +576,5 @@ static TSKEY tsdbGetCurrMinKey(int8_t precision, int32_t keep) {
}
static
int
tsdbGetCurrMinFid
(
int8_t
precision
,
int32_t
keep
,
int32_t
days
)
{
return
TSDB_KEY_FILEID
(
tsdbGetCurrMinKey
(
precision
,
keep
),
days
,
precision
);
return
(
int
)(
TSDB_KEY_FILEID
(
tsdbGetCurrMinKey
(
precision
,
keep
),
days
,
precision
)
);
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录