Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
40ece015
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,发现更多精彩内容 >>
未验证
提交
40ece015
编写于
5月 13, 2020
作者:
S
Shengliang Guan
提交者:
GitHub
5月 13, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1902 from taosdata/feature/support-gcc-4.8
support GCC 4.8
上级
8d0854f8
543415b8
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
50 addition
and
14 deletion
+50
-14
.travis.yml
.travis.yml
+23
-0
src/client/src/tscPrepare.c
src/client/src/tscPrepare.c
+1
-1
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+2
-2
src/client/src/tscSubquery.c
src/client/src/tscSubquery.c
+1
-1
src/dnode/src/dnodeMain.c
src/dnode/src/dnodeMain.c
+1
-1
src/dnode/src/dnodeModule.c
src/dnode/src/dnodeModule.c
+1
-1
src/os/linux/inc/os.h
src/os/linux/inc/os.h
+11
-0
src/os/linux/src/linuxPlatform.c
src/os/linux/src/linuxPlatform.c
+1
-1
src/tsdb/src/tsdbMain.c
src/tsdb/src/tsdbMain.c
+2
-2
src/util/src/exception.c
src/util/src/exception.c
+3
-2
src/util/src/tconfig.c
src/util/src/tconfig.c
+1
-1
src/util/src/tdes.c
src/util/src/tdes.c
+1
-1
src/util/src/terror.c
src/util/src/terror.c
+2
-1
未找到文件。
.travis.yml
浏览文件 @
40ece015
...
...
@@ -203,6 +203,29 @@ matrix:
;;
esac
-
os
:
linux
dist
:
trusty
language
:
c
git
:
-
depth
:
1
addons
:
apt
:
packages
:
-
build-essential
-
cmake
env
:
-
DESC="trusty/gcc-4.8 build"
before_script
:
-
cd ${TRAVIS_BUILD_DIR}
-
mkdir debug
-
cd debug
script
:
-
cmake .. > /dev/null
-
make > /dev/null
-
os
:
linux
language
:
c
compiler
:
clang
...
...
src/client/src/tscPrepare.c
浏览文件 @
40ece015
...
...
@@ -194,7 +194,7 @@ static int normalStmtPrepare(STscStmt* stmt) {
static
char
*
normalStmtBuildSql
(
STscStmt
*
stmt
)
{
SNormalStmt
*
normal
=
&
stmt
->
normal
;
SStringBuilder
sb
=
{
0
}
;
SStringBuilder
sb
;
memset
(
&
sb
,
0
,
sizeof
(
sb
))
;
if
(
taosStringBuilderSetJmp
(
&
sb
)
!=
0
)
{
taosStringBuilderDestroy
(
&
sb
);
...
...
src/client/src/tscSQLParser.c
浏览文件 @
40ece015
...
...
@@ -3558,7 +3558,7 @@ static int32_t setTableCondForSTableQuery(SQueryInfo* pQueryInfo, const char* ac
return
TSDB_CODE_SUCCESS
;
}
SStringBuilder
sb1
=
{
0
}
;
SStringBuilder
sb1
;
memset
(
&
sb1
,
0
,
sizeof
(
sb1
))
;
taosStringBuilderAppendStringLen
(
&
sb1
,
QUERY_COND_REL_PREFIX_IN
,
QUERY_COND_REL_PREFIX_IN_LEN
);
char
db
[
TSDB_TABLE_ID_LEN
]
=
{
0
};
...
...
@@ -3813,7 +3813,7 @@ int32_t parseWhereClause(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SSqlObj* pSql
pQueryInfo
->
window
.
ekey
=
INT64_MAX
;
// tags query condition may be larger than 512bytes, therefore, we need to prepare enough large space
SStringBuilder
sb
=
{
0
}
;
SStringBuilder
sb
;
memset
(
&
sb
,
0
,
sizeof
(
sb
))
;
SCondExpr
condExpr
=
{
0
};
if
((
*
pExpr
)
->
pLeft
==
NULL
||
(
*
pExpr
)
->
pRight
==
NULL
)
{
...
...
src/client/src/tscSubquery.c
浏览文件 @
40ece015
...
...
@@ -488,7 +488,7 @@ void tscBuildVgroupTableInfo(STableMetaInfo* pTableMetaInfo, SArray* tables) {
if
(
prev
==
NULL
||
tt
->
vgId
!=
prev
->
vgId
)
{
SVgroupsInfo
*
pvg
=
pTableMetaInfo
->
vgroupList
;
SVgroupTableInfo
info
=
{
0
};
SVgroupTableInfo
info
=
{
{
0
}
};
for
(
int32_t
m
=
0
;
m
<
pvg
->
numOfVgroups
;
++
m
)
{
if
(
tt
->
vgId
==
pvg
->
vgroups
[
m
].
vgId
)
{
info
.
vgInfo
=
pvg
->
vgroups
[
m
];
...
...
src/dnode/src/dnodeMain.c
浏览文件 @
40ece015
...
...
@@ -84,7 +84,7 @@ int32_t main(int32_t argc, char *argv[]) {
}
/* Set termination handler. */
struct
sigaction
act
=
{
0
};
struct
sigaction
act
=
{
{
0
}
};
act
.
sa_flags
=
SA_SIGINFO
;
act
.
sa_sigaction
=
signal_handler
;
sigaction
(
SIGTERM
,
&
act
,
NULL
);
...
...
src/dnode/src/dnodeModule.c
浏览文件 @
40ece015
...
...
@@ -33,7 +33,7 @@ typedef struct {
void
(
*
stopFp
)();
}
SModule
;
static
SModule
tsModule
[
TSDB_MOD_MAX
]
=
{
0
};
static
SModule
tsModule
[
TSDB_MOD_MAX
]
=
{
{
0
}
};
static
uint32_t
tsModuleStatus
=
0
;
static
void
dnodeSetModuleStatus
(
int32_t
module
)
{
...
...
src/os/linux/inc/os.h
浏览文件 @
40ece015
...
...
@@ -253,6 +253,17 @@ void taosBlockSIGPIPE();
#define BUILDIN_CLZ(val) __builtin_clz(val)
#define BUILDIN_CTZ(val) __builtin_ctz(val)
#undef threadlocal
#ifdef _ISOC11_SOURCE
#define threadlocal _Thread_local
#elif defined(__APPLE__)
#define threadlocal
#elif defined(__GNUC__) && !defined(threadlocal)
#define threadlocal __thread
#else
#define threadlocal
#endif
#ifdef __cplusplus
}
#endif
...
...
src/os/linux/src/linuxPlatform.c
浏览文件 @
40ece015
...
...
@@ -157,7 +157,7 @@ void *taosProcessAlarmSignal(void *tharg) {
void
(
*
callback
)(
int
)
=
tharg
;
static
timer_t
timerId
;
struct
sigevent
sevent
=
{
0
};
struct
sigevent
sevent
=
{
{
0
}
};
#ifdef _ALPINE
sevent
.
sigev_notify
=
SIGEV_THREAD
;
...
...
src/tsdb/src/tsdbMain.c
浏览文件 @
40ece015
...
...
@@ -161,7 +161,7 @@ static int tsdbRestoreInfo(STsdbRepo *pRepo) {
SFileGroup
*
pFGroup
=
NULL
;
SFileGroupIter
iter
;
SRWHelper
rhelper
=
{
0
};
SRWHelper
rhelper
=
{
{
0
}
};
if
(
tsdbInitReadHelper
(
&
rhelper
,
pRepo
)
<
0
)
goto
_err
;
tsdbInitFileGroupIter
(
pFileH
,
&
iter
,
TSDB_ORDER_ASC
);
...
...
@@ -948,7 +948,7 @@ static void *tsdbCommitData(void *arg) {
STsdbCache
*
pCache
=
pRepo
->
tsdbCache
;
STsdbCfg
*
pCfg
=
&
(
pRepo
->
config
);
SDataCols
*
pDataCols
=
NULL
;
SRWHelper
whelper
=
{
0
};
SRWHelper
whelper
=
{
{
0
}
};
if
(
pCache
->
imem
==
NULL
)
return
NULL
;
tsdbPrint
(
"vgId: %d, starting to commit...."
,
pRepo
->
config
.
tsdbId
);
...
...
src/util/src/exception.c
浏览文件 @
40ece015
#include "os.h"
#include "exception.h"
static
_Thread_
local
SExceptionNode
*
expList
;
static
thread
local
SExceptionNode
*
expList
;
void
exceptionPushNode
(
SExceptionNode
*
node
)
{
node
->
prev
=
expList
;
...
...
@@ -145,4 +146,4 @@ void cleanupExecuteTo( int32_t anchor, bool failed ) {
void
cleanupExecute
(
SExceptionNode
*
node
,
bool
failed
)
{
doExecuteCleanup
(
node
,
0
,
failed
);
}
\ No newline at end of file
}
src/util/src/tconfig.c
浏览文件 @
40ece015
...
...
@@ -25,7 +25,7 @@
#include "tsystem.h"
#include "tutil.h"
SGlobalCfg
tsGlobalConfig
[
TSDB_CFG_MAX_NUM
]
=
{
0
};
SGlobalCfg
tsGlobalConfig
[
TSDB_CFG_MAX_NUM
]
=
{
{
0
}
};
int32_t
tsGlobalConfigNum
=
0
;
static
char
*
tsGlobalUnit
[]
=
{
...
...
src/util/src/tdes.c
浏览文件 @
40ece015
...
...
@@ -32,7 +32,7 @@ char* taosDesImp(unsigned char* key, char* src, unsigned int len, int process_mo
unsigned
int
number_of_blocks
=
len
/
8
;
unsigned
char
data_block
[
9
]
=
{
0
};
unsigned
char
processed_block
[
9
]
=
{
0
};
key_set
key_sets
[
17
]
=
{
0
}
;
key_set
key_sets
[
17
]
;
memset
(
key_sets
,
0
,
sizeof
(
key_sets
))
;
char
*
dest
=
calloc
(
len
+
1
,
1
);
generate_sub_keys
(
key
,
key_sets
);
...
...
src/util/src/terror.c
浏览文件 @
40ece015
...
...
@@ -27,10 +27,11 @@ typedef struct {
}
STaosError
;
#include "os.h"
#include "taoserror.h"
static
_Thread_
local
int32_t
tsErrno
;
static
thread
local
int32_t
tsErrno
;
int32_t
*
taosGetErrno
()
{
return
&
tsErrno
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录