Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
842bdc50
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,发现更多精彩内容 >>
提交
842bdc50
编写于
2月 09, 2020
作者:
L
lihui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[modify pkg name]
上级
7db5696b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
43 addition
and
6 deletion
+43
-6
packaging/deb/makedeb.sh
packaging/deb/makedeb.sh
+1
-1
packaging/rpm/makerpm.sh
packaging/rpm/makerpm.sh
+1
-1
packaging/tools/makeclient.sh
packaging/tools/makeclient.sh
+1
-1
packaging/tools/makepkg.sh
packaging/tools/makepkg.sh
+2
-2
src/util/src/ttime.c
src/util/src/ttime.c
+38
-1
未找到文件。
packaging/deb/makedeb.sh
浏览文件 @
842bdc50
...
...
@@ -73,7 +73,7 @@ sed -i "2c$debver" ${pkg_dir}/DEBIAN/control
if
[
"
$verMode
"
==
"cluster"
]
;
then
debname
=
"TDengine-server-"
${
tdengine_ver
}
-
${
osType
}
-
${
cpuType
}
elif
[
"
$verMode
"
==
"lite"
]
;
then
debname
=
"TDengine-server
-edge
"
-
${
tdengine_ver
}
-
${
osType
}
-
${
cpuType
}
debname
=
"TDengine-server"
-
${
tdengine_ver
}
-
${
osType
}
-
${
cpuType
}
else
echo
"unknow verMode, nor cluster or lite"
exit
1
...
...
packaging/rpm/makerpm.sh
浏览文件 @
842bdc50
...
...
@@ -66,7 +66,7 @@ cp_rpm_package ${pkg_dir}/RPMS
if
[
"
$verMode
"
==
"cluster"
]
;
then
rpmname
=
"TDengine-server-"
${
tdengine_ver
}
-
${
osType
}
-
${
cpuType
}
elif
[
"
$verMode
"
==
"lite"
]
;
then
rpmname
=
"TDengine-server
-edge
"
-
${
tdengine_ver
}
-
${
osType
}
-
${
cpuType
}
rpmname
=
"TDengine-server"
-
${
tdengine_ver
}
-
${
osType
}
-
${
cpuType
}
else
echo
"unknow verMode, nor cluster or lite"
exit
1
...
...
packaging/tools/makeclient.sh
浏览文件 @
842bdc50
...
...
@@ -111,7 +111,7 @@ cd ${release_dir}
if
[
"
$verMode
"
==
"cluster"
]
;
then
pkg_name
=
${
install_dir
}
-
${
version
}
-
${
osType
}
-
${
cpuType
}
elif
[
"
$verMode
"
==
"lite"
]
;
then
pkg_name
=
${
install_dir
}
-
edge-
${
version
}
-
${
osType
}
-
${
cpuType
}
pkg_name
=
${
install_dir
}
-
${
version
}
-
${
osType
}
-
${
cpuType
}
else
echo
"unknow verMode, nor cluster or lite"
exit
1
...
...
packaging/tools/makepkg.sh
浏览文件 @
842bdc50
...
...
@@ -111,7 +111,7 @@ cd ${release_dir}
if
[
"
$verMode
"
==
"cluster"
]
;
then
pkg_name
=
${
install_dir
}
-
${
version
}
-
${
osType
}
-
${
cpuType
}
elif
[
"
$verMode
"
==
"lite"
]
;
then
pkg_name
=
${
install_dir
}
-
edge-
${
version
}
-
${
osType
}
-
${
cpuType
}
pkg_name
=
${
install_dir
}
-
${
version
}
-
${
osType
}
-
${
cpuType
}
else
echo
"unknow verMode, nor cluster or lite"
exit
1
...
...
@@ -128,4 +128,4 @@ fi
tar
-zcv
-f
"
$(
basename
${
pkg_name
}
)
.tar.gz"
$(
basename
${
install_dir
}
)
--remove-files
||
:
cd
${
curr_dir
}
\ No newline at end of file
cd
${
curr_dir
}
src/util/src/ttime.c
浏览文件 @
842bdc50
...
...
@@ -24,7 +24,43 @@
#include "ttime.h"
#include "tutil.h"
/*
* mktime64 - Converts date to seconds.
* Converts Gregorian date to seconds since 1970-01-01 00:00:00.
* Assumes input in normal date format, i.e. 1980-12-31 23:59:59
* => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
*
* [For the Julian calendar (which was used in Russia before 1917,
* Britain & colonies before 1752, anywhere else before 1582,
* and is still in use by some communities) leave out the
* -year/100+year/400 terms, and add 10.]
*
* This algorithm was first published by Gauss (I think).
*
* A leap second can be indicated by calling this function with sec as
* 60 (allowable under ISO 8601). The leap second is treated the same
* as the following second since they don't exist in UNIX time.
*
* An encoding of midnight at the end of the day as 24:00:00 - ie. midnight
* tomorrow - (allowable under ISO 8601) is supported.
*/
int64_t
mktime64
(
const
unsigned
int
year0
,
const
unsigned
int
mon0
,
const
unsigned
int
day
,
const
unsigned
int
hour
,
const
unsigned
int
min
,
const
unsigned
int
sec
)
{
unsigned
int
mon
=
mon0
,
year
=
year0
;
/* 1..12 -> 11,12,1..10 */
if
(
0
>=
(
int
)
(
mon
-=
2
))
{
mon
+=
12
;
/* Puts Feb last since it has leap day */
year
-=
1
;
}
int64_t
res
=
(((((
int64_t
)
(
year
/
4
-
year
/
100
+
year
/
400
+
367
*
mon
/
12
+
day
)
+
year
*
365
-
719499
)
*
24
+
hour
)
*
60
+
min
)
*
60
+
sec
);
return
(
res
+
timezone
);
}
// ==== mktime() kernel code =================//
static
int64_t
m_deltaUtc
=
0
;
void
deltaToUtcInitOnce
()
{
...
...
@@ -293,7 +329,8 @@ int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) {
/* mktime will be affected by TZ, set by using taos_options */
//int64_t seconds = mktime(&tm);
int64_t
seconds
=
(
int64_t
)
user_mktime
(
&
tm
);
//int64_t seconds = (int64_t)user_mktime(&tm);
int64_t
seconds
=
mktime64
(
tm
.
tm_year
+
1900
,
tm
.
tm_mon
+
1
,
tm
.
tm_mday
,
tm
.
tm_hour
,
tm
.
tm_min
,
tm
.
tm_sec
);
int64_t
fraction
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录