parent
09cbf619f0
commit
543415b8d5
23
.travis.yml
23
.travis.yml
|
@ -203,6 +203,29 @@ matrix:
|
||||||
;;
|
;;
|
||||||
esac
|
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
|
- os: linux
|
||||||
language: c
|
language: c
|
||||||
compiler: clang
|
compiler: clang
|
||||||
|
|
|
@ -194,7 +194,7 @@ static int normalStmtPrepare(STscStmt* stmt) {
|
||||||
|
|
||||||
static char* normalStmtBuildSql(STscStmt* stmt) {
|
static char* normalStmtBuildSql(STscStmt* stmt) {
|
||||||
SNormalStmt* normal = &stmt->normal;
|
SNormalStmt* normal = &stmt->normal;
|
||||||
SStringBuilder sb = {0};
|
SStringBuilder sb; memset(&sb, 0, sizeof(sb));
|
||||||
|
|
||||||
if (taosStringBuilderSetJmp(&sb) != 0) {
|
if (taosStringBuilderSetJmp(&sb) != 0) {
|
||||||
taosStringBuilderDestroy(&sb);
|
taosStringBuilderDestroy(&sb);
|
||||||
|
|
|
@ -3558,7 +3558,7 @@ static int32_t setTableCondForSTableQuery(SQueryInfo* pQueryInfo, const char* ac
|
||||||
return TSDB_CODE_SUCCESS;
|
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);
|
taosStringBuilderAppendStringLen(&sb1, QUERY_COND_REL_PREFIX_IN, QUERY_COND_REL_PREFIX_IN_LEN);
|
||||||
|
|
||||||
char db[TSDB_TABLE_ID_LEN] = {0};
|
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;
|
pQueryInfo->window.ekey = INT64_MAX;
|
||||||
|
|
||||||
// tags query condition may be larger than 512bytes, therefore, we need to prepare enough large space
|
// 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};
|
SCondExpr condExpr = {0};
|
||||||
|
|
||||||
if ((*pExpr)->pLeft == NULL || (*pExpr)->pRight == NULL) {
|
if ((*pExpr)->pLeft == NULL || (*pExpr)->pRight == NULL) {
|
||||||
|
|
|
@ -488,7 +488,7 @@ void tscBuildVgroupTableInfo(STableMetaInfo* pTableMetaInfo, SArray* tables) {
|
||||||
if( prev == NULL || tt->vgId != prev->vgId ) {
|
if( prev == NULL || tt->vgId != prev->vgId ) {
|
||||||
SVgroupsInfo* pvg = pTableMetaInfo->vgroupList;
|
SVgroupsInfo* pvg = pTableMetaInfo->vgroupList;
|
||||||
|
|
||||||
SVgroupTableInfo info = { 0 };
|
SVgroupTableInfo info = {{ 0 }};
|
||||||
for( int32_t m = 0; m < pvg->numOfVgroups; ++m ) {
|
for( int32_t m = 0; m < pvg->numOfVgroups; ++m ) {
|
||||||
if( tt->vgId == pvg->vgroups[m].vgId ) {
|
if( tt->vgId == pvg->vgroups[m].vgId ) {
|
||||||
info.vgInfo = pvg->vgroups[m];
|
info.vgInfo = pvg->vgroups[m];
|
||||||
|
|
|
@ -84,7 +84,7 @@ int32_t main(int32_t argc, char *argv[]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set termination handler. */
|
/* Set termination handler. */
|
||||||
struct sigaction act = {0};
|
struct sigaction act = {{0}};
|
||||||
act.sa_flags = SA_SIGINFO;
|
act.sa_flags = SA_SIGINFO;
|
||||||
act.sa_sigaction = signal_handler;
|
act.sa_sigaction = signal_handler;
|
||||||
sigaction(SIGTERM, &act, NULL);
|
sigaction(SIGTERM, &act, NULL);
|
||||||
|
|
|
@ -33,7 +33,7 @@ typedef struct {
|
||||||
void (*stopFp)();
|
void (*stopFp)();
|
||||||
} SModule;
|
} SModule;
|
||||||
|
|
||||||
static SModule tsModule[TSDB_MOD_MAX] = {0};
|
static SModule tsModule[TSDB_MOD_MAX] = {{0}};
|
||||||
static uint32_t tsModuleStatus = 0;
|
static uint32_t tsModuleStatus = 0;
|
||||||
|
|
||||||
static void dnodeSetModuleStatus(int32_t module) {
|
static void dnodeSetModuleStatus(int32_t module) {
|
||||||
|
|
|
@ -253,6 +253,17 @@ void taosBlockSIGPIPE();
|
||||||
#define BUILDIN_CLZ(val) __builtin_clz(val)
|
#define BUILDIN_CLZ(val) __builtin_clz(val)
|
||||||
#define BUILDIN_CTZ(val) __builtin_ctz(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
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -157,7 +157,7 @@ void *taosProcessAlarmSignal(void *tharg) {
|
||||||
void (*callback)(int) = tharg;
|
void (*callback)(int) = tharg;
|
||||||
|
|
||||||
static timer_t timerId;
|
static timer_t timerId;
|
||||||
struct sigevent sevent = {0};
|
struct sigevent sevent = {{0}};
|
||||||
|
|
||||||
#ifdef _ALPINE
|
#ifdef _ALPINE
|
||||||
sevent.sigev_notify = SIGEV_THREAD;
|
sevent.sigev_notify = SIGEV_THREAD;
|
||||||
|
|
|
@ -161,7 +161,7 @@ static int tsdbRestoreInfo(STsdbRepo *pRepo) {
|
||||||
SFileGroup *pFGroup = NULL;
|
SFileGroup *pFGroup = NULL;
|
||||||
|
|
||||||
SFileGroupIter iter;
|
SFileGroupIter iter;
|
||||||
SRWHelper rhelper = {0};
|
SRWHelper rhelper = {{0}};
|
||||||
|
|
||||||
if (tsdbInitReadHelper(&rhelper, pRepo) < 0) goto _err;
|
if (tsdbInitReadHelper(&rhelper, pRepo) < 0) goto _err;
|
||||||
tsdbInitFileGroupIter(pFileH, &iter, TSDB_ORDER_ASC);
|
tsdbInitFileGroupIter(pFileH, &iter, TSDB_ORDER_ASC);
|
||||||
|
@ -948,7 +948,7 @@ static void *tsdbCommitData(void *arg) {
|
||||||
STsdbCache *pCache = pRepo->tsdbCache;
|
STsdbCache *pCache = pRepo->tsdbCache;
|
||||||
STsdbCfg * pCfg = &(pRepo->config);
|
STsdbCfg * pCfg = &(pRepo->config);
|
||||||
SDataCols * pDataCols = NULL;
|
SDataCols * pDataCols = NULL;
|
||||||
SRWHelper whelper = {0};
|
SRWHelper whelper = {{0}};
|
||||||
if (pCache->imem == NULL) return NULL;
|
if (pCache->imem == NULL) return NULL;
|
||||||
|
|
||||||
tsdbPrint("vgId: %d, starting to commit....", pRepo->config.tsdbId);
|
tsdbPrint("vgId: %d, starting to commit....", pRepo->config.tsdbId);
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
|
#include "os.h"
|
||||||
#include "exception.h"
|
#include "exception.h"
|
||||||
|
|
||||||
|
|
||||||
static _Thread_local SExceptionNode* expList;
|
static threadlocal SExceptionNode* expList;
|
||||||
|
|
||||||
void exceptionPushNode( SExceptionNode* node ) {
|
void exceptionPushNode( SExceptionNode* node ) {
|
||||||
node->prev = expList;
|
node->prev = expList;
|
||||||
|
@ -145,4 +146,4 @@ void cleanupExecuteTo( int32_t anchor, bool failed ) {
|
||||||
|
|
||||||
void cleanupExecute( SExceptionNode* node, bool failed ) {
|
void cleanupExecute( SExceptionNode* node, bool failed ) {
|
||||||
doExecuteCleanup( node, 0, failed );
|
doExecuteCleanup( node, 0, failed );
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include "tsystem.h"
|
#include "tsystem.h"
|
||||||
#include "tutil.h"
|
#include "tutil.h"
|
||||||
|
|
||||||
SGlobalCfg tsGlobalConfig[TSDB_CFG_MAX_NUM] = {0};
|
SGlobalCfg tsGlobalConfig[TSDB_CFG_MAX_NUM] = {{0}};
|
||||||
int32_t tsGlobalConfigNum = 0;
|
int32_t tsGlobalConfigNum = 0;
|
||||||
|
|
||||||
static char *tsGlobalUnit[] = {
|
static char *tsGlobalUnit[] = {
|
||||||
|
|
|
@ -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 int number_of_blocks = len / 8;
|
||||||
unsigned char data_block[9] = {0};
|
unsigned char data_block[9] = {0};
|
||||||
unsigned char processed_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);
|
char* dest = calloc(len + 1, 1);
|
||||||
generate_sub_keys(key, key_sets);
|
generate_sub_keys(key, key_sets);
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,11 @@ typedef struct {
|
||||||
} STaosError;
|
} STaosError;
|
||||||
|
|
||||||
|
|
||||||
|
#include "os.h"
|
||||||
#include "taoserror.h"
|
#include "taoserror.h"
|
||||||
|
|
||||||
|
|
||||||
static _Thread_local int32_t tsErrno;
|
static threadlocal int32_t tsErrno;
|
||||||
int32_t* taosGetErrno() {
|
int32_t* taosGetErrno() {
|
||||||
return &tsErrno;
|
return &tsErrno;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue