Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CSDN产品汪
TDengine
提交
fd424455
T
TDengine
项目概览
CSDN产品汪
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
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,发现更多精彩内容 >>
提交
fd424455
编写于
2月 10, 2020
作者:
S
slguan
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into 2.0
上级
53ef820c
df6b88ab
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
70 addition
and
16 deletion
+70
-16
README.md
README.md
+4
-2
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/client/src/taos.def
src/client/src/taos.def
+0
-2
src/client/src/tscFunctionImpl.c
src/client/src/tscFunctionImpl.c
+1
-1
src/util/CMakeLists.txt
src/util/CMakeLists.txt
+2
-0
src/util/src/tglobalcfg.c
src/util/src/tglobalcfg.c
+5
-0
src/util/src/ttime.c
src/util/src/ttime.c
+38
-1
src/util/src/ttypes.c
src/util/src/ttypes.c
+10
-0
src/util/src/version.c
src/util/src/version.c
+5
-5
未找到文件。
README.md
浏览文件 @
fd424455
...
...
@@ -45,13 +45,15 @@ mkdir build && cd build
cmake .. && cmake --build .
```
if compiling on an ARM processor(aarch64 or aarch32), you need add one parameter
:
To compile on an ARM processor (aarch64 or aarch32), please add option CPUTYPE as below
:
```
cmd
aarch64:
```
cmd
cmake .. -DCPUTYPE=aarch64 && cmake --build .
```
aarch32:
```
cmd
cmake .. -DCPUTYPE=aarch32 && cmake --build .
```
...
...
packaging/deb/makedeb.sh
浏览文件 @
fd424455
...
...
@@ -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
浏览文件 @
fd424455
...
...
@@ -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
浏览文件 @
fd424455
...
...
@@ -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
浏览文件 @
fd424455
...
...
@@ -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/client/src/taos.def
浏览文件 @
fd424455
...
...
@@ -24,8 +24,6 @@ taos_fetch_row_a
taos_subscribe
taos_consume
taos_unsubscribe
taos_subfields_count
taos_fetch_subfields
taos_open_stream
taos_close_stream
taos_fetch_block
...
...
src/client/src/tscFunctionImpl.c
浏览文件 @
fd424455
...
...
@@ -3194,7 +3194,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
GET_RES_INFO
(
pCtx
)
->
numOfRes
+=
forwardStep
;
pCtx
->
aOutputBuf
+=
forwardStep
*
pCtx
->
outputBytes
;
pCtx
->
ptsOutputBuf
+=
forwardStep
*
TSDB_KEYSIZE
;
pCtx
->
ptsOutputBuf
=
(
char
*
)
pCtx
->
ptsOutputBuf
+
forwardStep
*
TSDB_KEYSIZE
;
}
}
...
...
src/util/CMakeLists.txt
浏览文件 @
fd424455
...
...
@@ -34,6 +34,7 @@ ELSEIF (TD_WINDOWS_64)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/iconv
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/deps/regex
)
INCLUDE_DIRECTORIES
(
${
TD_COMMUNITY_DIR
}
/src/inc
)
LIST
(
APPEND SRC ./src/hash.c
)
LIST
(
APPEND SRC ./src/ihash.c
)
LIST
(
APPEND SRC ./src/lz4.c
)
LIST
(
APPEND SRC ./src/shash.c
)
...
...
@@ -68,6 +69,7 @@ ELSEIF (TD_WINDOWS_64)
TARGET_LINK_LIBRARIES
(
tutil iconv regex pthread os winmm IPHLPAPI ws2_32
)
ELSEIF
(
TD_DARWIN_64
)
ADD_DEFINITIONS
(
-DUSE_LIBICONV
)
LIST
(
APPEND SRC ./src/hash.c
)
LIST
(
APPEND SRC ./src/ihash.c
)
LIST
(
APPEND SRC ./src/lz4.c
)
LIST
(
APPEND SRC ./src/shash.c
)
...
...
src/util/src/tglobalcfg.c
浏览文件 @
fd424455
...
...
@@ -80,7 +80,12 @@ short tsNumOfVnodesPerCore = 8;
short
tsNumOfTotalVnodes
=
0
;
short
tsCheckHeaderFile
=
0
;
#ifdef _TD_ARM_32_
int
tsSessionsPerVnode
=
100
;
#else
int
tsSessionsPerVnode
=
1000
;
#endif
int
tsCacheBlockSize
=
16384
;
// 256 columns
int
tsAverageCacheBlocks
=
TSDB_DEFAULT_AVG_BLOCKS
;
/**
...
...
src/util/src/ttime.c
浏览文件 @
fd424455
...
...
@@ -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
user_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
=
user_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
;
...
...
src/util/src/ttypes.c
浏览文件 @
fd424455
...
...
@@ -976,11 +976,21 @@ void assignVal(char *val, const char *src, int32_t len, int32_t type) {
break
;
}
case
TSDB_DATA_TYPE_FLOAT
:
{
#ifdef _TD_ARM_32_
float
fv
=
GET_FLOAT_VAL
(
src
);
SET_FLOAT_VAL_ALIGN
(
val
,
&
fv
);
#else
*
((
float
*
)
val
)
=
GET_FLOAT_VAL
(
src
);
#endif
break
;
};
case
TSDB_DATA_TYPE_DOUBLE
:
{
#ifdef _TD_ARM_32_
double
dv
=
GET_DOUBLE_VAL
(
src
);
SET_DOUBLE_VAL_ALIGN
(
val
,
&
dv
);
#else
*
((
double
*
)
val
)
=
GET_DOUBLE_VAL
(
src
);
#endif
break
;
};
case
TSDB_DATA_TYPE_TIMESTAMP
:
...
...
src/util/src/version.c
浏览文件 @
fd424455
char
version
[
64
]
=
"1.6.5.
3
"
;
char
version
[
64
]
=
"1.6.5.
4
"
;
char
compatible_version
[
64
]
=
"1.6.1.0"
;
char
gitinfo
[
128
]
=
"
700305490a82228ec1b0244afb838bdbb9de9793
"
;
char
gitinfoOfInternal
[
128
]
=
""
;
char
buildinfo
[
512
]
=
"Built by
at 2020-01-17 13:22
"
;
char
gitinfo
[
128
]
=
"
3264067e97300c84caa61ac909d548c9ca56de6b
"
;
char
gitinfoOfInternal
[
128
]
=
"
da88f4a2474737d1f9c76adcf0ff7fd0975e7342
"
;
char
buildinfo
[
512
]
=
"Built by
root at 2020-02-05 14:38
"
;
void
libtaos_
edge_1_6_5_1
_Linux_x64
()
{};
void
libtaos_
1_6_5_4
_Linux_x64
()
{};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录