Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1193
Star 22018
Fork 4786
T
TDengine
提交 aa6e480e 编写于 作者: dengyihao's avatar dengyihao
浏览文件
操作

Merge branch 'New' into 3.0

上级 19686d9a 35b82d79
展开全部 隐藏空白更改
内联 并排
Showing with 187171 addition and 4527 deletion

要显示的变更太多。

To preserve performance only 1000 of 1000+ files are displayed.
文本差异 电子邮件补丁
.gitignore
浏览文件 @ aa6e480e
......@@ -24,7 +24,6 @@ mac/
*.orig
src/connector/nodejs/node_modules/
src/connector/nodejs/out/
tests/test/
tests/taoshebei/
tests/taoscsv/
tests/taosdalipu/
......
.gitmodules
浏览文件 @ aa6e480e
......@@ -10,10 +10,6 @@
[submodule "deps/TSZ"]
path = deps/TSZ
url = https://github.com/taosdata/TSZ.git
[submodule "tests"]
path = tests
url = https://github.com/taosdata/tests
branch = 3.0
[submodule "examples/rust"]
path = examples/rust
url = https://github.com/songtianyi/tdengine-rust-bindings.git
CMakeLists.txt
浏览文件 @ aa6e480e
......@@ -9,6 +9,7 @@ project(
set(CMAKE_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/cmake")
set(CMAKE_CONTRIB_DIR "${CMAKE_SOURCE_DIR}/contrib")
include(${CMAKE_SUPPORT_DIR}/cmake.options)
include(${CMAKE_SUPPORT_DIR}/cmake.version)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
......
Jenkinsfile2
浏览文件 @ aa6e480e
......@@ -74,37 +74,9 @@ def pre_test(){
git pull >/dev/null
git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
git submodule update --init --recursive --remote
git submodule update --init --recursive
'''
script {
if (env.CHANGE_TARGET == 'master') {
sh '''
cd ${WKCT}
git checkout master
'''
}
else if(env.CHANGE_TARGET == '2.0'){
sh '''
cd ${WKCT}
git checkout 2.0
'''
}
else if(env.CHANGE_TARGET == '3.0'){
sh '''
cd ${WKCT}
git checkout 3.0
'''
}
else{
sh '''
cd ${WKCT}
git checkout develop
'''
}
}
sh'''
cd ${WKCT}
git pull >/dev/null
cd ${WKC}
export TZ=Asia/Harbin
date
......@@ -123,7 +95,6 @@ pipeline {
environment{
WK = '/var/lib/jenkins/workspace/TDinternal'
WKC= '/var/lib/jenkins/workspace/TDengine'
WKCT= '/var/lib/jenkins/workspace/TDengine/tests'
}
stages {
stage('pre_build'){
......
cmake/cmake.version 0 → 100644
浏览文件 @ aa6e480e
IF (DEFINED VERNUMBER)
SET(TD_VER_NUMBER ${VERNUMBER})
ELSE ()
SET(TD_VER_NUMBER "3.0.0.0")
ENDIF ()
IF (DEFINED VERCOMPATIBLE)
SET(TD_VER_COMPATIBLE ${VERCOMPATIBLE})
ELSE ()
SET(TD_VER_COMPATIBLE "3.0.0.0")
ENDIF ()
find_program(HAVE_GIT NAMES git)
IF (DEFINED GITINFO)
SET(TD_VER_GIT ${GITINFO})
ELSEIF (HAVE_GIT)
execute_process(COMMAND git log -1 --format=%H WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GIT_COMMITID)
#message(STATUS "git log result:${GIT_COMMITID}")
IF (GIT_COMMITID)
string (REGEX REPLACE "[\n\t\r]" "" GIT_COMMITID ${GIT_COMMITID})
SET(TD_VER_GIT ${GIT_COMMITID})
ELSE ()
message(STATUS "not a git repository")
SET(TD_VER_GIT "no git commit id")
ENDIF ()
ELSE ()
message(STATUS "no git cmd")
SET(TD_VER_GIT "no git commit id")
ENDIF ()
IF (DEFINED VERDATE)
SET(TD_VER_DATE ${VERDATE})
ELSE ()
STRING(TIMESTAMP TD_VER_DATE "%Y-%m-%d %H:%M:%S")
ENDIF ()
IF (DEFINED VERTYPE)
SET(TD_VER_VERTYPE ${VERTYPE})
ELSE ()
SET(TD_VER_VERTYPE "stable")
ENDIF ()
IF (DEFINED CPUTYPE)
SET(TD_VER_CPUTYPE ${CPUTYPE})
ELSE ()
IF (TD_WINDOWS_32)
SET(TD_VER_CPUTYPE "x86")
ELSEIF (TD_LINUX_32)
SET(TD_VER_CPUTYPE "x86")
ELSEIF (TD_ARM_32)
SET(TD_VER_CPUTYPE "x86")
ELSEIF (TD_MIPS_32)
SET(TD_VER_CPUTYPE "x86")
ELSE ()
SET(TD_VER_CPUTYPE "x64")
ENDIF ()
ENDIF ()
IF (DEFINED OSTYPE)
SET(TD_VER_OSTYPE ${OSTYPE})
ELSE ()
SET(TD_VER_OSTYPE "Linux")
ENDIF ()
MESSAGE(STATUS "============= compile version parameter information start ============= ")
MESSAGE(STATUS "ver number:" ${TD_VER_NUMBER})
MESSAGE(STATUS "compatible ver number:" ${TD_VER_COMPATIBLE})
MESSAGE(STATUS "communit commit id:" ${TD_VER_GIT})
MESSAGE(STATUS "build date:" ${TD_VER_DATE})
MESSAGE(STATUS "ver type:" ${TD_VER_VERTYPE})
MESSAGE(STATUS "ver cpu:" ${TD_VER_CPUTYPE})
MESSAGE(STATUS "os type:" ${TD_VER_OSTYPE})
MESSAGE(STATUS "============= compile version parameter information end ============= ")
STRING(REPLACE "." "_" TD_LIB_VER_NUMBER ${TD_VER_NUMBER})
contrib/test/craft/CMakeLists.txt
浏览文件 @ aa6e480e
add_executable(simulate_vnode "simulate_vnode.c")
target_link_libraries(simulate_vnode craft lz4 uv_a)
\ No newline at end of file
target_link_libraries(simulate_vnode PUBLIC craft lz4 uv_a)
\ No newline at end of file
contrib/test/traft/single_node/CMakeLists.txt
浏览文件 @ aa6e480e
......@@ -3,4 +3,4 @@ target_sources(singleNode
PRIVATE
"singleNode.c"
)
target_link_libraries(singleNode traft lz4 uv_a)
target_link_libraries(singleNode PUBLIC traft lz4 uv_a)
include/common/taosdef.h
浏览文件 @ aa6e480e
......@@ -56,6 +56,11 @@ typedef enum {
TSDB_STATIS_NONE = 1, // statis part not exist
} ETsdbStatisStatus;
typedef enum {
TSDB_SMA_STAT_OK = 0, // ready to provide service
TSDB_SMA_STAT_EXPIRED = 1, // not ready or expired
} ETsdbSmaStat;
extern char *qtypeStr[];
#ifdef __cplusplus
......
include/common/tcommon.h
浏览文件 @ aa6e480e
......@@ -25,24 +25,6 @@
extern "C" {
#endif
// typedef struct STimeWindow {
// TSKEY skey;
// TSKEY ekey;
// } STimeWindow;
// typedef struct {
// int32_t dataLen;
// char name[TSDB_TABLE_FNAME_LEN];
// char *data;
// } STagData;
// typedef struct SSchema {
// uint8_t type;
// char name[TSDB_COL_NAME_LEN];
// int16_t colId;
// int16_t bytes;
// } SSchema;
enum {
TMQ_CONF__RESET_OFFSET__LATEST = -1,
TMQ_CONF__RESET_OFFSET__EARLIEAST = -2,
......@@ -50,7 +32,8 @@ enum {
};
enum {
TMQ_MSG_TYPE__POLL_RSP = 0,
TMQ_MSG_TYPE__DUMMY = 0,
TMQ_MSG_TYPE__POLL_RSP,
TMQ_MSG_TYPE__EP_RSP,
};
......@@ -152,7 +135,7 @@ static FORCE_INLINE void* tDecodeDataBlock(const void* buf, SSDataBlock* pBlock)
return (void*)buf;
}
static FORCE_INLINE int32_t tEncodeSMqConsumeRsp(void** buf, const SMqConsumeRsp* pRsp) {
static FORCE_INLINE int32_t tEncodeSMqPollRsp(void** buf, const SMqPollRsp* pRsp) {
int32_t tlen = 0;
int32_t sz = 0;
tlen += taosEncodeFixedI64(buf, pRsp->consumerId);
......@@ -173,7 +156,7 @@ static FORCE_INLINE int32_t tEncodeSMqConsumeRsp(void** buf, const SMqConsumeRsp
return tlen;
}
static FORCE_INLINE void* tDecodeSMqConsumeRsp(void* buf, SMqConsumeRsp* pRsp) {
static FORCE_INLINE void* tDecodeSMqPollRsp(void* buf, SMqPollRsp* pRsp) {
int32_t sz;
buf = taosDecodeFixedI64(buf, &pRsp->consumerId);
buf = taosDecodeFixedI64(buf, &pRsp->reqOffset);
......@@ -211,7 +194,7 @@ static FORCE_INLINE void tDeleteSSDataBlock(SSDataBlock* pBlock) {
// tfree(pBlock);
}
static FORCE_INLINE void tDeleteSMqConsumeRsp(SMqConsumeRsp* pRsp) {
static FORCE_INLINE void tDeleteSMqConsumeRsp(SMqPollRsp* pRsp) {
if (pRsp->schemas) {
if (pRsp->schemas->nCols) {
tfree(pRsp->schemas->pSchema);
......@@ -285,4 +268,4 @@ typedef struct SSessionWindow {
}
#endif
#endif /*_TD_COMMON_DEF_H_*/
#endif /*_TD_COMMON_DEF_H_*/
include/common/tglobal.h
浏览文件 @ aa6e480e
......@@ -58,6 +58,7 @@ extern int32_t tsMonitorInterval;
extern char tsMonitorFqdn[];
extern uint16_t tsMonitorPort;
extern int32_t tsMonitorMaxLogs;
extern bool tsMonitorComp;
// query buffer management
extern int32_t tsQueryBufferSize; // maximum allowed usage buffer size in MB for each data node during query processing
......@@ -83,7 +84,6 @@ extern int64_t tsMaxRetentWindow;
extern char version[];
extern char compatible_version[];
extern char gitinfo[];
extern char gitinfoOfInternal[];
extern char buildinfo[];
// lossy
......
include/common/tmsg.h
浏览文件 @ aa6e480e
......@@ -70,7 +70,7 @@ typedef uint16_t tmsg_t;
typedef enum {
HEARTBEAT_TYPE_MQ = 0,
HEARTBEAT_TYPE_QUERY = 1,
HEARTBEAT_TYPE_QUERY,
// types can be added here
//
HEARTBEAT_TYPE_MAX
......@@ -671,6 +671,11 @@ typedef struct {
int64_t totalStorage;
int64_t compStorage;
int64_t pointsWritten;
int64_t numOfSelectReqs;
int64_t numOfInsertReqs;
int64_t numOfInsertSuccessReqs;
int64_t numOfBatchInsertReqs;
int64_t numOfBatchInsertSuccessReqs;
} SVnodeLoad;
typedef struct {
......@@ -741,7 +746,7 @@ typedef struct {
int32_t fsyncPeriod;
uint32_t hashBegin;
uint32_t hashEnd;
int8_t hashMethod;
int8_t hashMethod;
int8_t walLevel;
int8_t precision;
int8_t compression;
......@@ -752,7 +757,7 @@ typedef struct {
int8_t selfIndex;
int8_t streamMode;
SReplica replicas[TSDB_MAX_REPLICA];
} SCreateVnodeReq, SAlterVnodeReq;
int32_t tSerializeSCreateVnodeReq(void* buf, int32_t bufLen, SCreateVnodeReq* pReq);
......@@ -790,7 +795,7 @@ typedef struct SVgroupInfo {
int32_t vgId;
uint32_t hashBegin;
uint32_t hashEnd;
SEpSet epset;
SEpSet epSet;
} SVgroupInfo;
typedef struct {
......@@ -1383,7 +1388,7 @@ typedef struct {
typedef struct SMqCMGetSubEpReq {
int64_t consumerId;
int32_t epoch;
char cgroup[TSDB_CONSUMER_GROUP_LEN];
char cgroup[TSDB_CGROUP_LEN];
} SMqCMGetSubEpReq;
static FORCE_INLINE int32_t tEncodeSMsgHead(void** buf, const SMsgHead* pMsg) {
......@@ -1683,7 +1688,7 @@ typedef struct {
int32_t vgId;
int64_t consumerId;
char topicName[TSDB_TOPIC_FNAME_LEN];
char cgroup[TSDB_CONSUMER_GROUP_LEN];
char cgroup[TSDB_CGROUP_LEN];
char* sql;
char* logicalPlan;
char* physicalPlan;
......@@ -1746,7 +1751,7 @@ typedef struct {
int32_t vgId;
int64_t consumerId;
char topicName[TSDB_TOPIC_FNAME_LEN];
char cgroup[TSDB_CONSUMER_GROUP_LEN];
char cgroup[TSDB_CGROUP_LEN];
} SMqSetCVgRsp;
typedef struct {
......@@ -1754,14 +1759,14 @@ typedef struct {
int32_t vgId;
int64_t consumerId;
char topicName[TSDB_TOPIC_FNAME_LEN];
char cgroup[TSDB_CONSUMER_GROUP_LEN];
char cgroup[TSDB_CGROUP_LEN];
} SMqMVRebRsp;
typedef struct {
int32_t vgId;
int64_t offset;
char topicName[TSDB_TOPIC_FNAME_LEN];
char cgroup[TSDB_CONSUMER_GROUP_LEN];
char cgroup[TSDB_CGROUP_LEN];
} SMqOffset;
typedef struct {
......@@ -1837,6 +1842,205 @@ static FORCE_INLINE void* tDecodeSSchemaWrapper(void* buf, SSchemaWrapper* pSW)
}
return buf;
}
typedef enum {
TD_TIME_UNIT_UNKNOWN = -1,
TD_TIME_UNIT_YEAR = 0,
TD_TIME_UNIT_SEASON = 1,
TD_TIME_UNIT_MONTH = 2,
TD_TIME_UNIT_WEEK = 3,
TD_TIME_UNIT_DAY = 4,
TD_TIME_UNIT_HOUR = 5,
TD_TIME_UNIT_MINUTE = 6,
TD_TIME_UNIT_SEC = 7,
TD_TIME_UNIT_MILLISEC = 8,
TD_TIME_UNIT_MICROSEC = 9,
TD_TIME_UNIT_NANOSEC = 10
} ETDTimeUnit;
typedef struct {
uint8_t version; // for compatibility
uint8_t intervalUnit;
uint8_t slidingUnit;
char indexName[TSDB_INDEX_NAME_LEN + 1];
col_id_t numOfColIds;
uint16_t numOfFuncIds;
uint64_t tableUid; // super/common table uid
int64_t interval;
int64_t sliding;
col_id_t* colIds; // sorted column ids
uint16_t* funcIds; // sorted sma function ids
} STSma; // Time-range-wise SMA
typedef struct {
int64_t ver; // use a general definition
STSma tSma;
} SVCreateTSmaReq;
typedef struct {
int8_t type; // 0 status report, 1 update data
char indexName[TSDB_INDEX_NAME_LEN + 1]; //
STimeWindow windows;
} STSmaMsg;
typedef struct {
int64_t ver; // use a general definition
char indexName[TSDB_INDEX_NAME_LEN + 1];
} SVDropTSmaReq;
typedef struct {
} SVCreateTSmaRsp, SVDropTSmaRsp;
int32_t tSerializeSVCreateTSmaReq(void** buf, SVCreateTSmaReq* pReq);
void* tDeserializeSVCreateTSmaReq(void* buf, SVCreateTSmaReq* pReq);
int32_t tSerializeSVDropTSmaReq(void** buf, SVDropTSmaReq* pReq);
void* tDeserializeSVDropTSmaReq(void* buf, SVDropTSmaReq* pReq);
typedef struct {
STimeWindow tsWindow; // [skey, ekey]
uint64_t tableUid; // sub/common table uid
int32_t numOfBlocks; // number of sma blocks for each column, total number is numOfBlocks*numOfColId
int32_t dataLen; // total data length
col_id_t* colIds; // e.g. 2,4,9,10
col_id_t numOfColIds; // e.g. 4
char data[]; // the sma blocks
} STSmaData;
// TODO: move to the final location afte schema of STSma/STSmaData defined
static FORCE_INLINE void tdDestroySmaData(STSmaData* pSmaData) {
if (pSmaData) {
if (pSmaData->colIds) {
tfree(pSmaData->colIds);
}
tfree(pSmaData);
}
}
// RSma: Rollup SMA
typedef struct {
int64_t interval;
int32_t retention; // unit: day
uint16_t days; // unit: day
int8_t intervalUnit;
} SSmaParams;
typedef struct {
STSma tsma;
float xFilesFactor;
SArray* smaParams; // SSmaParams
} SRSma;
typedef struct {
uint32_t number;
STSma* tSma;
} STSmaWrapper;
static FORCE_INLINE void tdDestroyTSma(STSma* pSma) {
if (pSma) {
tfree(pSma->colIds);
tfree(pSma->funcIds);
}
}
static FORCE_INLINE void tdDestroyTSmaWrapper(STSmaWrapper* pSW) {
if (pSW) {
if (pSW->tSma) {
for (uint32_t i = 0; i < pSW->number; ++i) {
tdDestroyTSma(pSW->tSma + i);
}
tfree(pSW->tSma);
}
}
}
static FORCE_INLINE int32_t tEncodeTSma(void** buf, const STSma* pSma) {
int32_t tlen = 0;
tlen += taosEncodeFixedU8(buf, pSma->version);
tlen += taosEncodeFixedU8(buf, pSma->intervalUnit);
tlen += taosEncodeFixedU8(buf, pSma->slidingUnit);
tlen += taosEncodeString(buf, pSma->indexName);
tlen += taosEncodeFixedU16(buf, pSma->numOfColIds);
tlen += taosEncodeFixedU16(buf, pSma->numOfFuncIds);
tlen += taosEncodeFixedU64(buf, pSma->tableUid);
tlen += taosEncodeFixedI64(buf, pSma->interval);
tlen += taosEncodeFixedI64(buf, pSma->sliding);
for (col_id_t i = 0; i < pSma->numOfColIds; ++i) {
tlen += taosEncodeFixedU16(buf, *(pSma->colIds + i));
}
for (uint16_t i = 0; i < pSma->numOfFuncIds; ++i) {
tlen += taosEncodeFixedU16(buf, *(pSma->funcIds + i));
}
return tlen;
}
static FORCE_INLINE int32_t tEncodeTSmaWrapper(void** buf, const STSmaWrapper* pSW) {
int32_t tlen = 0;
tlen += taosEncodeFixedU32(buf, pSW->number);
for (uint32_t i = 0; i < pSW->number; ++i) {
tlen += tEncodeTSma(buf, pSW->tSma + i);
}
return tlen;
}
static FORCE_INLINE void* tDecodeTSma(void* buf, STSma* pSma) {
buf = taosDecodeFixedU8(buf, &pSma->version);
buf = taosDecodeFixedU8(buf, &pSma->intervalUnit);
buf = taosDecodeFixedU8(buf, &pSma->slidingUnit);
buf = taosDecodeStringTo(buf, pSma->indexName);
buf = taosDecodeFixedU16(buf, &pSma->numOfColIds);
buf = taosDecodeFixedU16(buf, &pSma->numOfFuncIds);
buf = taosDecodeFixedU64(buf, &pSma->tableUid);
buf = taosDecodeFixedI64(buf, &pSma->interval);
buf = taosDecodeFixedI64(buf, &pSma->sliding);
if (pSma->numOfColIds > 0) {
pSma->colIds = (col_id_t*)calloc(pSma->numOfColIds, sizeof(STSma));
if (pSma->colIds == NULL) {
return NULL;
}
for (uint16_t i = 0; i < pSma->numOfColIds; ++i) {
buf = taosDecodeFixedU16(buf, pSma->colIds + i);
}
} else {
pSma->colIds = NULL;
}
if (pSma->numOfFuncIds > 0) {
pSma->funcIds = (uint16_t*)calloc(pSma->numOfFuncIds, sizeof(STSma));
if (pSma->funcIds == NULL) {
return NULL;
}
for (uint16_t i = 0; i < pSma->numOfFuncIds; ++i) {
buf = taosDecodeFixedU16(buf, pSma->funcIds + i);
}
} else {
pSma->funcIds = NULL;
}
return buf;
}
static FORCE_INLINE void* tDecodeTSmaWrapper(void* buf, STSmaWrapper* pSW) {
buf = taosDecodeFixedU32(buf, &pSW->number);
pSW->tSma = (STSma*)calloc(pSW->number, sizeof(STSma));
if (pSW->tSma == NULL) {
return NULL;
}
for (uint32_t i = 0; i < pSW->number; ++i) {
if ((buf = tDecodeTSma(buf, pSW->tSma + i)) == NULL) {
for (uint32_t j = i; j >= 0; --i) {
tdDestroyTSma(pSW->tSma + j);
}
free(pSW->tSma);
return NULL;
}
}
return buf;
}
typedef struct {
int64_t uid;
......@@ -1869,7 +2073,7 @@ typedef struct {
int32_t skipLogNum;
int32_t numOfTopics;
SArray* pBlockData; // SArray<SSDataBlock>
} SMqConsumeRsp;
} SMqPollRsp;
// one req for one vg+topic
typedef struct {
......@@ -1878,11 +2082,11 @@ typedef struct {
int64_t consumerId;
int64_t blockingTime;
int32_t epoch;
char cgroup[TSDB_CONSUMER_GROUP_LEN];
char cgroup[TSDB_CGROUP_LEN];
int64_t currentOffset;
char topic[TSDB_TOPIC_FNAME_LEN];
} SMqConsumeReq;
} SMqPollReq;
typedef struct {
int32_t vgId;
......@@ -1897,14 +2101,14 @@ typedef struct {
typedef struct {
int64_t consumerId;
char cgroup[TSDB_CONSUMER_GROUP_LEN];
char cgroup[TSDB_CGROUP_LEN];
SArray* topics; // SArray<SMqSubTopicEp>
} SMqCMGetSubEpRsp;
struct tmq_message_t {
SMqRspHead head;
union {
SMqConsumeRsp consumeRsp;
SMqPollRsp consumeRsp;
SMqCMGetSubEpRsp getEpRsp;
};
void* extra;
......
include/common/tmsgdef.h
浏览文件 @ aa6e480e
......@@ -184,6 +184,9 @@ enum {
TD_DEF_MSG_TYPE(TDMT_VND_SUBSCRIBE, "vnode-subscribe", SMVSubscribeReq, SMVSubscribeRsp)
TD_DEF_MSG_TYPE(TDMT_VND_CONSUME, "vnode-consume", SMqCVConsumeReq, SMqCVConsumeRsp)
TD_DEF_MSG_TYPE(TDMT_VND_CREATE_SMA, "vnode-create-sma", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_CANCEL_SMA, "vnode-cancel-sma", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_DROP_SMA, "vnode-drop-sma", NULL, NULL)
// Requests handled by QNODE
TD_NEW_MSG_SEG(TDMT_QND_MSG)
......
include/common/trow.h
浏览文件 @ aa6e480e
......@@ -118,6 +118,8 @@ typedef struct {
} SKvRow;
typedef struct {
/// timestamp
TSKEY ts;
union {
/// union field for encode and decode
uint32_t info;
......@@ -138,8 +140,6 @@ typedef struct {
uint32_t len;
/// row version
uint64_t ver;
/// timestamp
TSKEY ts;
/// the inline data, maybe a tuple or a k-v tuple
char data[];
} STSRow;
......@@ -173,7 +173,7 @@ typedef struct {
#define TD_ROW_DATA(r) ((r)->data)
#define TD_ROW_LEN(r) ((r)->len)
#define TD_ROW_KEY(r) ((r)->ts)
#define TD_ROW_KEY_ADDR(r) POINTER_SHIFT((r), 16)
#define TD_ROW_KEY_ADDR(r) (r)
// N.B. If without STSchema, getExtendedRowSize() is used to get the rowMaxBytes and
// (int32_t)ceil((double)nCols/TD_VTYPE_PARTS) should be added if TD_SUPPORT_BITMAP defined.
......
include/dnode/snode/snode.h
浏览文件 @ aa6e480e
......@@ -16,6 +16,9 @@
#ifndef _TD_SNODE_H_
#define _TD_SNODE_H_
#include "tmsg.h"
#include "trpc.h"
#ifdef __cplusplus
extern "C" {
#endif
......@@ -88,4 +91,4 @@ void sndDestroy(const char *path);
}
#endif
#endif /*_TD_SNODE_H_*/
\ No newline at end of file
#endif /*_TD_SNODE_H_*/
include/libs/executor/executor.h
浏览文件 @ aa6e480e
......@@ -89,25 +89,6 @@ int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t *useconds);
*/
int32_t qRetrieveQueryResultInfo(qTaskInfo_t tinfo, bool* buildRes, void* pRspContext);
/**
*
* Retrieve the actual results to fill the response message payload.
* Note that this function must be executed after qRetrieveQueryResultInfo is invoked.
*
* @param tinfo tinfo object
* @param pRsp response message
* @param contLen payload length
* @return
*/
//int32_t qDumpRetrieveResult(qTaskInfo_t tinfo, SRetrieveTableRsp** pRsp, int32_t* contLen, bool* continueExec);
/**
* return the transporter context (RPC)
* @param tinfo
* @return
*/
void* qGetResultRetrieveMsg(qTaskInfo_t tinfo);
/**
* kill the ongoing query and free the query handle and corresponding resources automatically
* @param tinfo qhandle
......
include/libs/monitor/monitor.h
浏览文件 @ aa6e480e
......@@ -18,32 +18,40 @@
#include "tarray.h"
#include "tdef.h"
#include "tlog.h"
#ifdef __cplusplus
extern "C" {
#endif
#define MON_STATUS_LEN 8
#define MON_ROLE_LEN 9
#define MON_VER_LEN 12
#define MON_LOG_LEN 1024
typedef struct {
int32_t dnode_id;
char dnode_ep[TSDB_EP_LEN];
int64_t cluster_id;
int32_t protocol;
} SMonBasicInfo;
typedef struct {
int32_t dnode_id;
char dnode_ep[TSDB_EP_LEN];
char status[8];
char status[MON_STATUS_LEN];
} SMonDnodeDesc;
typedef struct {
int32_t mnode_id;
char mnode_ep[TSDB_EP_LEN];
char role[8];
char role[MON_ROLE_LEN];
} SMonMnodeDesc;
typedef struct {
char first_ep[TSDB_EP_LEN];
int32_t first_ep_dnode_id;
char version[12];
char version[MON_VER_LEN];
float master_uptime; // day
int32_t monitor_interval; // sec
int32_t vgroups_total;
......@@ -57,19 +65,18 @@ typedef struct {
typedef struct {
int32_t dnode_id;
int8_t vnode_online;
char vnode_role[8];
char vnode_role[MON_ROLE_LEN];
} SMonVnodeDesc;
typedef struct {
int32_t vgroup_id;
char database_name[TSDB_DB_NAME_LEN];
int32_t tables_num;
char status[MON_STATUS_LEN];
SMonVnodeDesc vnodes[TSDB_MAX_REPLICA];
} SMonVgroupDesc;
typedef struct {
char database_name[TSDB_DB_NAME_LEN];
int32_t tables_num;
int8_t status;
SArray *vgroups; // array of SMonVgroupDesc
} SMonVgroupInfo;
......@@ -81,62 +88,56 @@ typedef struct {
typedef struct {
float uptime; // day
float cpu_engine;
float cpu_system;
double cpu_engine;
double cpu_system;
float cpu_cores;
float mem_engine; // MB
float mem_system; // MB
float mem_total; // MB
float disk_engine; // GB
float disk_used; // GB
float disk_total; // GB
float net_in; // Kb/s
float net_out; // Kb/s
float io_read; // Mb/s
float io_write; // Mb/s
float io_read_disk; // Mb/s
float io_write_disk; // Mb/s
int32_t req_select;
float req_select_rate;
int32_t req_insert;
int32_t req_insert_success;
float req_insert_rate;
int32_t req_insert_batch;
int32_t req_insert_batch_success;
float req_insert_batch_rate;
int64_t mem_engine; // KB
int64_t mem_system; // KB
int64_t mem_total; // KB
int64_t disk_engine; // Byte
int64_t disk_used; // Byte
int64_t disk_total; // Byte
int64_t net_in; // bytes
int64_t net_out; // bytes
int64_t io_read; // bytes
int64_t io_write; // bytes
int64_t io_read_disk; // bytes
int64_t io_write_disk; // bytes
int64_t req_select;
int64_t req_insert;
int64_t req_insert_success;
int64_t req_insert_batch;
int64_t req_insert_batch_success;
int32_t errors;
int32_t vnodes_num;
int32_t masters;
int32_t has_mnode;
int8_t has_mnode;
} SMonDnodeInfo;
typedef struct {
char name[TSDB_FILENAME_LEN];
int32_t level;
int8_t level;
SDiskSize size;
} SMonDiskDesc;
typedef struct {
SArray *disks; // array of SMonDiskDesc
SArray *datadirs; // array of SMonDiskDesc
SMonDiskDesc logdir;
SMonDiskDesc tempdir;
} SMonDiskInfo;
typedef struct {
int64_t ts;
int8_t level;
char content[1024];
} SMonLogItem;
typedef struct SMonInfo SMonInfo;
typedef struct {
const char *server;
uint16_t port;
int32_t maxLogs;
bool comp;
} SMonCfg;
int32_t monInit(const SMonCfg *pCfg);
void monCleanup();
void monAddLogItem(SMonLogItem *pItem);
void monRecordLog(int64_t ts, ELogLevel level, const char *content);
SMonInfo *monCreateMonitorInfo();
void monSetBasicInfo(SMonInfo *pMonitor, SMonBasicInfo *pInfo);
......
include/libs/qcom/query.h
浏览文件 @ aa6e480e
......@@ -44,10 +44,10 @@ enum {
};
typedef struct STableComInfo {
uint8_t numOfTags; // the number of tags in schema
uint8_t precision; // the number of precision
int16_t numOfColumns; // the number of columns
int32_t rowSize; // row size of the schema
uint8_t numOfTags; // the number of tags in schema
uint8_t precision; // the number of precision
int16_t numOfColumns; // the number of columns
int32_t rowSize; // row size of the schema
} STableComInfo;
/*
......@@ -56,49 +56,45 @@ typedef struct STableComInfo {
* The cached child table meta info. For each child table, 24 bytes are required to keep the essential table info.
*/
typedef struct SCTableMeta {
int32_t vgId:24;
int32_t vgId : 24;
int8_t tableType;
uint64_t uid;
uint64_t suid;
} SCTableMeta;
/*
* Note that the first 24 bytes of STableMeta are identical to SCTableMeta, it is safe to cast a STableMeta to be a SCTableMeta.
* Note that the first 24 bytes of STableMeta are identical to SCTableMeta, it is safe to cast a STableMeta to be a
* SCTableMeta.
*/
typedef struct STableMeta {
//BEGIN: KEEP THIS PART SAME WITH SCTableMeta
int32_t vgId:24;
int8_t tableType;
uint64_t uid;
uint64_t suid;
//END: KEEP THIS PART SAME WITH SCTableMeta
// if the table is TSDB_CHILD_TABLE, the following information is acquired from the corresponding super table meta info
int16_t sversion;
int16_t tversion;
STableComInfo tableInfo;
SSchema schema[];
// BEGIN: KEEP THIS PART SAME WITH SCTableMeta
int32_t vgId : 24;
int8_t tableType;
uint64_t uid;
uint64_t suid;
// END: KEEP THIS PART SAME WITH SCTableMeta
// if the table is TSDB_CHILD_TABLE, the following information is acquired from the corresponding super table meta
// info
int16_t sversion;
int16_t tversion;
STableComInfo tableInfo;
SSchema schema[];
} STableMeta;
typedef struct SDBVgInfo {
int32_t vgVersion;
int32_t vgVersion;
int8_t hashMethod;
SHashObj *vgHash; //key:vgId, value:SVgroupInfo
SHashObj* vgHash; // key:vgId, value:SVgroupInfo
} SDBVgInfo;
typedef struct SUseDbOutput {
char db[TSDB_DB_FNAME_LEN];
uint64_t dbId;
SDBVgInfo *dbVgroup;
char db[TSDB_DB_FNAME_LEN];
uint64_t dbId;
SDBVgInfo* dbVgroup;
} SUseDbOutput;
enum {
META_TYPE_NULL_TABLE = 1,
META_TYPE_CTABLE,
META_TYPE_TABLE,
META_TYPE_BOTH_TABLE
};
enum { META_TYPE_NULL_TABLE = 1, META_TYPE_CTABLE, META_TYPE_TABLE, META_TYPE_BOTH_TABLE };
typedef struct STableMetaOutput {
int32_t metaType;
......@@ -107,30 +103,30 @@ typedef struct STableMetaOutput {
char ctbName[TSDB_TABLE_NAME_LEN];
char tbName[TSDB_TABLE_NAME_LEN];
SCTableMeta ctbMeta;
STableMeta *tbMeta;
STableMeta* tbMeta;
} STableMetaOutput;
typedef struct SDataBuf {
void *pData;
uint32_t len;
void *handle;
void* pData;
uint32_t len;
void* handle;
} SDataBuf;
typedef int32_t (*__async_send_cb_fn_t)(void* param, const SDataBuf* pMsg, int32_t code);
typedef int32_t (*__async_exec_fn_t)(void* param);
typedef struct SMsgSendInfo {
__async_send_cb_fn_t fp; //async callback function
void *param;
uint64_t requestId;
uint64_t requestObjRefId;
int32_t msgType;
SDataBuf msgInfo;
__async_send_cb_fn_t fp; // async callback function
void* param;
uint64_t requestId;
uint64_t requestObjRefId;
int32_t msgType;
SDataBuf msgInfo;
} SMsgSendInfo;
typedef struct SQueryNodeAddr {
int32_t nodeId; // vgId or qnodeId
SEpSet epset;
SEpSet epSet;
} SQueryNodeAddr;
int32_t initTaskQueue();
......@@ -154,34 +150,67 @@ int32_t taosAsyncExec(__async_exec_fn_t execFn, void* execParam, int32_t* code);
* @param pInfo
* @return
*/
int32_t asyncSendMsgToServer(void *pTransporter, SEpSet* epSet, int64_t* pTransporterId, const SMsgSendInfo* pInfo);
int32_t asyncSendMsgToServer(void* pTransporter, SEpSet* epSet, int64_t* pTransporterId, const SMsgSendInfo* pInfo);
int32_t queryBuildUseDbOutput(SUseDbOutput *pOut, SUseDbRsp *usedbRsp);
int32_t queryBuildUseDbOutput(SUseDbOutput* pOut, SUseDbRsp* usedbRsp);
void initQueryModuleMsgHandle();
const SSchema* tGetTbnameColumnSchema();
bool tIsValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTags);
bool tIsValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTags);
int32_t queryCreateTableMetaFromMsg(STableMetaRsp* msg, bool isSuperTable, STableMeta **pMeta);
int32_t queryCreateTableMetaFromMsg(STableMetaRsp* msg, bool isSuperTable, STableMeta** pMeta);
extern int32_t (*queryBuildMsg[TDMT_MAX])(void* input, char **msg, int32_t msgSize, int32_t *msgLen);
extern int32_t (*queryProcessMsgRsp[TDMT_MAX])(void* output, char *msg, int32_t msgSize);
extern int32_t (*queryBuildMsg[TDMT_MAX])(void* input, char** msg, int32_t msgSize, int32_t* msgLen);
extern int32_t (*queryProcessMsgRsp[TDMT_MAX])(void* output, char* msg, int32_t msgSize);
#define SET_META_TYPE_NULL(t) (t) = META_TYPE_NULL_TABLE
#define SET_META_TYPE_CTABLE(t) (t) = META_TYPE_CTABLE
#define SET_META_TYPE_TABLE(t) (t) = META_TYPE_TABLE
#define SET_META_TYPE_NULL(t) (t) = META_TYPE_NULL_TABLE
#define SET_META_TYPE_CTABLE(t) (t) = META_TYPE_CTABLE
#define SET_META_TYPE_TABLE(t) (t) = META_TYPE_TABLE
#define SET_META_TYPE_BOTH_TABLE(t) (t) = META_TYPE_BOTH_TABLE
#define qFatal(...) do { if (qDebugFlag & DEBUG_FATAL) { taosPrintLog("QRY FATAL ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qError(...) do { if (qDebugFlag & DEBUG_ERROR) { taosPrintLog("QRY ERROR ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qWarn(...) do { if (qDebugFlag & DEBUG_WARN) { taosPrintLog("QRY WARN ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qInfo(...) do { if (qDebugFlag & DEBUG_INFO) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qDebug(...) do { if (qDebugFlag & DEBUG_DEBUG) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qTrace(...) do { if (qDebugFlag & DEBUG_TRACE) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qDebugL(...) do { if (qDebugFlag & DEBUG_DEBUG) { taosPrintLongString("QRY ", qDebugFlag, __VA_ARGS__); }} while(0)
#define qFatal(...) \
do { \
if (qDebugFlag & DEBUG_FATAL) { \
taosPrintLog("QRY FATAL ", DEBUG_FATAL, qDebugFlag, __VA_ARGS__); \
} \
} while (0)
#define qError(...) \
do { \
if (qDebugFlag & DEBUG_ERROR) { \
taosPrintLog("QRY ERROR ", DEBUG_ERROR, qDebugFlag, __VA_ARGS__); \
} \
} while (0)
#define qWarn(...) \
do { \
if (qDebugFlag & DEBUG_WARN) { \
taosPrintLog("QRY WARN ", DEBUG_WARN, qDebugFlag, __VA_ARGS__); \
} \
} while (0)
#define qInfo(...) \
do { \
if (qDebugFlag & DEBUG_INFO) { \
taosPrintLog("QRY ", DEBUG_INFO, qDebugFlag, __VA_ARGS__); \
} \
} while (0)
#define qDebug(...) \
do { \
if (qDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("QRY ", DEBUG_DEBUG, qDebugFlag, __VA_ARGS__); \
} \
} while (0)
#define qTrace(...) \
do { \
if (qDebugFlag & DEBUG_TRACE) { \
taosPrintLog("QRY ", DEBUG_TRACE, qDebugFlag, __VA_ARGS__); \
} \
} while (0)
#define qDebugL(...) \
do { \
if (qDebugFlag & DEBUG_DEBUG) { \
taosPrintLongString("QRY ", DEBUG_DEBUG, qDebugFlag, __VA_ARGS__); \
} \
} while (0)
#ifdef __cplusplus
}
......
include/libs/scalar/filter.h
浏览文件 @ aa6e480e
......@@ -19,10 +19,12 @@
extern "C" {
#endif
#include "tcommon.h"
#include "nodes.h"
typedef struct SFilterInfo SFilterInfo;
typedef int32_t (*filer_get_col_from_id)(void *, int32_t, void **);
enum {
FLT_OPTION_NO_REWRITE = 1,
FLT_OPTION_TIMESTAMP = 2,
......@@ -34,7 +36,6 @@ typedef struct SFilterColumnParam{
SArray* pDataBlock;
} SFilterColumnParam;
extern int32_t filterInitFromNode(SNode *pNode, SFilterInfo **pinfo, uint32_t options);
extern bool filterExecute(SFilterInfo *info, SSDataBlock *pSrc, int8_t** p, SColumnDataAgg *statis, int16_t numOfCols);
extern int32_t filterSetDataFromSlotId(SFilterInfo *info, void *param);
......
include/libs/sync/sync.h
浏览文件 @ aa6e480e
......@@ -21,7 +21,7 @@ extern "C" {
#endif
#include <stdint.h>
#include <tep.h>
#include <tdatablock.h>
#include "taosdef.h"
#include "trpc.h"
......@@ -31,12 +31,10 @@ typedef int64_t SyncIndex;
typedef uint64_t SyncTerm;
typedef enum {
TAOS_SYNC_STATE_FOLLOWER = 0,
TAOS_SYNC_STATE_CANDIDATE = 1,
TAOS_SYNC_STATE_LEADER = 2,
} ESyncRole;
typedef ESyncRole ESyncState;
TAOS_SYNC_STATE_FOLLOWER = 100,
TAOS_SYNC_STATE_CANDIDATE = 101,
TAOS_SYNC_STATE_LEADER = 102,
} ESyncState;
typedef struct SSyncBuffer {
void* data;
......@@ -136,10 +134,13 @@ typedef struct SSyncInfo {
SyncGroupId vgId;
SSyncCfg syncCfg;
char path[TSDB_FILENAME_LEN];
char walPath[TSDB_FILENAME_LEN];
SSyncFSM* pFsm;
void* rpcClient;
int32_t (*FpSendMsg)(void* rpcClient, const SEpSet* pEpSet, SRpcMsg* pMsg);
void* queue;
int32_t (*FpEqMsg)(void* queue, SRpcMsg* pMsg);
} SSyncInfo;
......@@ -149,13 +150,10 @@ typedef struct SSyncNode SSyncNode;
int32_t syncInit();
void syncCleanUp();
int64_t syncStart(const SSyncInfo* pSyncInfo);
void syncStop(int64_t rid);
int32_t syncReconfig(int64_t rid, const SSyncCfg* pSyncCfg);
int32_t syncForwardToPeer(int64_t rid, const SRpcMsg* pBuf, bool isWeak);
// int32_t syncForwardToPeer(int64_t rid, const SSyncBuffer* pBuf, bool isWeak);
int64_t syncStart(const SSyncInfo* pSyncInfo);
void syncStop(int64_t rid);
int32_t syncReconfig(int64_t rid, const SSyncCfg* pSyncCfg);
int32_t syncForwardToPeer(int64_t rid, const SRpcMsg* pBuf, bool isWeak);
ESyncState syncGetMyRole(int64_t rid);
void syncGetNodesRole(int64_t rid, SNodesRole* pNodeRole);
......
include/libs/tfs/tfs.h
浏览文件 @ aa6e480e
......@@ -17,6 +17,7 @@
#define _TD_TFS_H_
#include "tdef.h"
#include "monitor.h"
#ifdef __cplusplus
extern "C" {
......@@ -237,6 +238,14 @@ const STfsFile *tfsReaddir(STfsDir *pDir);
*/
void tfsClosedir(STfsDir *pDir);
/**
* @brief Get disk info of tfs.
*
* @param pTfs The fs object.
* @param pInfo The info object.
*/
int32_t tfsGetMonitorInfo(STfs *pTfs, SMonDiskInfo *pInfo);
#ifdef __cplusplus
}
#endif
......
include/util/thttp.h → include/libs/transport/thttp.h
浏览文件 @ aa6e480e
......@@ -22,7 +22,9 @@
extern "C" {
#endif
int32_t taosSendHttpReport(const char* server, uint16_t port, const char* pCont, int32_t contLen);
typedef enum { HTTP_GZIP, HTTP_FLAT } EHttpCompFlag;
int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag);
#ifdef __cplusplus
}
......
include/libs/wal/wal.h
浏览文件 @ aa6e480e
......@@ -24,43 +24,41 @@
extern "C" {
#endif
extern int32_t wDebugFlag;
#define wFatal(...) \
{ \
if (wDebugFlag & DEBUG_FATAL) { \
taosPrintLog("WAL FATAL ", 255, __VA_ARGS__); \
} \
#define wFatal(...) \
{ \
if (wDebugFlag & DEBUG_FATAL) { \
taosPrintLog("WAL FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); \
} \
}
#define wError(...) \
{ \
if (wDebugFlag & DEBUG_ERROR) { \
taosPrintLog("WAL ERROR ", 255, __VA_ARGS__); \
} \
#define wError(...) \
{ \
if (wDebugFlag & DEBUG_ERROR) { \
taosPrintLog("WAL ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); \
} \
}
#define wWarn(...) \
{ \
if (wDebugFlag & DEBUG_WARN) { \
taosPrintLog("WAL WARN ", 255, __VA_ARGS__); \
} \
#define wWarn(...) \
{ \
if (wDebugFlag & DEBUG_WARN) { \
taosPrintLog("WAL WARN ", DEBUG_WARN, 255, __VA_ARGS__); \
} \
}
#define wInfo(...) \
{ \
if (wDebugFlag & DEBUG_INFO) { \
taosPrintLog("WAL ", 255, __VA_ARGS__); \
} \
#define wInfo(...) \
{ \
if (wDebugFlag & DEBUG_INFO) { \
taosPrintLog("WAL ", DEBUG_INFO, 255, __VA_ARGS__); \
} \
}
#define wDebug(...) \
{ \
if (wDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("WAL ", wDebugFlag, __VA_ARGS__); \
} \
#define wDebug(...) \
{ \
if (wDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("WAL ", DEBUG_DEBUG, wDebugFlag, __VA_ARGS__); \
} \
}
#define wTrace(...) \
{ \
if (wDebugFlag & DEBUG_TRACE) { \
taosPrintLog("WAL ", wDebugFlag, __VA_ARGS__); \
} \
#define wTrace(...) \
{ \
if (wDebugFlag & DEBUG_TRACE) { \
taosPrintLog("WAL ", DEBUG_TRACE, wDebugFlag, __VA_ARGS__); \
} \
}
#define WAL_HEAD_VER 0
......
include/os/os.h
浏览文件 @ aa6e480e
......@@ -44,6 +44,7 @@ extern "C" {
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/utsname.h>
#include <sys/param.h>
#include <unistd.h>
#include <wchar.h>
#include <wctype.h>
......
include/os/osDir.h
浏览文件 @ aa6e480e
......@@ -16,17 +16,39 @@
#ifndef _TD_OS_DIR_H_
#define _TD_OS_DIR_H_
// If the error is in a third-party library, place this header file under the third-party library header file.
#ifndef ALLOW_FORBID_FUNC
#define opendir OPENDIR_FUNC_TAOS_FORBID
#define readdir READDIR_FUNC_TAOS_FORBID
#define closedir CLOSEDIR_FUNC_TAOS_FORBID
#define dirname DIRNAME_FUNC_TAOS_FORBID
#undef basename
#define basename BASENAME_FUNC_TAOS_FORBID
#endif
#ifdef __cplusplus
extern "C" {
#endif
typedef struct TdDir *TdDirPtr;
typedef struct TdDirEntry *TdDirEntryPtr;
void taosRemoveDir(const char *dirname);
int32_t taosDirExist(char *dirname);
bool taosDirExist(char *dirname);
int32_t taosMkDir(const char *dirname);
void taosRemoveOldFiles(const char *dirname, int32_t keepDays);
int32_t taosExpandDir(const char *dirname, char *outname, int32_t maxlen);
int32_t taosRealPath(char *dirname, int32_t maxlen);
bool taosIsDir(const char *dirname);
char* taosDirName(char *dirname);
char* taosDirEntryBaseName(char *dirname);
TdDirPtr taosOpenDir(const char *dirname);
TdDirEntryPtr taosReadDir(TdDirPtr pDir);
bool taosDirEntryIsDir(TdDirEntryPtr pDirEntry);
char* taosGetDirEntryName(TdDirEntryPtr pDirEntry);
int32_t taosCloseDir(TdDirPtr pDir);
#ifdef __cplusplus
}
......
include/os/osEnv.h
浏览文件 @ aa6e480e
......@@ -28,11 +28,11 @@ extern char tsCharset[];
extern char tsLocale[];
extern int8_t tsDaylight;
extern bool tsEnableCoreFile;
extern int64_t tsPageSize;
extern int64_t tsPageSizeKB;
extern int64_t tsOpenMax;
extern int64_t tsStreamMax;
extern int32_t tsNumOfCores;
extern int32_t tsTotalMemoryMB;
extern float tsNumOfCores;
extern int64_t tsTotalMemoryKB;
extern char configDir[];
extern char tsDataDir[];
......
include/os/osFile.h
浏览文件 @ aa6e480e
......@@ -22,11 +22,18 @@ extern "C" {
#include "osSocket.h"
// If the error is in a third-party library, place this header file under the third-party library header file.
#ifndef ALLOW_FORBID_FUNC
#define open OPEN_FUNC_TAOS_FORBID
#define fopen FOPEN_FUNC_TAOS_FORBID
// #define close CLOSE_FUNC_TAOS_FORBID
// #define fclose FCLOSE_FUNC_TAOS_FORBID
#define access ACCESS_FUNC_TAOS_FORBID
#define stat STAT_FUNC_TAOS_FORBID
#define lstat LSTAT_FUNC_TAOS_FORBID
#define fstat FSTAT_FUNC_TAOS_FORBID
#define close CLOSE_FUNC_TAOS_FORBID
#define fclose FCLOSE_FUNC_TAOS_FORBID
#define fsync FSYNC_FUNC_TAOS_FORBID
// #define fflush FFLUSH_FUNC_TAOS_FORBID
#endif
#ifndef PATH_MAX
......@@ -43,7 +50,13 @@ typedef struct TdFile *TdFilePtr;
#define TD_FILE_TEXT 0x0020
#define TD_FILE_AUTO_DEL 0x0040
#define TD_FILE_EXCL 0x0080
#define TD_FILE_STREAM 0x0100 // Only support taosFprintfFile, taosGetLineFile, taosGetLineFile, taosEOFFile
#define TD_FILE_STREAM 0x0100 // Only support taosFprintfFile, taosGetLineFile, taosEOFFile
TdFilePtr taosOpenFile(const char *path,int32_t tdFileOptions);
#define TD_FILE_ACCESS_EXIST_OK 0x1
#define TD_FILE_ACCESS_READ_OK 0x2
#define TD_FILE_ACCESS_WRITE_OK 0x4
bool taosCheckAccessFile(const char *pathname, int mode);
int32_t taosLockFile(TdFilePtr pFile);
int32_t taosUnLockFile(TdFilePtr pFile);
......@@ -51,9 +64,9 @@ int32_t taosUnLockFile(TdFilePtr pFile);
int32_t taosUmaskFile(int32_t maskVal);
int32_t taosStatFile(const char *path, int64_t *size, int32_t *mtime);
int32_t taosDevInoFile(const char *path, int64_t *stDev, int64_t *stIno);
int32_t taosFStatFile(TdFilePtr pFile, int64_t *size, int32_t *mtime);
TdFilePtr taosOpenFile(const char *path,int32_t tdFileOptions);
bool taosCheckExistFile(const char *pathname);
int64_t taosLSeekFile(TdFilePtr pFile, int64_t offset, int32_t whence);
int32_t taosFtruncateFile(TdFilePtr pFile, int64_t length);
......@@ -62,7 +75,7 @@ int32_t taosFsyncFile(TdFilePtr pFile);
int64_t taosReadFile(TdFilePtr pFile, void *buf, int64_t count);
int64_t taosPReadFile(TdFilePtr pFile, void *buf, int64_t count, int64_t offset);
int64_t taosWriteFile(TdFilePtr pFile, const void *buf, int64_t count);
void taosFprintfFile(TdFilePtr pFile, const char *format, ...);
void taosFprintfFile(TdFilePtr pFile, const char *format, ...);
int64_t taosGetLineFile(TdFilePtr pFile, char ** __restrict__ ptrBuf);
int32_t taosEOFFile(TdFilePtr pFile);
......@@ -70,16 +83,16 @@ int64_t taosCloseFile(TdFilePtr *ppFile);
int32_t taosRenameFile(const char *oldName, const char *newName);
int64_t taosCopyFile(const char *from, const char *to);
int32_t taosRemoveFile(const char *path);
void taosGetTmpfilePath(const char *inputTmpDir, const char *fileNamePrefix, char *dstPath);
void taosGetTmpfilePath(const char *inputTmpDir, const char *fileNamePrefix, char *dstPath);
int64_t taosSendFile(SocketFd fdDst, TdFilePtr pFileSrc, int64_t *offset, int64_t size);
int64_t taosFSendFile(TdFilePtr pFileOut, TdFilePtr pFileIn, int64_t *offset, int64_t size);
void *taosMmapReadOnlyFile(TdFilePtr pFile, int64_t length);
bool taosValidFile(TdFilePtr pFile);
int taosGetErrorFile(TdFilePtr pFile);
int32_t taosGetErrorFile(TdFilePtr pFile);
#ifdef __cplusplus
}
......
include/os/osSocket.h
浏览文件 @ aa6e480e
......@@ -16,6 +16,17 @@
#ifndef _TD_OS_SOCKET_H_
#define _TD_OS_SOCKET_H_
// If the error is in a third-party library, place this header file under the third-party library header file.
#ifndef ALLOW_FORBID_FUNC
#define socket SOCKET_FUNC_TAOS_FORBID
#define bind BIND_FUNC_TAOS_FORBID
#define listen LISTEN_FUNC_TAOS_FORBID
#define accept ACCEPT_FUNC_TAOS_FORBID
#define epoll_create EPOLL_CREATE_FUNC_TAOS_FORBID
#define epoll_ctl EPOLL_CTL_FUNC_TAOS_FORBID
#define epoll_wait EPOLL_WAIT_FUNC_TAOS_FORBID
#endif
#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
#include "winsock2.h"
#include <WS2tcpip.h>
......@@ -30,34 +41,6 @@
extern "C" {
#endif
#define TAOS_EPOLL_WAIT_TIME 500
typedef int32_t SOCKET;
typedef SOCKET EpollFd;
#define EpollClose(pollFd) taosCloseSocket(pollFd)
#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
typedef SOCKET SocketFd;
#else
typedef int32_t SocketFd;
#endif
int32_t taosSendto(SocketFd fd, void * msg, int len, unsigned int flags, const struct sockaddr * to, int tolen);
int32_t taosWriteSocket(SocketFd fd, void *msg, int len);
int32_t taosReadSocket(SocketFd fd, void *msg, int len);
int32_t taosCloseSocketNoCheck(SocketFd fd);
int32_t taosCloseSocket(SocketFd fd);
void taosShutDownSocketRD(SOCKET fd);
void taosShutDownSocketWR(SOCKET fd);
int32_t taosSetNonblocking(SOCKET sock, int32_t on);
void taosIgnSIGPIPE();
void taosBlockSIGPIPE();
void taosSetMaskSIGPIPE();
int32_t taosSetSockOpt(SOCKET socketfd, int32_t level, int32_t optname, void *optval, int32_t optlen);
int32_t taosGetSockOpt(SOCKET socketfd, int32_t level, int32_t optname, void *optval, int32_t *optlen);
uint32_t taosInetAddr(const char *ipAddr);
const char *taosInetNtoa(struct in_addr ipInt);
#if (defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32))
#define htobe64 htonll
#if defined(_TD_GO_DLL_)
......@@ -69,22 +52,54 @@ const char *taosInetNtoa(struct in_addr ipInt);
#define htobe64 htonll
#endif
int32_t taosReadn(SOCKET sock, char *buffer, int32_t len);
int32_t taosWriteMsg(SOCKET fd, void *ptr, int32_t nbytes);
int32_t taosReadMsg(SOCKET fd, void *ptr, int32_t nbytes);
int32_t taosNonblockwrite(SOCKET fd, char *ptr, int32_t nbytes);
int64_t taosCopyFds(SOCKET sfd, int32_t dfd, int64_t len);
int32_t taosSetNonblocking(SOCKET sock, int32_t on);
#define TAOS_EPOLL_WAIT_TIME 500
SOCKET taosOpenUdpSocket(uint32_t localIp, uint16_t localPort);
SOCKET taosOpenTcpClientSocket(uint32_t ip, uint16_t port, uint32_t localIp);
SOCKET taosOpenTcpServerSocket(uint32_t ip, uint16_t port);
int32_t taosKeepTcpAlive(SOCKET sockFd);
typedef struct TdSocketServer *TdSocketServerPtr;
typedef struct TdSocket *TdSocketPtr;
typedef struct TdEpoll *TdEpollPtr;
int32_t taosGetFqdn(char *);
int32_t taosSendto(TdSocketPtr pSocket, void * msg, int len, unsigned int flags, const struct sockaddr * to, int tolen);
int32_t taosWriteSocket(TdSocketPtr pSocket, void *msg, int len);
int32_t taosReadSocket(TdSocketPtr pSocket, void *msg, int len);
int32_t taosReadFromSocket(TdSocketPtr pSocket, void *buf, int32_t len, int32_t flags, struct sockaddr *destAddr, socklen_t *addrLen);
int32_t taosCloseSocket(TdSocketPtr *ppSocket);
int32_t taosCloseSocketServer(TdSocketServerPtr *ppSocketServer);
int32_t taosShutDownSocketRD(TdSocketPtr pSocket);
int32_t taosShutDownSocketServerRD(TdSocketServerPtr pSocketServer);
int32_t taosShutDownSocketWR(TdSocketPtr pSocket);
int32_t taosShutDownSocketServerWR(TdSocketServerPtr pSocketServer);
int32_t taosShutDownSocketRDWR(TdSocketPtr pSocket);
int32_t taosShutDownSocketServerRDWR(TdSocketServerPtr pSocketServer);
int32_t taosSetNonblocking(TdSocketPtr pSocket, int32_t on);
int32_t taosSetSockOpt(TdSocketPtr pSocket, int32_t level, int32_t optname, void *optval, int32_t optlen);
int32_t taosGetSockOpt(TdSocketPtr pSocket, int32_t level, int32_t optname, void *optval, int32_t *optlen);
int32_t taosWriteMsg(TdSocketPtr pSocket, void *ptr, int32_t nbytes);
int32_t taosReadMsg(TdSocketPtr pSocket, void *ptr, int32_t nbytes);
int32_t taosNonblockwrite(TdSocketPtr pSocket, char *ptr, int32_t nbytes);
int64_t taosCopyFds(TdSocketPtr pSrcSocket, TdSocketPtr pDestSocket, int64_t len);
TdSocketPtr taosOpenUdpSocket(uint32_t localIp, uint16_t localPort);
TdSocketPtr taosOpenTcpClientSocket(uint32_t ip, uint16_t port, uint32_t localIp);
TdSocketServerPtr taosOpenTcpServerSocket(uint32_t ip, uint16_t port);
int32_t taosKeepTcpAlive(TdSocketPtr pSocket);
TdSocketPtr taosAcceptTcpConnectSocket(TdSocketServerPtr pServerSocket, struct sockaddr *destAddr, socklen_t *addrLen);
int32_t taosGetSocketName(TdSocketPtr pSocket,struct sockaddr *destAddr, socklen_t *addrLen);
void taosBlockSIGPIPE();
uint32_t taosGetIpv4FromFqdn(const char *);
int32_t taosGetFqdn(char *);
void tinet_ntoa(char *ipstr, uint32_t ip);
uint32_t ip2uint(const char *const ip_addr);
void taosIgnSIGPIPE();
void taosSetMaskSIGPIPE();
uint32_t taosInetAddr(const char *ipAddr);
const char *taosInetNtoa(struct in_addr ipInt);
TdEpollPtr taosCreateEpoll(int32_t size);
int32_t taosCtlEpoll(TdEpollPtr pEpoll, int32_t epollOperate, TdSocketPtr pSocket, struct epoll_event *event);
int32_t taosWaitEpoll(TdEpollPtr pEpoll, struct epoll_event *event, int32_t maxEvents, int32_t timeout);
int32_t taosCloseEpoll(TdEpollPtr *ppEpoll);
#ifdef __cplusplus
}
......
include/os/osSysinfo.h
浏览文件 @ aa6e480e
......@@ -33,20 +33,19 @@ typedef struct {
SDiskSize size;
} SDiskSpace;
bool taosCheckSystemIsSmallEnd();
void taosGetSystemInfo();
bool taosGetEmail(char *email, int32_t maxLen);
bool taosGetOsReleaseName(char *releaseName, int32_t maxLen);
bool taosGetCpuInfo(char *cpuModel, int32_t maxLen, int32_t *numOfCores);
int32_t taosGetCpuCores();
bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage);
bool taosGetTotalSysMemoryKB(uint64_t *kb);
bool taosGetProcMemory(float *memoryUsedMB); //
bool taosGetSysMemory(float *memoryUsedMB); //
int32_t taosGetEmail(char *email, int32_t maxLen);
int32_t taosGetOsReleaseName(char *releaseName, int32_t maxLen);
int32_t taosGetCpuInfo(char *cpuModel, int32_t maxLen, float *numOfCores);
int32_t taosGetCpuCores(float *numOfCores);
int32_t taosGetCpuUsage(double *cpu_system, double *cpu_engine);
int32_t taosGetTotalMemory(int64_t *totalKB);
int32_t taosGetProcMemory(int64_t *usedKB);
int32_t taosGetSysMemory(int64_t *usedKB);
int32_t taosGetDiskSize(char *dataDir, SDiskSize *diskSize);
bool taosReadProcIO(int64_t *rchars, int64_t *wchars);
bool taosGetProcIO(float *readKB, float *writeKB);
bool taosGetCardInfo(int64_t *bytes, int64_t *rbytes, int64_t *tbytes);
bool taosGetBandSpeed(float *bandSpeedKb);
int32_t taosGetProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes);
int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes);
int32_t taosSystem(const char *cmd);
void taosKillSystem();
......
include/util/taoserror.h
浏览文件 @ aa6e480e
......@@ -84,6 +84,7 @@ int32_t* taosGetErrno();
#define TSDB_CODE_INVALID_VERSION_NUMBER TAOS_DEF_ERROR_CODE(0, 0x0120)
#define TSDB_CODE_INVALID_VERSION_STRING TAOS_DEF_ERROR_CODE(0, 0x0121)
#define TSDB_CODE_VERSION_NOT_COMPATIBLE TAOS_DEF_ERROR_CODE(0, 0x0122)
#define TSDB_CODE_COMPRESS_ERROR TAOS_DEF_ERROR_CODE(0, 0x0123)
//client
#define TSDB_CODE_TSC_INVALID_OPERATION TAOS_DEF_ERROR_CODE(0, 0x0200)
......
include/util/tcache.h
浏览文件 @ aa6e480e
......@@ -40,55 +40,9 @@ typedef struct SCacheStatis {
int64_t refreshCount;
} SCacheStatis;
struct STrashElem;
typedef struct SCacheDataNode {
uint64_t addedTime; // the added time when this element is added or updated into cache
uint64_t lifespan; // life duration when this element should be remove from cache
uint64_t expireTime; // expire time
uint64_t signature;
struct STrashElem *pTNodeHeader; // point to trash node head
uint16_t keySize : 15; // max key size: 32kb
bool inTrashcan : 1; // denote if it is in trash or not
uint32_t size; // allocated size for current SCacheDataNode
T_REF_DECLARE()
char *key;
char data[];
} SCacheDataNode;
typedef struct STrashElem {
struct STrashElem *prev;
struct STrashElem *next;
SCacheDataNode *pData;
} STrashElem;
/*
* to accommodate the old data which has the same key value of new one in hashList
* when an new node is put into cache, if an existed one with the same key:
* 1. if the old one does not be referenced, update it.
* 2. otherwise, move the old one to pTrash, addedTime the new one.
*
* when the node in pTrash does not be referenced, it will be release at the expired expiredTime
*/
typedef struct {
int64_t totalSize; // total allocated buffer in this hash table, SCacheObj is not included.
int64_t refreshTime;
STrashElem *pTrash;
char *name;
SCacheStatis statistics;
SHashObj *pHashTable;
__cache_free_fn_t freeFp;
uint32_t numOfElemsInTrash; // number of element in trash
uint8_t deleting; // set the deleting flag to stop refreshing ASAP.
pthread_t refreshWorker;
bool extendLifespan; // auto extend life span when one item is accessed.
int64_t checkTick; // tick used to record the check times of the refresh threads
#if defined(LINUX)
pthread_rwlock_t lock;
#else
pthread_mutex_t lock;
#endif
} SCacheObj;
typedef struct SCacheObj SCacheObj;
typedef struct SCacheIter SCacheIter;
typedef struct STrashElem STrashElem;
/**
* initialize the cache object
......@@ -141,7 +95,7 @@ void *taosCacheAcquireByData(SCacheObj *pCacheObj, void *data);
* @param data
* @return
*/
void *taosCacheTransfer(SCacheObj *pCacheObj, void **data);
void *taosCacheTransferData(SCacheObj *pCacheObj, void **data);
/**
* remove data in cache, the data will not be removed immediately.
......@@ -152,6 +106,13 @@ void *taosCacheTransfer(SCacheObj *pCacheObj, void **data);
*/
void taosCacheRelease(SCacheObj *pCacheObj, void **data, bool _remove);
/**
*
* @param pCacheObj
* @return
*/
size_t taosCacheGetNumOfObj(const SCacheObj* pCacheObj);
/**
* move all data node into trash, clear node in trash can if it is not referenced by any clients
* @param handle
......@@ -184,6 +145,12 @@ void taosCacheRefresh(SCacheObj *pCacheObj, __cache_trav_fn_t fp, void *param1);
*/
void taosStopCacheRefreshWorker();
SCacheIter* taosCacheCreateIter(const SCacheObj* pCacheObj);
bool taosCacheIterNext(SCacheIter* pIter);
void* taosCacheIterGetData(const SCacheIter* pIter, size_t* dataLen);
void* taosCacheIterGetKey(const SCacheIter* pIter, size_t* keyLen);
void taosCacheDestroyIter(SCacheIter* pIter);
#ifdef __cplusplus
}
#endif
......
include/util/tdef.h
浏览文件 @ aa6e480e
......@@ -195,6 +195,7 @@ typedef enum ELogicConditionType {
#define TSDB_NODE_NAME_LEN 64
#define TSDB_TABLE_NAME_LEN 193 // it is a null-terminated string
#define TSDB_TOPIC_NAME_LEN 193 // it is a null-terminated string
#define TSDB_CGROUP_LEN 193 // it is a null-terminated string
#define TSDB_DB_NAME_LEN 65
#define TSDB_DB_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
......@@ -206,12 +207,12 @@ typedef enum ELogicConditionType {
#define TSDB_FUNC_TYPE_AGGREGATE 2
#define TSDB_FUNC_MAX_RETRIEVE 1024
#define TSDB_INDEX_NAME_LEN 32
#define TSDB_TYPE_STR_MAX_LEN 32
#define TSDB_TABLE_FNAME_LEN (TSDB_DB_FNAME_LEN + TSDB_TABLE_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
#define TSDB_TOPIC_FNAME_LEN TSDB_TABLE_FNAME_LEN
#define TSDB_CONSUMER_GROUP_LEN 192
#define TSDB_SUBSCRIBE_KEY_LEN (TSDB_CONSUMER_GROUP_LEN + TSDB_TOPIC_FNAME_LEN + 2)
#define TSDB_PARTITION_KEY_LEN (TSDB_CONSUMER_GROUP_LEN + TSDB_TOPIC_FNAME_LEN + 2)
#define TSDB_SUBSCRIBE_KEY_LEN (TSDB_CGROUP_LEN + TSDB_TOPIC_FNAME_LEN + 2)
#define TSDB_PARTITION_KEY_LEN (TSDB_SUBSCRIBE_KEY_LEN + 20)
#define TSDB_COL_NAME_LEN 65
#define TSDB_MAX_SAVED_SQL_LEN TSDB_MAX_COLUMNS * 64
#define TSDB_MAX_SQL_LEN TSDB_PAYLOAD_SIZE
......@@ -427,6 +428,8 @@ typedef struct {
int32_t primary;
} SDiskCfg;
#define TMQ_SEPARATOR ':'
#ifdef __cplusplus
}
#endif
......
include/util/thash.h
浏览文件 @ aa6e480e
......@@ -28,12 +28,8 @@ typedef int32_t (*_equal_fn_t)(const void *, const void *, size_t len);
typedef void (*_hash_before_fn_t)(void *);
typedef void (*_hash_free_fn_t)(void *);
#define HASH_MAX_CAPACITY (1024 * 1024 * 16)
#define HASH_DEFAULT_LOAD_FACTOR (0.75)
#define HASH_INDEX(v, c) ((v) & ((c)-1))
#define HASH_NODE_EXIST(code) (code == -2)
#define HASH_KEY_ALREADY_EXISTS (-2)
#define HASH_NODE_EXIST(code) (code == HASH_KEY_ALREADY_EXISTS)
/**
* murmur hash algorithm
......@@ -54,49 +50,15 @@ uint32_t taosIntHash_32(const char *key, uint32_t len);
uint32_t taosIntHash_64(const char *key, uint32_t len);
_hash_fn_t taosGetDefaultHashFunction(int32_t type);
_equal_fn_t taosGetDefaultEqualFunction(int32_t type);
typedef struct SHashNode {
struct SHashNode *next;
uint32_t hashVal; // the hash value of key
uint32_t dataLen; // length of data
uint32_t keyLen; // length of the key
uint16_t count; // reference count
int8_t removed; // flag to indicate removed
char data[];
} SHashNode;
#define GET_HASH_NODE_KEY(_n) ((char *)(_n) + sizeof(SHashNode) + (_n)->dataLen)
#define GET_HASH_NODE_DATA(_n) ((char *)(_n) + sizeof(SHashNode))
#define GET_HASH_PNODE(_n) ((SHashNode *)((char *)(_n) - sizeof(SHashNode)))
typedef enum SHashLockTypeE {
HASH_NO_LOCK = 0,
HASH_ENTRY_LOCK = 1,
} SHashLockTypeE;
typedef struct SHashEntry {
int32_t num; // number of elements in current entry
SRWLatch latch; // entry latch
SHashNode *next;
} SHashEntry;
typedef struct SHashObj {
SHashEntry **hashList;
uint32_t capacity; // number of slots
uint32_t size; // number of elements in hash table
_hash_fn_t hashFp; // hash function
_hash_free_fn_t freeFp; // hash node free callback function
_equal_fn_t equalFp; // equal function
_hash_before_fn_t callbackFp; // function invoked before return the value to caller
SRWLatch lock; // read-write spin lock
SHashLockTypeE type; // lock type
bool enableUpdate; // enable update
SArray *pMemBlock; // memory block allocated for SHashEntry
} SHashObj;
typedef struct SHashNode SHashNode;
typedef struct SHashObj SHashObj;
/**
* init the hash table
......@@ -126,8 +88,6 @@ int32_t taosHashGetSize(const SHashObj *pHashObj);
*/
int32_t taosHashPut(SHashObj *pHashObj, const void *key, size_t keyLen, void *data, size_t size);
int32_t taosHashPutExt(SHashObj *pHashObj, const void *key, size_t keyLen, void *data, size_t size, bool *newAdded);
/**
* return the payload data with the specified key
*
......@@ -146,17 +106,18 @@ void *taosHashGet(SHashObj *pHashObj, const void *key, size_t keyLen);
* @param destBuf
* @return
*/
void *taosHashGetClone(SHashObj *pHashObj, const void *key, size_t keyLen, void *destBuf);
int32_t taosHashGetDup(SHashObj *pHashObj, const void *key, size_t keyLen, void *destBuf);
/**
* Clone the result to interval allocated buffer
*
* @param pHashObj
* @param key
* @param keyLen
* @param destBuf
* @param size
* @return
*/
void *taosHashGetCloneExt(SHashObj *pHashObj, const void *key, size_t keyLen, void (*fp)(void *), void **d, size_t *sz);
int32_t taosHashGetDup_m(SHashObj* pHashObj, const void* key, size_t keyLen, void** destBuf, int32_t* size);
/**
* remove item with the specified key
......@@ -207,37 +168,13 @@ void *taosHashIterate(SHashObj *pHashObj, void *p);
*/
void taosHashCancelIterate(SHashObj *pHashObj, void *p);
/**
* Get the corresponding key information for a given data in hash table
* @param data
* @return
*/
int32_t taosHashGetKey(void *data, void **key, size_t *keyLen);
/**
* Get the corresponding key information for a given data in hash table, using memcpy
* @param data
* @param dst
* @return
*/
static FORCE_INLINE int32_t taosHashCopyKey(void *data, void *dst) {
if (NULL == data || NULL == dst) {
return -1;
}
SHashNode *node = GET_HASH_PNODE(data);
void *key = GET_HASH_NODE_KEY(node);
memcpy(dst, key, node->keyLen);
return 0;
}
/**
* Get the corresponding data length for a given data in hash table
* @param data
* @return
*/
int32_t taosHashGetDataLen(void *data);
/**
* Get the corresponding key information for a given data in hash table
* @param data
* @param keyLen
* @return
*/
void *taosHashGetKey(void *data, size_t* keyLen);
/**
* return the payload data with the specified key(reference number added)
......@@ -258,8 +195,20 @@ void *taosHashAcquire(SHashObj *pHashObj, const void *key, size_t keyLen);
*/
void taosHashRelease(SHashObj *pHashObj, void *p);
/**
*
* @param pHashObj
* @param fp
*/
void taosHashSetEqualFp(SHashObj *pHashObj, _equal_fn_t fp);
/**
*
* @param pHashObj
* @param fp
*/
void taosHashSetFreeFp(SHashObj *pHashObj, _hash_free_fn_t fp);
#ifdef __cplusplus
}
#endif
......
include/util/tlog.h
浏览文件 @ aa6e480e
......@@ -22,9 +22,29 @@
extern "C" {
#endif
typedef enum {
DEBUG_FATAL = 1,
DEBUG_ERROR = 1,
DEBUG_WARN = 2,
DEBUG_INFO = 2,
DEBUG_DEBUG = 4,
DEBUG_TRACE = 8,
DEBUG_DUMP = 16,
DEBUG_SCREEN = 64,
DEBUG_FILE = 128
} ELogLevel;
typedef void (*LogFp)(int64_t ts, ELogLevel level, const char *content);
extern bool tsLogEmbedded;
extern bool tsAsyncLog;
extern int32_t tsNumOfLogLines;
extern int32_t tsLogKeepDays;
extern LogFp tsLogFp;
extern int64_t tsNumOfErrorLogs;
extern int64_t tsNumOfInfoLogs;
extern int64_t tsNumOfDebugLogs;
extern int64_t tsNumOfTraceLogs;
extern int32_t dDebugFlag;
extern int32_t vDebugFlag;
extern int32_t mDebugFlag;
......@@ -40,45 +60,33 @@ extern int32_t tsdbDebugFlag;
extern int32_t tqDebugFlag;
extern int32_t fsDebugFlag;
#define DEBUG_FATAL 1U
#define DEBUG_ERROR DEBUG_FATAL
#define DEBUG_WARN 2U
#define DEBUG_INFO DEBUG_WARN
#define DEBUG_DEBUG 4U
#define DEBUG_TRACE 8U
#define DEBUG_DUMP 16U
#define DEBUG_SCREEN 64U
#define DEBUG_FILE 128U
int32_t taosInitLog(const char *logName, int32_t maxFiles);
void taosCloseLog();
void taosResetLog();
void taosSetAllDebugFlag(int32_t flag);
void taosDumpData(uint8_t *msg, int32_t len);
void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...)
void taosPrintLog(const char *flags, ELogLevel level, int32_t dflag, const char *format, ...)
#ifdef __GNUC__
__attribute__((format(printf, 3, 4)))
__attribute__((format(printf, 4, 5)))
#endif
;
void taosPrintLongString(const char *flags, int32_t dflag, const char *format, ...)
void taosPrintLongString(const char *flags, ELogLevel level, int32_t dflag, const char *format, ...)
#ifdef __GNUC__
__attribute__((format(printf, 3, 4)))
__attribute__((format(printf, 4, 5)))
#endif
;
extern int8_t tscEmbeddedInUtil;
#define uFatal(...) { if (uDebugFlag & DEBUG_FATAL) { taosPrintLog("UTL FATAL", tscEmbeddedInUtil ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uError(...) { if (uDebugFlag & DEBUG_ERROR) { taosPrintLog("UTL ERROR ", tscEmbeddedInUtil ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uWarn(...) { if (uDebugFlag & DEBUG_WARN) { taosPrintLog("UTL WARN ", tscEmbeddedInUtil ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uInfo(...) { if (uDebugFlag & DEBUG_INFO) { taosPrintLog("UTL ", tscEmbeddedInUtil ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uDebug(...) { if (uDebugFlag & DEBUG_DEBUG) { taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); }}
#define uTrace(...) { if (uDebugFlag & DEBUG_TRACE) { taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); }}
#define uFatal(...) { if (uDebugFlag & DEBUG_FATAL) { taosPrintLog("UTL FATAL", DEBUG_FATAL, tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uError(...) { if (uDebugFlag & DEBUG_ERROR) { taosPrintLog("UTL ERROR ", DEBUG_ERROR, tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uWarn(...) { if (uDebugFlag & DEBUG_WARN) { taosPrintLog("UTL WARN ", DEBUG_WARN, tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uInfo(...) { if (uDebugFlag & DEBUG_INFO) { taosPrintLog("UTL ", DEBUG_INFO, tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uDebug(...) { if (uDebugFlag & DEBUG_DEBUG) { taosPrintLog("UTL ", DEBUG_DEBUG, uDebugFlag, __VA_ARGS__); }}
#define uTrace(...) { if (uDebugFlag & DEBUG_TRACE) { taosPrintLog("UTL ", DEBUG_TRACE, uDebugFlag, __VA_ARGS__); }}
#define pError(...) { taosPrintLog("APP ERROR ", 255, __VA_ARGS__); }
#define pPrint(...) { taosPrintLog("APP ", 255, __VA_ARGS__); }
#define pError(...) { taosPrintLog("APP ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); }
#define pPrint(...) { taosPrintLog("APP ", DEBUG_INFO, 255, __VA_ARGS__); }
#ifdef __cplusplus
}
......
include/util/tpagedbuf.h
浏览文件 @ aa6e480e
......@@ -53,7 +53,7 @@ typedef struct SDiskbasedBufStatis {
* @param handle
* @return
*/
int32_t createDiskbasedBuf(SDiskbasedBuf** pBuf, int32_t pagesize, int32_t inMemBufSize, uint64_t qId, const char* dir);
int32_t createDiskbasedBuf(SDiskbasedBuf** pBuf, int32_t pagesize, int32_t inMemBufSize, const char* id, const char* dir);
/**
*
......
include/util/version.h
浏览文件 @ aa6e480e
......@@ -23,7 +23,6 @@ extern "C" {
extern char version[];
extern char compatible_version[];
extern char gitinfo[];
extern char gitinfoOfInternal[];
extern char buildinfo[];
#ifdef __cplusplus
......
source/client/inc/clientInt.h
浏览文件 @ aa6e480e
......@@ -20,12 +20,12 @@
extern "C" {
#endif
#include "tcommon.h"
#include "parser.h"
#include "query.h"
#include "taos.h"
#include "tcommon.h"
#include "tdatablock.h"
#include "tdef.h"
#include "tep.h"
#include "thash.h"
#include "tlist.h"
#include "tmsg.h"
......@@ -47,12 +47,12 @@ extern "C" {
typedef struct SAppInstInfo SAppInstInfo;
typedef struct SHbConnInfo {
typedef struct {
void* param;
SClientHbReq* req;
} SHbConnInfo;
typedef struct SAppHbMgr {
typedef struct {
char* key;
// statistics
int32_t reportCnt;
......@@ -68,11 +68,11 @@ typedef struct SAppHbMgr {
SHashObj* connInfo; // hash<SClientHbKey, SHbConnInfo>
} SAppHbMgr;
typedef int32_t (*FHbRspHandle)(struct SAppHbMgr* pAppHbMgr, SClientHbRsp* pRsp);
typedef int32_t (*FHbRspHandle)(SAppHbMgr* pAppHbMgr, SClientHbRsp* pRsp);
typedef int32_t (*FHbReqHandle)(SClientHbKey* connKey, void* param, SClientHbReq* req);
typedef struct SClientHbMgr {
typedef struct {
int8_t inited;
// ctl
int8_t threadStop;
......@@ -108,13 +108,13 @@ typedef struct SHeartBeatInfo {
} SHeartBeatInfo;
struct SAppInstInfo {
int64_t numOfConns;
SCorEpSet mgmtEp;
SInstanceSummary summary;
SList* pConnList; // STscObj linked list
int64_t clusterId;
void* pTransporter;
struct SAppHbMgr* pAppHbMgr;
int64_t numOfConns;
SCorEpSet mgmtEp;
SInstanceSummary summary;
SList* pConnList; // STscObj linked list
int64_t clusterId;
void* pTransporter;
SAppHbMgr* pAppHbMgr;
};
typedef struct SAppInfo {
......@@ -141,10 +141,6 @@ typedef struct STscObj {
SAppInstInfo* pAppInfo;
} STscObj;
typedef struct SMqConsumer {
STscObj* pTscObj;
} SMqConsumer;
typedef struct SReqResultInfo {
const char* pRspMsg;
const char* pData;
......@@ -172,7 +168,7 @@ typedef struct SRequestSendRecvBody {
SShowReqInfo showInfo; // todo this attribute will be removed after the query framework being completed.
SDataBuf requestMsg;
int64_t queryJob; // query job, created according to sql query DAG.
struct SQueryDag* pDag; // the query dag, generated according to the sql statement.
struct SQueryDag* pDag; // the query dag, generated according to the sql statement.
SReqResultInfo resInfo;
} SRequestSendRecvBody;
......
source/client/inc/clientLog.h
浏览文件 @ aa6e480e
......@@ -22,13 +22,13 @@ extern "C" {
#include "tlog.h"
#define tscFatal(...) do { if (cDebugFlag & DEBUG_FATAL) { taosPrintLog("TSC FATAL ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscError(...) do { if (cDebugFlag & DEBUG_ERROR) { taosPrintLog("TSC ERROR ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscWarn(...) do { if (cDebugFlag & DEBUG_WARN) { taosPrintLog("TSC WARN ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscInfo(...) do { if (cDebugFlag & DEBUG_INFO) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscDebug(...) do { if (cDebugFlag & DEBUG_DEBUG) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscTrace(...) do { if (cDebugFlag & DEBUG_TRACE) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscDebugL(...) do { if (cDebugFlag & DEBUG_DEBUG) { taosPrintLongString("TSC ", cDebugFlag, __VA_ARGS__); }} while(0)
#define tscFatal(...) do { if (cDebugFlag & DEBUG_FATAL) { taosPrintLog("TSC FATAL ", DEBUG_FATAL, cDebugFlag, __VA_ARGS__); }} while(0)
#define tscError(...) do { if (cDebugFlag & DEBUG_ERROR) { taosPrintLog("TSC ERROR ", DEBUG_ERROR, cDebugFlag, __VA_ARGS__); }} while(0)
#define tscWarn(...) do { if (cDebugFlag & DEBUG_WARN) { taosPrintLog("TSC WARN ", DEBUG_WARN, cDebugFlag, __VA_ARGS__); }} while(0)
#define tscInfo(...) do { if (cDebugFlag & DEBUG_INFO) { taosPrintLog("TSC ", DEBUG_INFO, cDebugFlag, __VA_ARGS__); }} while(0)
#define tscDebug(...) do { if (cDebugFlag & DEBUG_DEBUG) { taosPrintLog("TSC ", DEBUG_DEBUG, cDebugFlag, __VA_ARGS__); }} while(0)
#define tscTrace(...) do { if (cDebugFlag & DEBUG_TRACE) { taosPrintLog("TSC ", DEBUG_TRACE, cDebugFlag, __VA_ARGS__); }} while(0)
#define tscDebugL(...) do { if (cDebugFlag & DEBUG_DEBUG) { taosPrintLongString("TSC ", DEBUG_DEBUG, cDebugFlag, __VA_ARGS__); }} while(0)
#ifdef __cplusplus
}
......
source/client/src/clientHb.c
浏览文件 @ aa6e480e
......@@ -23,7 +23,7 @@ static SClientHbMgr clientHbMgr = {0};
static int32_t hbCreateThread();
static void hbStopThread();
static int32_t hbMqHbRspHandle(struct SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) { return 0; }
static int32_t hbMqHbRspHandle(SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) { return 0; }
static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog *pCatalog) {
int32_t code = 0;
......@@ -104,7 +104,7 @@ static int32_t hbProcessStbInfoRsp(void *value, int32_t valueLen, struct SCatalo
return TSDB_CODE_SUCCESS;
}
static int32_t hbQueryHbRspHandle(struct SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) {
static int32_t hbQueryHbRspHandle(SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) {
SHbConnInfo *info = taosHashGet(pAppHbMgr->connInfo, &pRsp->connKey, sizeof(SClientHbKey));
if (NULL == info) {
tscWarn("fail to get connInfo, may be dropped, connId:%d, type:%d", pRsp->connKey.connId, pRsp->connKey.hbType);
......@@ -163,7 +163,7 @@ static int32_t hbQueryHbRspHandle(struct SAppHbMgr *pAppHbMgr, SClientHbRsp *pRs
return TSDB_CODE_SUCCESS;
}
static int32_t hbMqAsyncCallBack(void *param, const SDataBuf *pMsg, int32_t code) {
static int32_t hbAsyncCallBack(void *param, const SDataBuf *pMsg, int32_t code) {
static int32_t emptyRspNum = 0;
if (code != 0) {
tfree(param);
......@@ -226,7 +226,11 @@ int32_t hbGetExpiredDBInfo(SClientHbKey *connKey, struct SCatalog *pCatalog, SCl
db->vgVersion = htonl(db->vgVersion);
}
SKv kv = {.key = HEARTBEAT_KEY_DBINFO, .valueLen = sizeof(SDbVgVersion) * dbNum, .value = dbs};
SKv kv = {
.key = HEARTBEAT_KEY_DBINFO,
.valueLen = sizeof(SDbVgVersion) * dbNum,
.value = dbs,
};
tscDebug("hb got %d expired db, valueLen:%d", dbNum, kv.valueLen);
......@@ -256,7 +260,11 @@ int32_t hbGetExpiredStbInfo(SClientHbKey *connKey, struct SCatalog *pCatalog, SC
stb->tversion = htons(stb->tversion);
}
SKv kv = {.key = HEARTBEAT_KEY_STBINFO, .valueLen = sizeof(SSTableMetaVersion) * stbNum, .value = stbs};
SKv kv = {
.key = HEARTBEAT_KEY_STBINFO,
.valueLen = sizeof(SSTableMetaVersion) * stbNum,
.value = stbs,
};
tscDebug("hb got %d expired stb, valueLen:%d", stbNum, kv.valueLen);
......@@ -288,7 +296,7 @@ int32_t hbQueryHbReqHandle(SClientHbKey *connKey, void *param, SClientHbReq *req
return TSDB_CODE_SUCCESS;
}
int32_t hbMqHbReqHandle(SClientHbKey *connKey, void *param, SClientHbReq *req) {}
int32_t hbMqHbReqHandle(SClientHbKey *connKey, void *param, SClientHbReq *req) { return 0; }
void hbMgrInitMqHbHandle() {
clientHbMgr.reqHandle[HEARTBEAT_TYPE_QUERY] = hbQueryHbReqHandle;
......@@ -396,7 +404,7 @@ static void *hbThreadFunc(void *param) {
free(buf);
break;
}
pInfo->fp = hbMqAsyncCallBack;
pInfo->fp = hbAsyncCallBack;
pInfo->msgInfo.pData = buf;
pInfo->msgInfo.len = tlen;
pInfo->msgType = TDMT_MND_HEARTBEAT;
......@@ -448,7 +456,6 @@ static void hbStopThread() {
}
SAppHbMgr *appHbMgrInit(SAppInstInfo *pAppInstInfo, char *key) {
/*return NULL;*/
hbMgrInit();
SAppHbMgr *pAppHbMgr = malloc(sizeof(SAppHbMgr));
if (pAppHbMgr == NULL) {
......@@ -473,7 +480,8 @@ SAppHbMgr *appHbMgrInit(SAppInstInfo *pAppInstInfo, char *key) {
free(pAppHbMgr);
return NULL;
}
pAppHbMgr->activeInfo->freeFp = tFreeClientHbReq;
taosHashSetFreeFp(pAppHbMgr->activeInfo, tFreeClientHbReq);
// init getInfoFunc
pAppHbMgr->connInfo = taosHashInit(64, hbKeyHashFunc, 1, HASH_ENTRY_LOCK);
......@@ -506,7 +514,6 @@ void appHbMgrCleanup(void) {
}
int hbMgrInit() {
/*return 0;*/
// init once
int8_t old = atomic_val_compare_exchange_8(&clientHbMgr.inited, 0, 1);
if (old == 1) return 0;
......@@ -524,7 +531,7 @@ int hbMgrInit() {
}
void hbMgrCleanUp() {
return;
#if 0
hbStopThread();
// destroy all appHbMgr
......@@ -537,6 +544,7 @@ void hbMgrCleanUp() {
pthread_mutex_unlock(&clientHbMgr.lock);
clientHbMgr.appHbMgrs = NULL;
#endif
}
int hbRegisterConnImpl(SAppHbMgr *pAppHbMgr, SClientHbKey connKey, SHbConnInfo *info) {
......@@ -563,9 +571,11 @@ int hbRegisterConnImpl(SAppHbMgr *pAppHbMgr, SClientHbKey connKey, SHbConnInfo *
}
int hbRegisterConn(SAppHbMgr *pAppHbMgr, int32_t connId, int64_t clusterId, int32_t hbType) {
/*return 0;*/
SClientHbKey connKey = {.connId = connId, .hbType = HEARTBEAT_TYPE_QUERY};
SHbConnInfo info = {0};
SClientHbKey connKey = {
.connId = connId,
.hbType = HEARTBEAT_TYPE_QUERY,
};
SHbConnInfo info = {0};
switch (hbType) {
case HEARTBEAT_TYPE_QUERY: {
......@@ -586,7 +596,6 @@ int hbRegisterConn(SAppHbMgr *pAppHbMgr, int32_t connId, int64_t clusterId, int3
}
void hbDeregisterConn(SAppHbMgr *pAppHbMgr, SClientHbKey connKey) {
/*return;*/
int32_t code = 0;
code = taosHashRemove(pAppHbMgr->activeInfo, &connKey, sizeof(SClientHbKey));
code = taosHashRemove(pAppHbMgr->connInfo, &connKey, sizeof(SClientHbKey));
......@@ -598,7 +607,6 @@ void hbDeregisterConn(SAppHbMgr *pAppHbMgr, SClientHbKey connKey) {
int hbAddConnInfo(SAppHbMgr *pAppHbMgr, SClientHbKey connKey, void *key, void *value, int32_t keyLen,
int32_t valueLen) {
return 0;
// find req by connection id
SClientHbReq *pReq = taosHashGet(pAppHbMgr->activeInfo, &connKey, sizeof(SClientHbKey));
ASSERT(pReq != NULL);
......
source/client/src/clientImpl.c
浏览文件 @ aa6e480e
......@@ -4,8 +4,8 @@
#include "parser.h"
#include "planner.h"
#include "scheduler.h"
#include "tdatablock.h"
#include "tdef.h"
#include "tep.h"
#include "tglobal.h"
#include "tmsgtype.h"
#include "tpagedbuf.h"
......@@ -517,7 +517,7 @@ void* doFetchRow(SRequestObj* pRequest) {
SShowReqInfo* pShowReqInfo = &pRequest->body.showInfo;
SVgroupInfo* pVgroupInfo = taosArrayGet(pShowReqInfo->pArray, pShowReqInfo->currentIndex);
epSet = pVgroupInfo->epset;
epSet = pVgroupInfo->epSet;
} else if (pRequest->type == TDMT_VND_SHOW_TABLES_FETCH) {
pRequest->type = TDMT_VND_SHOW_TABLES;
SShowReqInfo* pShowReqInfo = &pRequest->body.showInfo;
......@@ -534,7 +534,7 @@ void* doFetchRow(SRequestObj* pRequest) {
pRequest->body.requestMsg.pData = pShowReq;
SMsgSendInfo* body = buildMsgInfoImpl(pRequest);
epSet = pVgroupInfo->epset;
epSet = pVgroupInfo->epSet;
int64_t transporterId = 0;
STscObj* pTscObj = pRequest->pTscObj;
......
source/client/src/tmq.c
浏览文件 @ aa6e480e
此差异已折叠。
source/common/src/tep.c → source/common/src/tdatablock.c
浏览文件 @ aa6e480e
......@@ -14,7 +14,7 @@
*/
#define _DEFAULT_SOURCE
#include "tep.h"
#include "tdatablock.h"
#include "tcompare.h"
#include "tglobal.h"
......
source/common/src/tglobal.c
浏览文件 @ aa6e480e
......@@ -17,7 +17,7 @@
#include "tglobal.h"
#include "tcompare.h"
#include "tconfig.h"
#include "tep.h"
#include "tdatablock.h"
#include "tlog.h"
SConfig *tsCfg = NULL;
......@@ -48,10 +48,11 @@ bool tsPrintAuth = 0;
// monitor
bool tsEnableMonitor = 1;
int32_t tsMonitorInterval = 5;
int32_t tsMonitorInterval = 30;
char tsMonitorFqdn[TSDB_FQDN_LEN] = {0};
uint16_t tsMonitorPort = 6043;
int32_t tsMonitorMaxLogs = 100;
bool tsMonitorComp = false;
/*
* denote if the server needs to compress response message at the application layer to client, including query rsp,
......@@ -155,21 +156,40 @@ static void taosAddDataDir(int32_t index, char *v1, int32_t level, int32_t prima
uTrace("dataDir:%s, level:%d primary:%d is configured", v1, level, primary);
}
static void taosSetTfsCfg(SConfig *pCfg) {
static int32_t taosSetTfsCfg(SConfig *pCfg) {
SConfigItem *pItem = cfgGetItem(pCfg, "dataDir");
if (pItem == NULL) return;
memset(tsDataDir, 0, PATH_MAX);
int32_t size = taosArrayGetSize(pItem->array);
if (size <= 0) {
tsDiskCfgNum = 1;
taosAddDataDir(0, pItem->str, 0, 1);
tstrncpy(tsDataDir, pItem->str, PATH_MAX);
if (taosMkDir(tsDataDir) != 0) {
uError("failed to create dataDir:%s since %s", tsDataDir, terrstr());
return -1;
}
} else {
tsDiskCfgNum = size < TFS_MAX_DISKS ? size : TFS_MAX_DISKS;
for (int32_t index = 0; index < tsDiskCfgNum; ++index) {
SDiskCfg *pCfg = taosArrayGet(pItem->array, index);
memcpy(&tsDiskCfg[index], pCfg, sizeof(SDiskCfg));
if (pCfg->level == 0 && pCfg->primary == 1) {
tstrncpy(tsDataDir, pCfg->dir, PATH_MAX);
}
if (taosMkDir(pCfg->dir) != 0) {
uError("failed to create tfsDir:%s since %s", tsDataDir, terrstr());
return -1;
}
}
}
if (tsDataDir[0] == 0) {
uError("datadir not set");
return -1;
}
return 0;
}
struct SConfig *taosGetCfg() {
......@@ -279,11 +299,11 @@ static int32_t taosAddSystemCfg(SConfig *pCfg) {
if (cfgAddLocale(pCfg, "locale", tsLocale) != 0) return -1;
if (cfgAddCharset(pCfg, "charset", tsCharset) != 0) return -1;
if (cfgAddBool(pCfg, "enableCoreFile", 1, 1) != 0) return -1;
if (cfgAddInt32(pCfg, "numOfCores", tsNumOfCores, 1, 100000, 1) != 0) return -1;
if (cfgAddInt32(pCfg, "pageSize(KB)", tsPageSize, 0, INT64_MAX, 1) != 0) return -1;
if (cfgAddFloat(pCfg, "numOfCores", tsNumOfCores, 0, 100000, 1) != 0) return -1;
if (cfgAddInt64(pCfg, "openMax", tsOpenMax, 0, INT64_MAX, 1) != 0) return -1;
if (cfgAddInt64(pCfg, "streamMax", tsStreamMax, 0, INT64_MAX, 1) != 0) return -1;
if (cfgAddInt32(pCfg, "totalMemory(MB)", tsTotalMemoryMB, 0, INT32_MAX, 1) != 0) return -1;
if (cfgAddInt32(pCfg, "pageSize(KB)", tsPageSizeKB, 0, INT64_MAX, 1) != 0) return -1;
if (cfgAddInt64(pCfg, "totalMemory(KB)", tsTotalMemoryKB, 0, INT64_MAX, 1) != 0) return -1;
if (cfgAddString(pCfg, "os sysname", info.sysname, 1) != 0) return -1;
if (cfgAddString(pCfg, "os nodename", info.nodename, 1) != 0) return -1;
if (cfgAddString(pCfg, "os release", info.release, 1) != 0) return -1;
......@@ -294,7 +314,6 @@ static int32_t taosAddSystemCfg(SConfig *pCfg) {
if (cfgAddString(pCfg, "version", version, 1) != 0) return -1;
if (cfgAddString(pCfg, "compatible_version", compatible_version, 1) != 0) return -1;
if (cfgAddString(pCfg, "gitinfo", gitinfo, 1) != 0) return -1;
if (cfgAddString(pCfg, "gitinfoOfInternal", gitinfoOfInternal, 1) != 0) return -1;
if (cfgAddString(pCfg, "buildinfo", buildinfo, 1) != 0) return -1;
return 0;
}
......@@ -327,6 +346,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
if (cfgAddString(pCfg, "monitorFqdn", tsMonitorFqdn, 0) != 0) return -1;
if (cfgAddInt32(pCfg, "monitorPort", tsMonitorPort, 1, 65056, 0) != 0) return -1;
if (cfgAddInt32(pCfg, "monitorMaxLogs", tsMonitorMaxLogs, 1, 1000000, 0) != 0) return -1;
if (cfgAddBool(pCfg, "monitorComp", tsMonitorComp, 0) != 0) return -1;
return 0;
}
......@@ -358,7 +378,7 @@ static void taosSetServerLogCfg(SConfig *pCfg) {
fsDebugFlag = cfgGetItem(pCfg, "fsDebugFlag")->i32;
}
static void taosSetClientCfg(SConfig *pCfg) {
static int32_t taosSetClientCfg(SConfig *pCfg) {
tstrncpy(tsLocalFqdn, cfgGetItem(pCfg, "fqdn")->str, TSDB_FQDN_LEN);
tsServerPort = (uint16_t)cfgGetItem(pCfg, "serverPort")->i32;
snprintf(tsLocalEp, sizeof(tsLocalEp), "%s:%u", tsLocalFqdn, tsServerPort);
......@@ -375,9 +395,13 @@ static void taosSetClientCfg(SConfig *pCfg) {
snprintf(tsSecond, sizeof(tsSecond), "%s:%u", secondEp.fqdn, secondEp.port);
cfgSetItem(pCfg, "secondEp", tsSecond, pSecondpItem->stype);
tstrncpy(tsLogDir, cfgGetItem(pCfg, "tempDir")->str, PATH_MAX);
taosExpandDir(tsLogDir, tsLogDir, PATH_MAX);
tstrncpy(tsTempDir, cfgGetItem(pCfg, "tempDir")->str, PATH_MAX);
taosExpandDir(tsTempDir, tsTempDir, PATH_MAX);
tsTempSpace.reserved = cfgGetItem(pCfg, "minimalTempDirGB")->fval;
if (taosMkDir(tsTempDir) != 0) {
uError("failed to create tempDir:%s since %s", tsTempDir, terrstr());
return -1;
}
tsNumOfThreadsPerCore = cfgGetItem(pCfg, "maxTmrCtrl")->fval;
tsMaxTmrCtrl = cfgGetItem(pCfg, "maxTmrCtrl")->i32;
......@@ -392,6 +416,8 @@ static void taosSetClientCfg(SConfig *pCfg) {
tsMaxNumOfOrderedResults = cfgGetItem(pCfg, "maxNumOfOrderedRes")->i32;
tsKeepOriginalColumnName = cfgGetItem(pCfg, "keepColumnName")->bval;
tsMaxBinaryDisplayWidth = cfgGetItem(pCfg, "maxBinaryDisplayWidth")->i32;
return 0;
}
static void taosSetSystemCfg(SConfig *pCfg) {
......@@ -404,10 +430,6 @@ static void taosSetSystemCfg(SConfig *pCfg) {
const char *charset = cfgGetItem(pCfg, "charset")->str;
taosSetSystemLocale(locale, charset);
if (tsNumOfCores <= 1) {
tsNumOfCores = 2;
}
bool enableCore = cfgGetItem(pCfg, "enableCoreFile")->bval;
taosSetConsoleEcho(enableCore);
......@@ -415,11 +437,8 @@ static void taosSetSystemCfg(SConfig *pCfg) {
tsVersion = 30000000;
}
static void taosSetServerCfg(SConfig *pCfg) {
tstrncpy(tsDataDir, cfgGetItem(pCfg, "dataDir")->str, PATH_MAX);
taosExpandDir(tsDataDir, tsDataDir, PATH_MAX);
tsTempSpace.reserved = cfgGetItem(pCfg, "minimalDataDirGB")->fval;
static int32_t taosSetServerCfg(SConfig *pCfg) {
tsDataSpace.reserved = cfgGetItem(pCfg, "minimalDataDirGB")->fval;
tsNumOfCommitThreads = cfgGetItem(pCfg, "numOfCommitThreads")->i32;
tsRatioOfQueryCores = cfgGetItem(pCfg, "ratioOfQueryCores")->fval;
tsMaxNumOfDistinctResults = cfgGetItem(pCfg, "maxNumOfDistinctRes")->i32;
......@@ -444,10 +463,13 @@ static void taosSetServerCfg(SConfig *pCfg) {
tstrncpy(tsMonitorFqdn, cfgGetItem(pCfg, "monitorFqdn")->str, TSDB_FQDN_LEN);
tsMonitorPort = (uint16_t)cfgGetItem(pCfg, "monitorPort")->i32;
tsMonitorMaxLogs = cfgGetItem(pCfg, "monitorMaxLogs")->i32;
tsMonitorComp = cfgGetItem(pCfg, "monitorComp")->bval;
if (tsQueryBufferSize >= 0) {
tsQueryBufferSizeBytes = tsQueryBufferSize * 1048576UL;
}
return 0;
}
int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDir, const char *envFile,
......@@ -458,10 +480,10 @@ int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDi
if (pCfg == NULL) return -1;
if (tsc) {
tscEmbeddedInUtil = 0;
tsLogEmbedded = 0;
if (taosAddClientLogCfg(pCfg) != 0) return -1;
} else {
tscEmbeddedInUtil = 1;
tsLogEmbedded = 1;
if (taosAddClientLogCfg(pCfg) != 0) return -1;
if (taosAddServerLogCfg(pCfg) != 0) return -1;
}
......@@ -508,8 +530,8 @@ int32_t taosInitCfg(const char *cfgDir, const char *envFile, const char *apolloU
tsCfg = cfgInit();
if (tsc) {
if (taosAddClientLogCfg(tsCfg) != 0) return -1;
if (taosAddClientCfg(tsCfg) != 0) return -1;
if (taosAddClientLogCfg(tsCfg) != 0) return -1;
} else {
if (taosAddClientCfg(tsCfg) != 0) return -1;
if (taosAddServerCfg(tsCfg) != 0) return -1;
......@@ -532,24 +554,14 @@ int32_t taosInitCfg(const char *cfgDir, const char *envFile, const char *apolloU
}
if (tsc) {
taosSetClientCfg(tsCfg);
if (taosSetClientCfg(tsCfg)) return -1;
} else {
taosSetClientCfg(tsCfg);
taosSetServerCfg(tsCfg);
taosSetTfsCfg(tsCfg);
if (taosSetClientCfg(tsCfg)) return -1;
if (taosSetServerCfg(tsCfg)) return -1;
if (taosSetTfsCfg(tsCfg) != 0) return -1;
}
taosSetSystemCfg(tsCfg);
if (taosMkDir(tsTempDir) != 0) {
uError("failed to create dir:%s since %s", tsTempDir, terrstr());
return -1;
}
if (!tsc && taosMkDir(tsDataDir) != 0) {
uError("failed to create dir:%s since %s", tsDataDir, terrstr());
return -1;
}
cfgDumpCfg(tsCfg, tsc, false);
return 0;
}
......
source/common/src/tmsg.c
浏览文件 @ aa6e480e
......@@ -1481,7 +1481,7 @@ static int32_t tSerializeSUseDbRspImp(SCoder *pEncoder, SUseDbRsp *pRsp) {
if (tEncodeI32(pEncoder, pVgInfo->vgId) < 0) return -1;
if (tEncodeU32(pEncoder, pVgInfo->hashBegin) < 0) return -1;
if (tEncodeU32(pEncoder, pVgInfo->hashEnd) < 0) return -1;
if (tEncodeSEpSet(pEncoder, &pVgInfo->epset) < 0) return -1;
if (tEncodeSEpSet(pEncoder, &pVgInfo->epSet) < 0) return -1;
}
return 0;
......@@ -1541,7 +1541,7 @@ int32_t tDeserializeSUseDbRspImp(SCoder *pDecoder, SUseDbRsp *pRsp) {
if (tDecodeI32(pDecoder, &vgInfo.vgId) < 0) return -1;
if (tDecodeU32(pDecoder, &vgInfo.hashBegin) < 0) return -1;
if (tDecodeU32(pDecoder, &vgInfo.hashEnd) < 0) return -1;
if (tDecodeSEpSet(pDecoder, &vgInfo.epset) < 0) return -1;
if (tDecodeSEpSet(pDecoder, &vgInfo.epSet) < 0) return -1;
taosArrayPush(pRsp->pVgroupInfos, &vgInfo);
}
......@@ -2390,3 +2390,36 @@ int32_t tDecodeSMqCMCommitOffsetReq(SCoder *decoder, SMqCMCommitOffsetReq *pReq)
tEndDecode(decoder);
return 0;
}
int32_t tSerializeSVCreateTSmaReq(void **buf, SVCreateTSmaReq *pReq) {
int32_t tlen = 0;
tlen += taosEncodeFixedI64(buf, pReq->ver);
tlen += tEncodeTSma(buf, &pReq->tSma);
return tlen;
}
void *tDeserializeSVCreateTSmaReq(void *buf, SVCreateTSmaReq *pReq) {
buf = taosDecodeFixedI64(buf, &(pReq->ver));
if ((buf = tDecodeTSma(buf, &pReq->tSma)) == NULL) {
tdDestroyTSma(&pReq->tSma);
}
return buf;
}
int32_t tSerializeSVDropTSmaReq(void **buf, SVDropTSmaReq *pReq) {
int32_t tlen = 0;
tlen += taosEncodeFixedI64(buf, pReq->ver);
tlen += taosEncodeString(buf, pReq->indexName);
return tlen;
}
void *tDeserializeSVDropTSmaReq(void *buf, SVDropTSmaReq *pReq) {
buf = taosDecodeFixedI64(buf, &(pReq->ver));
buf = taosDecodeStringTo(buf, pReq->indexName);
return buf;
}
source/common/src/ttszip.c
浏览文件 @ aa6e480e
......@@ -46,7 +46,7 @@ STSBuf* tsBufCreate(bool autoDelete, int32_t order) {
}
if (!autoDelete) {
remove(pTSBuf->path);
taosRemoveFile(pTSBuf->path);
}
if (NULL == allocResForTSBuf(pTSBuf)) {
......@@ -178,7 +178,7 @@ void* tsBufDestroy(STSBuf* pTSBuf) {
if (pTSBuf->autoDelete) {
// ("tsBuf %p destroyed, delete tmp file:%s", pTSBuf, pTSBuf->path);
remove(pTSBuf->path);
taosRemoveFile(pTSBuf->path);
} else {
// tscDebug("tsBuf %p destroyed, tmp file:%s, remains", pTSBuf, pTSBuf->path);
}
......
source/common/test/commonTests.cpp
浏览文件 @ aa6e480e
#include "tcommon.h"
#include <gtest/gtest.h>
#include <tep.h>
#include <iostream>
#pragma GCC diagnostic push
......@@ -10,6 +8,9 @@
#pragma GCC diagnostic ignored "-Wsign-compare"
#include "os.h"
#include "tcommon.h"
#include "tdatablock.h"
#include "tcommon.h"
#include "taos.h"
#include "tvariant.h"
#include "tdef.h"
......
source/common/test/tmsgTest.cpp
浏览文件 @ aa6e480e
#include <iostream>
#include "gtest/gtest.h"
#include <gtest/gtest.h>
#include "tmsg.h"
......
source/dnode/mgmt/daemon/src/dmnMain.c
浏览文件 @ aa6e480e
......@@ -97,6 +97,11 @@ int32_t dmnRunDnode() {
}
int main(int argc, char const *argv[]) {
if (!taosCheckSystemIsSmallEnd()) {
uError("TDengine does not run on non-small-end machines.");
return -1;
}
if (dmnParseOption(argc, argv) != 0) {
return -1;
}
......
source/dnode/mgmt/daemon/src/dmnUtil.c
浏览文件 @ aa6e480e
......@@ -30,6 +30,5 @@ void dmnPrintVersion() {
#endif
printf("%s version: %s compatible_version: %s\n", releaseName, version, compatible_version);
printf("gitinfo: %s\n", gitinfo);
printf("gitinfoI: %s\n", gitinfoOfInternal);
printf("builuInfo: %s\n", buildinfo);
}
source/dnode/mgmt/impl/inc/dndEnv.h
浏览文件 @ aa6e480e
......@@ -31,7 +31,7 @@ typedef struct {
SDnode *pDnode;
STaosQueue *queue;
union {
SQWorkerPool pool;
SQWorkerPool pool;
SWWorkerPool mpool;
};
} SDnodeWorker;
......@@ -105,9 +105,19 @@ typedef struct {
} SBnodeMgmt;
typedef struct {
int32_t openVnodes;
int32_t totalVnodes;
int32_t masterNum;
int64_t numOfSelectReqs;
int64_t numOfInsertReqs;
int64_t numOfInsertSuccessReqs;
int64_t numOfBatchInsertReqs;
int64_t numOfBatchInsertSuccessReqs;
} SVnodesStat;
typedef struct {
SVnodesStat stat;
SHashObj *hash;
int32_t openVnodes;
int32_t totalVnodes;
SRWLatch latch;
SQWorkerPool queryPool;
SFWorkerPool fetchPool;
......@@ -137,6 +147,8 @@ typedef struct SDnode {
SStartupReq startup;
} SDnode;
int32_t dndGetMonitorDiskInfo(SDnode *pDnode, SMonDiskInfo *pInfo);
#ifdef __cplusplus
}
#endif
......
source/dnode/mgmt/impl/inc/dndInt.h
浏览文件 @ aa6e480e
......@@ -23,9 +23,11 @@ extern "C" {
#include "os.h"
#include "cJSON.h"
#include "monitor.h"
#include "tcache.h"
#include "tcrc32c.h"
#include "tep.h"
#include "tdatablock.h"
#include "tglobal.h"
#include "thash.h"
#include "tlockfree.h"
#include "tlog.h"
......@@ -35,8 +37,6 @@ extern "C" {
#include "tthread.h"
#include "ttime.h"
#include "tworker.h"
#include "tglobal.h"
#include "monitor.h"
#include "dnode.h"
......@@ -47,14 +47,12 @@ extern "C" {
#include "vnode.h"
#include "tfs.h"
extern int32_t dDebugFlag;
#define dFatal(...) { if (dDebugFlag & DEBUG_FATAL) { taosPrintLog("DND FATAL ", 255, __VA_ARGS__); }}
#define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("DND ERROR ", 255, __VA_ARGS__); }}
#define dWarn(...) { if (dDebugFlag & DEBUG_WARN) { taosPrintLog("DND WARN ", 255, __VA_ARGS__); }}
#define dInfo(...) { if (dDebugFlag & DEBUG_INFO) { taosPrintLog("DND ", 255, __VA_ARGS__); }}
#define dDebug(...) { if (dDebugFlag & DEBUG_DEBUG) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }}
#define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }}
#define dFatal(...) { if (dDebugFlag & DEBUG_FATAL) { taosPrintLog("DND FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); }}
#define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("DND ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); }}
#define dWarn(...) { if (dDebugFlag & DEBUG_WARN) { taosPrintLog("DND WARN ", DEBUG_WARN, 255, __VA_ARGS__); }}
#define dInfo(...) { if (dDebugFlag & DEBUG_INFO) { taosPrintLog("DND ", DEBUG_INFO, 255, __VA_ARGS__); }}
#define dDebug(...) { if (dDebugFlag & DEBUG_DEBUG) { taosPrintLog("DND ", DEBUG_DEBUG, dDebugFlag, __VA_ARGS__); }}
#define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", DEBUG_TRACE, dDebugFlag, __VA_ARGS__); }}
typedef enum { DND_STAT_INIT, DND_STAT_RUNNING, DND_STAT_STOPPED } EStat;
typedef enum { DND_WORKER_SINGLE, DND_WORKER_MULTI } EWorkerType;
......
source/dnode/mgmt/impl/src/dndEnv.c
浏览文件 @ aa6e480e
......@@ -298,7 +298,7 @@ int32_t dndInit() {
return -1;
}
SMonCfg monCfg = {.maxLogs = tsMonitorMaxLogs, .port = tsMonitorPort, .server = tsMonitorFqdn};
SMonCfg monCfg = {.maxLogs = tsMonitorMaxLogs, .port = tsMonitorPort, .server = tsMonitorFqdn, .comp = tsMonitorComp};
if (monInit(&monCfg) != 0) {
dError("failed to init monitor since %s", terrstr());
dndCleanup();
......@@ -323,3 +323,12 @@ void dndCleanup() {
taosStopCacheRefreshWorker();
dInfo("dnode env is cleaned up");
}
int32_t dndGetMonitorDiskInfo(SDnode *pDnode, SMonDiskInfo *pInfo) {
tstrncpy(pInfo->logdir.name, tsLogDir, sizeof(pInfo->logdir.name));
pInfo->logdir.size = tsLogSpace.size;
tstrncpy(pInfo->tempdir.name, tsTempDir, sizeof(pInfo->tempdir.name));
pInfo->tempdir.size = tsTempSpace.size;
return tfsGetMonitorInfo(pDnode->pTfs, pInfo);
}
\ No newline at end of file
source/dnode/mgmt/impl/src/dndMgmt.c
浏览文件 @ aa6e480e
......@@ -474,20 +474,47 @@ void dndProcessStartupReq(SDnode *pDnode, SRpcMsg *pReq) {
rpcSendResponse(&rpcRsp);
}
void dndGetBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) {
static void dndGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) {
pInfo->dnode_id = dndGetDnodeId(pDnode);
tstrncpy(pInfo->dnode_ep, tsLocalEp, TSDB_EP_LEN);
pInfo->cluster_id = dndGetClusterId(pDnode);
pInfo->protocol = 1;
}
static void dndGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) {
pInfo->uptime = (taosGetTimestampMs() - pDnode->dmgmt.rebootTime) / (86400000.0f);
taosGetCpuUsage(&pInfo->cpu_engine, &pInfo->cpu_system);
pInfo->cpu_cores = tsNumOfCores;
taosGetProcMemory(&pInfo->mem_engine);
taosGetSysMemory(&pInfo->mem_system);
pInfo->mem_total = tsTotalMemoryKB;
pInfo->disk_engine = 0;
pInfo->disk_used = tsDataSpace.size.used;
pInfo->disk_total = tsDataSpace.size.total;
taosGetCardInfo(&pInfo->net_in, &pInfo->net_out);
taosGetProcIO(&pInfo->io_read, &pInfo->io_write, &pInfo->io_read_disk, &pInfo->io_write_disk);
SVnodesStat *pStat = &pDnode->vmgmt.stat;
pInfo->req_select = pStat->numOfSelectReqs;
pInfo->req_insert = pStat->numOfInsertReqs;
pInfo->req_insert_success = pStat->numOfInsertSuccessReqs;
pInfo->req_insert_batch = pStat->numOfBatchInsertReqs;
pInfo->req_insert_batch_success = pStat->numOfBatchInsertSuccessReqs;
pInfo->errors = tsNumOfErrorLogs;
pInfo->vnodes_num = pStat->totalVnodes;
pInfo->masters = pStat->masterNum;
pInfo->has_mnode = pDnode->mmgmt.deployed;
}
static void dndSendMonitorReport(SDnode *pDnode) {
if (!tsEnableMonitor || tsMonitorFqdn[0] == 0) return;
if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return;
dTrace("pDnode:%p, send monitor report to %s:%u", pDnode, tsMonitorFqdn, tsMonitorPort);
SMonInfo *pMonitor = monCreateMonitorInfo();
if (pMonitor == NULL) return;
dTrace("pDnode:%p, send monitor report to %s:%u", pDnode, tsMonitorFqdn, tsMonitorPort);
SMonBasicInfo basicInfo = {0};
dndGetBasicInfo(pDnode, &basicInfo);
dndGetMonitorBasicInfo(pDnode, &basicInfo);
monSetBasicInfo(pMonitor, &basicInfo);
SMonClusterInfo clusterInfo = {0};
......@@ -499,6 +526,20 @@ static void dndSendMonitorReport(SDnode *pDnode) {
monSetGrantInfo(pMonitor, &grantInfo);
}
SMonDnodeInfo dnodeInfo = {0};
dndGetMonitorDnodeInfo(pDnode, &dnodeInfo);
monSetDnodeInfo(pMonitor, &dnodeInfo);
SMonDiskInfo diskInfo = {0};
if (dndGetMonitorDiskInfo(pDnode, &diskInfo) == 0) {
monSetDiskInfo(pMonitor, &diskInfo);
}
taosArrayDestroy(clusterInfo.dnodes);
taosArrayDestroy(clusterInfo.mnodes);
taosArrayDestroy(vgroupInfo.vgroups);
taosArrayDestroy(diskInfo.datadirs);
monSendReport(pMonitor);
monCleanupMonitorInfo(pMonitor);
}
......
source/dnode/mgmt/impl/src/dndMnode.c
浏览文件 @ aa6e480e
......@@ -639,4 +639,4 @@ int32_t dndGetMnodeMonitorInfo(SDnode *pDnode, SMonClusterInfo *pClusterInfo, SM
int32_t code = mndGetMonitorInfo(pMnode, pClusterInfo, pVgroupInfo, pGrantInfo);
dndReleaseMnode(pDnode, pMnode);
return code;
}
\ No newline at end of file
}
source/dnode/mgmt/impl/src/dndVnodes.c
浏览文件 @ aa6e480e
......@@ -17,6 +17,7 @@
#include "dndVnodes.h"
#include "dndMgmt.h"
#include "dndTransport.h"
#include "sync.h"
typedef struct {
int32_t vgId;
......@@ -85,7 +86,7 @@ static SVnodeObj *dndAcquireVnode(SDnode *pDnode, int32_t vgId) {
int32_t refCount = 0;
taosRLockLatch(&pMgmt->latch);
taosHashGetClone(pMgmt->hash, &vgId, sizeof(int32_t), (void *)&pVnode);
taosHashGetDup(pMgmt->hash, &vgId, sizeof(int32_t), (void *)&pVnode);
if (pVnode == NULL) {
terrno = TSDB_CODE_VND_INVALID_VGROUP_ID;
} else {
......@@ -381,7 +382,7 @@ static void *dnodeOpenVnodeFunc(void *param) {
char stepDesc[TSDB_STEP_DESC_LEN] = {0};
snprintf(stepDesc, TSDB_STEP_DESC_LEN, "vgId:%d, start to restore, %d of %d have been opened", pCfg->vgId,
pMgmt->openVnodes, pMgmt->totalVnodes);
pMgmt->stat.openVnodes, pMgmt->stat.totalVnodes);
dndReportStartup(pDnode, "open-vnodes", stepDesc);
SVnodeCfg cfg = {.pDnode = pDnode, .pTfs = pDnode->pTfs, .vgId = pCfg->vgId, .dbId = pCfg->dbUid};
......@@ -395,7 +396,7 @@ static void *dnodeOpenVnodeFunc(void *param) {
pThread->opened++;
}
atomic_add_fetch_32(&pMgmt->openVnodes, 1);
atomic_add_fetch_32(&pMgmt->stat.openVnodes, 1);
}
dDebug("thread:%d, total vnodes:%d, opened:%d failed:%d", pThread->threadIndex, pThread->vnodeNum, pThread->opened,
......@@ -421,7 +422,7 @@ static int32_t dndOpenVnodes(SDnode *pDnode) {
return -1;
}
pMgmt->totalVnodes = numOfVnodes;
pMgmt->stat.totalVnodes = numOfVnodes;
int32_t threadNum = tsNumOfCores;
#if 1
......@@ -469,11 +470,11 @@ static int32_t dndOpenVnodes(SDnode *pDnode) {
free(threads);
free(pCfgs);
if (pMgmt->openVnodes != pMgmt->totalVnodes) {
dError("there are total vnodes:%d, opened:%d", pMgmt->totalVnodes, pMgmt->openVnodes);
if (pMgmt->stat.openVnodes != pMgmt->stat.totalVnodes) {
dError("there are total vnodes:%d, opened:%d", pMgmt->stat.totalVnodes, pMgmt->stat.openVnodes);
return -1;
} else {
dInfo("total vnodes:%d open successfully", pMgmt->totalVnodes);
dInfo("total vnodes:%d open successfully", pMgmt->stat.totalVnodes);
return 0;
}
}
......@@ -979,11 +980,18 @@ void dndCleanupVnodes(SDnode *pDnode) {
void dndGetVnodeLoads(SDnode *pDnode, SArray *pLoads) {
SVnodesMgmt *pMgmt = &pDnode->vmgmt;
SVnodesStat *pStat = &pMgmt->stat;
int32_t totalVnodes = 0;
int32_t masterNum = 0;
int64_t numOfSelectReqs = 0;
int64_t numOfInsertReqs = 0;
int64_t numOfInsertSuccessReqs = 0;
int64_t numOfBatchInsertReqs = 0;
int64_t numOfBatchInsertSuccessReqs = 0;
taosRLockLatch(&pMgmt->latch);
int32_t v = 0;
void *pIter = taosHashIterate(pMgmt->hash, NULL);
void *pIter = taosHashIterate(pMgmt->hash, NULL);
while (pIter) {
SVnodeObj **ppVnode = pIter;
if (ppVnode == NULL || *ppVnode == NULL) continue;
......@@ -993,8 +1001,24 @@ void dndGetVnodeLoads(SDnode *pDnode, SArray *pLoads) {
vnodeGetLoad(pVnode->pImpl, &vload);
taosArrayPush(pLoads, &vload);
numOfSelectReqs += vload.numOfSelectReqs;
numOfInsertReqs += vload.numOfInsertReqs;
numOfInsertSuccessReqs += vload.numOfInsertSuccessReqs;
numOfBatchInsertReqs += vload.numOfBatchInsertReqs;
numOfBatchInsertSuccessReqs += vload.numOfBatchInsertSuccessReqs;
totalVnodes++;
if (vload.role == TAOS_SYNC_STATE_LEADER) masterNum++;
pIter = taosHashIterate(pMgmt->hash, pIter);
}
taosRUnLockLatch(&pMgmt->latch);
pStat->totalVnodes = totalVnodes;
pStat->masterNum = masterNum;
pStat->numOfSelectReqs = numOfSelectReqs;
pStat->numOfInsertReqs = numOfInsertReqs;
pStat->numOfInsertSuccessReqs = numOfInsertSuccessReqs;
pStat->numOfBatchInsertReqs = numOfBatchInsertReqs;
pStat->numOfBatchInsertSuccessReqs = numOfBatchInsertSuccessReqs;
}
source/dnode/mgmt/impl/test/sut/src/client.cpp
浏览文件 @ aa6e480e
......@@ -14,7 +14,7 @@
*/
#include "sut.h"
#include "tep.h"
#include "tdatablock.h"
static void processClientRsp(void* parent, SRpcMsg* pRsp, SEpSet* pEpSet) {
TestClient* client = (TestClient*)parent;
......
source/dnode/mgmt/impl/test/sut/src/sut.cpp
浏览文件 @ aa6e480e
......@@ -28,7 +28,7 @@ void Testbase::InitLog(const char* path) {
wDebugFlag = 0;
sDebugFlag = 0;
tsdbDebugFlag = 0;
tscEmbeddedInUtil = 1;
tsLogEmbedded = 1;
tsAsyncLog = 0;
taosRemoveDir(path);
......
source/dnode/mnode/impl/inc/mndDef.h
浏览文件 @ aa6e480e
......@@ -34,46 +34,6 @@
extern "C" {
#endif
extern int32_t mDebugFlag;
// mnode log function
#define mFatal(...) \
{ \
if (mDebugFlag & DEBUG_FATAL) { \
taosPrintLog("MND FATAL ", 255, __VA_ARGS__); \
} \
}
#define mError(...) \
{ \
if (mDebugFlag & DEBUG_ERROR) { \
taosPrintLog("MND ERROR ", 255, __VA_ARGS__); \
} \
}
#define mWarn(...) \
{ \
if (mDebugFlag & DEBUG_WARN) { \
taosPrintLog("MND WARN ", 255, __VA_ARGS__); \
} \
}
#define mInfo(...) \
{ \
if (mDebugFlag & DEBUG_INFO) { \
taosPrintLog("MND ", 255, __VA_ARGS__); \
} \
}
#define mDebug(...) \
{ \
if (mDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); \
} \
}
#define mTrace(...) \
{ \
if (mDebugFlag & DEBUG_TRACE) { \
taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); \
} \
}
typedef enum {
MND_AUTH_ACCT_START = 0,
MND_AUTH_ACCT_USER,
......@@ -634,7 +594,7 @@ typedef struct {
int64_t consumerId;
int64_t connId;
SRWLatch lock;
char cgroup[TSDB_CONSUMER_GROUP_LEN];
char cgroup[TSDB_CGROUP_LEN];
SArray* currentTopics; // SArray<char*>
SArray* recentRemovedTopics; // SArray<char*>
int32_t epoch;
......@@ -701,6 +661,9 @@ static FORCE_INLINE void* tDecodeSMqConsumerObj(void* buf, SMqConsumerObj* pCons
return buf;
}
typedef struct {
} SStreamScheduler;
typedef struct SMnodeMsg {
char user[TSDB_USER_LEN];
char db[TSDB_DB_FNAME_LEN];
......
source/dnode/mnode/impl/inc/mndInt.h
浏览文件 @ aa6e480e
......@@ -20,7 +20,7 @@
#include "sdb.h"
#include "tcache.h"
#include "tep.h"
#include "tdatablock.h"
#include "tglobal.h"
#include "tqueue.h"
#include "ttime.h"
......@@ -31,6 +31,13 @@
extern "C" {
#endif
#define mFatal(...) { if (mDebugFlag & DEBUG_FATAL) { taosPrintLog("MND FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); }}
#define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("MND ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); }}
#define mWarn(...) { if (mDebugFlag & DEBUG_WARN) { taosPrintLog("MND WARN ", DEBUG_WARN, 255, __VA_ARGS__); }}
#define mInfo(...) { if (mDebugFlag & DEBUG_INFO) { taosPrintLog("MND ", DEBUG_INFO, 255, __VA_ARGS__); }}
#define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ", DEBUG_DEBUG, mDebugFlag, __VA_ARGS__); }}
#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", DEBUG_TRACE, mDebugFlag, __VA_ARGS__); }}
typedef int32_t (*MndMsgFp)(SMnodeMsg *pMsg);
typedef int32_t (*MndInitFp)(SMnode *pMnode);
typedef void (*MndCleanupFp)(SMnode *pMnode);
......@@ -85,6 +92,11 @@ typedef struct {
ESyncState state;
} SSyncMgmt;
typedef struct {
int64_t expireTimeMS;
int64_t timeseriesAllowed;
} SGrantInfo;
typedef struct SMnode {
int32_t dnodeId;
int64_t clusterId;
......@@ -105,6 +117,7 @@ typedef struct SMnode {
STelemMgmt telemMgmt;
SSyncMgmt syncMgmt;
SHashObj *infosMeta;
SGrantInfo grant;
MndMsgFp msgFp[TDMT_MAX];
SendReqToDnodeFp sendReqToDnodeFp;
SendReqToMnodeFp sendReqToMnodeFp;
......@@ -120,7 +133,7 @@ void mndSetMsgHandle(SMnode *pMnode, tmsg_t msgType, MndMsgFp fp);
uint64_t mndGenerateUid(char *name, int32_t len);
int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad);
void mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad);
#ifdef __cplusplus
}
......
source/dnode/mnode/impl/inc/mndProfile.h
浏览文件 @ aa6e480e
......@@ -24,6 +24,7 @@ extern "C" {
int32_t mndInitProfile(SMnode *pMnode);
void mndCleanupProfile(SMnode *pMnode);
int32_t mndGetNumOfConnections(SMnode *pMnode);
#ifdef __cplusplus
}
......
source/dnode/mnode/impl/inc/mndScheduler.h 0 → 100644
浏览文件 @ aa6e480e
/*
* 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/>.
*/
#ifndef _TD_MND_SCHEDULER_H_
#define _TD_MND_SCHEDULER_H_
#include "mndInt.h"
#ifdef __cplusplus
extern "C" {
#endif
int32_t mndInitScheduler(SMnode* pMnode);
void mndCleanupScheduler(SMnode* pMnode);
int32_t mndSchedInitSubEp(SMnode* pMnode, const SMqTopicObj* pTopic, SMqSubscribeObj* pSub);
#ifdef __cplusplus
}
#endif
#endif /*_TD_MND_SCHEDULER_H_ */
source/dnode/mnode/impl/src/mndDb.c
浏览文件 @ aa6e480e
......@@ -900,10 +900,10 @@ static void mndBuildDBVgroupInfo(SDbObj *pDb, SMnode *pMnode, SArray *pVgList) {
vgInfo.vgId = pVgroup->vgId;
vgInfo.hashBegin = pVgroup->hashBegin;
vgInfo.hashEnd = pVgroup->hashEnd;
vgInfo.epset.numOfEps = pVgroup->replica;
vgInfo.epSet.numOfEps = pVgroup->replica;
for (int32_t gid = 0; gid < pVgroup->replica; ++gid) {
SVnodeGid *pVgid = &pVgroup->vnodeGid[gid];
SEp *pEp = &vgInfo.epset.eps[gid];
SEp *pEp = &vgInfo.epSet.eps[gid];
SDnodeObj *pDnode = mndAcquireDnode(pMnode, pVgid->dnodeId);
if (pDnode != NULL) {
memcpy(pEp->fqdn, pDnode->fqdn, TSDB_FQDN_LEN);
......@@ -911,7 +911,7 @@ static void mndBuildDBVgroupInfo(SDbObj *pDb, SMnode *pMnode, SArray *pVgList) {
}
mndReleaseDnode(pMnode, pDnode);
if (pVgid->role == TAOS_SYNC_STATE_LEADER) {
vgInfo.epset.inUse = gid;
vgInfo.epSet.inUse = gid;
}
}
vindex++;
......
source/dnode/mnode/impl/src/mndDnode.c
浏览文件 @ aa6e480e
......@@ -340,9 +340,16 @@ static int32_t mndProcessStatusReq(SMnodeMsg *pReq) {
pVgroup->compStorage = pVload->compStorage;
pVgroup->pointsWritten = pVload->pointsWritten;
}
bool roleChanged = false;
for (int32_t vg = 0; vg < pVgroup->replica; ++vg) {
if (pVgroup->vnodeGid[vg].role != pVload->role) {
roleChanged = true;
}
pVgroup->vnodeGid[vg].role = pVload->role;
}
if (roleChanged) {
// notify scheduler role has changed
}
}
mndReleaseVgroup(pMnode, pVgroup);
......@@ -631,13 +638,13 @@ static int32_t mndGetConfigMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp
pShow->bytes[cols] = TSDB_CONFIG_OPTION_LEN + VARSTR_HEADER_SIZE;
pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
strcpy(pSchema[cols].name, "name");
strcpy(pSchema[cols].name, "name");
pSchema[cols].bytes = pShow->bytes[cols];
cols++;
pShow->bytes[cols] = TSDB_CONIIG_VALUE_LEN + VARSTR_HEADER_SIZE;
pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
strcpy(pSchema[cols].name, "value");
strcpy(pSchema[cols].name, "value");
pSchema[cols].bytes = pShow->bytes[cols];
cols++;
......@@ -823,4 +830,4 @@ static int32_t mndRetrieveDnodes(SMnodeMsg *pReq, SShowObj *pShow, char *data, i
static void mndCancelGetNextDnode(SMnode *pMnode, void *pIter) {
SSdb *pSdb = pMnode->pSdb;
sdbCancelFetch(pSdb, pIter);
}
\ No newline at end of file
}
source/dnode/mnode/impl/src/mndMnode.c
浏览文件 @ aa6e480e
......@@ -99,11 +99,15 @@ void mndUpdateMnodeRole(SMnode *pMnode) {
pIter = sdbFetch(pSdb, SDB_MNODE, pIter, (void **)&pObj);
if (pIter == NULL) break;
ESyncState lastRole = pObj->role;
if (pObj->id == 1) {
pObj->role = TAOS_SYNC_STATE_LEADER;
} else {
pObj->role = TAOS_SYNC_STATE_CANDIDATE;
}
if (pObj->role != lastRole) {
pObj->roleTime = taosGetTimestampMs();
}
sdbRelease(pSdb, pObj);
}
......
source/dnode/mnode/impl/src/mndProfile.c
浏览文件 @ aa6e480e
......@@ -48,7 +48,7 @@ static SConnObj *mndCreateConn(SMnode *pMnode, SRpcConnInfo *pInfo, int32_t pid,
static void mndFreeConn(SConnObj *pConn);
static SConnObj *mndAcquireConn(SMnode *pMnode, int32_t connId);
static void mndReleaseConn(SMnode *pMnode, SConnObj *pConn);
static void *mndGetNextConn(SMnode *pMnode, void *pIter, SConnObj **pConn);
static void *mndGetNextConn(SMnode *pMnode, SCacheIter *pIter);
static void mndCancelGetNextConn(SMnode *pMnode, void *pIter);
static int32_t mndProcessHeartBeatReq(SMnodeMsg *pReq);
static int32_t mndProcessConnectReq(SMnodeMsg *pReq);
......@@ -158,27 +158,23 @@ static void mndReleaseConn(SMnode *pMnode, SConnObj *pConn) {
taosCacheRelease(pMgmt->cache, (void **)&pConn, false);
}
static void *mndGetNextConn(SMnode *pMnode, void *pIter, SConnObj **pConn) {
SProfileMgmt *pMgmt = &pMnode->profileMgmt;
*pConn = NULL;
pIter = taosHashIterate(pMgmt->cache->pHashTable, pIter);
if (pIter == NULL) return NULL;
SCacheDataNode **pNode = pIter;
if (pNode == NULL || *pNode == NULL) {
taosHashCancelIterate(pMgmt->cache->pHashTable, pIter);
return NULL;
void *mndGetNextConn(SMnode *pMnode, SCacheIter *pIter) {
SConnObj* pConn = NULL;
bool hasNext = taosCacheIterNext(pIter);
if (hasNext) {
size_t dataLen = 0;
pConn = taosCacheIterGetData(pIter, &dataLen);
} else {
taosCacheDestroyIter(pIter);
}
*pConn = (SConnObj *)((*pNode)->data);
return pIter;
return pConn;
}
static void mndCancelGetNextConn(SMnode *pMnode, void *pIter) {
SProfileMgmt *pMgmt = &pMnode->profileMgmt;
taosHashCancelIterate(pMgmt->cache->pHashTable, pIter);
if (pIter != NULL) {
taosCacheDestroyIter(pIter);
}
}
static int32_t mndProcessConnectReq(SMnodeMsg *pReq) {
......@@ -376,8 +372,8 @@ static int32_t mndProcessHeartBeatReq(SMnodeMsg *pReq) {
int32_t rspLen = 0;
mndValidateDbInfo(pMnode, kv->value, kv->valueLen / sizeof(SDbVgVersion), &rspMsg, &rspLen);
if (rspMsg && rspLen > 0) {
SKv kv = {.key = HEARTBEAT_KEY_DBINFO, .valueLen = rspLen, .value = rspMsg};
taosArrayPush(hbRsp.info, &kv);
SKv kv1 = {.key = HEARTBEAT_KEY_DBINFO, .valueLen = rspLen, .value = rspMsg};
taosArrayPush(hbRsp.info, &kv1);
}
break;
}
......@@ -386,8 +382,8 @@ static int32_t mndProcessHeartBeatReq(SMnodeMsg *pReq) {
int32_t rspLen = 0;
mndValidateStbInfo(pMnode, kv->value, kv->valueLen / sizeof(SSTableMetaVersion), &rspMsg, &rspLen);
if (rspMsg && rspLen > 0) {
SKv kv = {.key = HEARTBEAT_KEY_STBINFO, .valueLen = rspLen, .value = rspMsg};
taosArrayPush(hbRsp.info, &kv);
SKv kv1 = {.key = HEARTBEAT_KEY_STBINFO, .valueLen = rspLen, .value = rspMsg};
taosArrayPush(hbRsp.info, &kv1);
}
break;
}
......@@ -638,7 +634,7 @@ static int32_t mndGetConnsMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp *
pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
}
pShow->numOfRows = taosHashGetSize(pMgmt->cache->pHashTable);
pShow->numOfRows = taosCacheGetNumOfObj(pMgmt->cache);
pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
strcpy(pMeta->tbName, mndShowStr(pShow->type));
......@@ -653,8 +649,13 @@ static int32_t mndRetrieveConns(SMnodeMsg *pReq, SShowObj *pShow, char *data, in
char *pWrite;
char ipStr[TSDB_IPv4ADDR_LEN + 6];
if (pShow->pIter == NULL) {
SProfileMgmt *pMgmt = &pMnode->profileMgmt;
pShow->pIter = taosCacheCreateIter(pMgmt->cache);
}
while (numOfRows < rows) {
pShow->pIter = mndGetNextConn(pMnode, pShow->pIter, &pConn);
pConn = mndGetNextConn(pMnode, pShow->pIter);
if (pConn == NULL) break;
cols = 0;
......@@ -823,19 +824,24 @@ static int32_t mndRetrieveQueries(SMnodeMsg *pReq, SShowObj *pShow, char *data,
void *pIter;
char str[TSDB_IPv4ADDR_LEN + 6] = {0};
if (pShow->pIter == NULL) {
SProfileMgmt *pMgmt = &pMnode->profileMgmt;
pShow->pIter = taosCacheCreateIter(pMgmt->cache);
}
while (numOfRows < rows) {
pIter = mndGetNextConn(pMnode, pShow->pIter, &pConn);
pConn = mndGetNextConn(pMnode, pShow->pIter);
if (pConn == NULL) {
pShow->pIter = pIter;
pShow->pIter = NULL;
break;
}
if (numOfRows + pConn->numOfQueries >= rows) {
mndCancelGetNextConn(pMnode, pIter);
taosCacheDestroyIter(pShow->pIter);
pShow->pIter = NULL;
break;
}
pShow->pIter = pIter;
for (int32_t i = 0; i < pConn->numOfQueries; ++i) {
SQueryDesc *pDesc = pConn->pQueries + i;
cols = 0;
......@@ -913,6 +919,12 @@ static int32_t mndRetrieveQueries(SMnodeMsg *pReq, SShowObj *pShow, char *data,
}
static void mndCancelGetNextQuery(SMnode *pMnode, void *pIter) {
SProfileMgmt *pMgmt = &pMnode->profileMgmt;
taosHashCancelIterate(pMgmt->cache->pHashTable, pIter);
if (pIter != NULL) {
taosCacheDestroyIter(pIter);
}
}
int32_t mndGetNumOfConnections(SMnode *pMnode) {
SProfileMgmt *pMgmt = &pMnode->profileMgmt;
return taosCacheGetNumOfObj(pMgmt->cache);
}
\ No newline at end of file
source/dnode/mnode/impl/src/mndScheduler.c 0 → 100644
浏览文件 @ aa6e480e
/*
* 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/>.
*/
#include "mndScheduler.h"
#include "mndConsumer.h"
#include "mndDb.h"
#include "mndDnode.h"
#include "mndMnode.h"
#include "mndOffset.h"
#include "mndShow.h"
#include "mndStb.h"
#include "mndSubscribe.h"
#include "mndTopic.h"
#include "mndTrans.h"
#include "mndUser.h"
#include "mndVgroup.h"
#include "tcompare.h"
#include "tname.h"
int32_t mndSchedInitSubEp(SMnode* pMnode, const SMqTopicObj* pTopic, SMqSubscribeObj* pSub) {
SSdb* pSdb = pMnode->pSdb;
SVgObj* pVgroup = NULL;
SQueryDag* pDag = qStringToDag(pTopic->physicalPlan);
if (pDag == NULL) {
terrno = TSDB_CODE_QRY_INVALID_INPUT;
return -1;
}
ASSERT(pSub->vgNum == 0);
int32_t levelNum = taosArrayGetSize(pDag->pSubplans);
if (levelNum != 1) {
qDestroyQueryDag(pDag);
terrno = TSDB_CODE_MND_UNSUPPORTED_TOPIC;
return -1;
}
SArray* plans = taosArrayGetP(pDag->pSubplans, 0);
int32_t opNum = taosArrayGetSize(plans);
if (opNum != 1) {
qDestroyQueryDag(pDag);
terrno = TSDB_CODE_MND_UNSUPPORTED_TOPIC;
return -1;
}
SSubplan* plan = taosArrayGetP(plans, 0);
void* pIter = NULL;
while (1) {
pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void**)&pVgroup);
if (pIter == NULL) break;
if (pVgroup->dbUid != pTopic->dbUid) {
sdbRelease(pSdb, pVgroup);
continue;
}
pSub->vgNum++;
plan->execNode.nodeId = pVgroup->vgId;
plan->execNode.epSet = mndGetVgroupEpset(pMnode, pVgroup);
SMqConsumerEp consumerEp = {0};
consumerEp.status = 0;
consumerEp.consumerId = -1;
consumerEp.epSet = plan->execNode.epSet;
consumerEp.vgId = plan->execNode.nodeId;
int32_t msgLen;
if (qSubPlanToString(plan, &consumerEp.qmsg, &msgLen) < 0) {
sdbRelease(pSdb, pVgroup);
qDestroyQueryDag(pDag);
terrno = TSDB_CODE_QRY_INVALID_INPUT;
return -1;
}
taosArrayPush(pSub->unassignedVg, &consumerEp);
}
qDestroyQueryDag(pDag);
return 0;
}
source/dnode/mnode/impl/src/mndSubscribe.c
浏览文件 @ aa6e480e
......@@ -20,6 +20,7 @@
#include "mndDnode.h"
#include "mndMnode.h"
#include "mndOffset.h"
#include "mndScheduler.h"
#include "mndShow.h"
#include "mndStb.h"
#include "mndTopic.h"
......@@ -39,7 +40,7 @@ enum {
MQ_SUBSCRIBE_STATUS__DELETED,
};
static char *mndMakeSubscribeKey(const char *cgroup, const char *topicName);
static int32_t mndMakeSubscribeKey(char *key, const char *cgroup, const char *topicName);
static SSdbRaw *mndSubActionEncode(SMqSubscribeObj *);
static SSdbRow *mndSubActionDecode(SSdbRaw *pRaw);
......@@ -87,22 +88,24 @@ static SMqSubscribeObj *mndCreateSubscription(SMnode *pMnode, const SMqTopicObj
terrno = TSDB_CODE_OUT_OF_MEMORY;
return NULL;
}
char *key = mndMakeSubscribeKey(cgroup, pTopic->name);
if (key == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
char key[TSDB_SUBSCRIBE_KEY_LEN];
mndMakeSubscribeKey(key, cgroup, pTopic->name);
strcpy(pSub->key, key);
if (mndSchedInitSubEp(pMnode, pTopic, pSub) < 0) {
tDeleteSMqSubscribeObj(pSub);
free(pSub);
return NULL;
}
strcpy(pSub->key, key);
free(key);
#if 0
if (mndInitUnassignedVg(pMnode, pTopic, pSub) < 0) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
tDeleteSMqSubscribeObj(pSub);
free(pSub);
return NULL;
}
#endif
// TODO: disable alter subscribed table
return pSub;
}
......@@ -291,7 +294,11 @@ static int32_t mndProcessGetSubEpReq(SMnodeMsg *pMsg) {
for (int32_t k = 0; k < vgsz; k++) {
char offsetKey[TSDB_PARTITION_KEY_LEN];
SMqConsumerEp *pConsumerEp = taosArrayGet(pSubConsumer->vgInfo, k);
SMqSubVgEp vgEp = {.epSet = pConsumerEp->epSet, .vgId = pConsumerEp->vgId, .offset = -1};
SMqSubVgEp vgEp = {
.epSet = pConsumerEp->epSet,
.vgId = pConsumerEp->vgId,
.offset = -1,
};
mndMakePartitionKey(offsetKey, pConsumer->cgroup, topicName, pConsumerEp->vgId);
SMqOffsetObj *pOffsetObj = mndAcquireOffset(pMnode, offsetKey);
if (pOffsetObj != NULL) {
......@@ -325,15 +332,14 @@ static int32_t mndProcessGetSubEpReq(SMnodeMsg *pMsg) {
return 0;
}
static int32_t mndSplitSubscribeKey(char *key, char **topic, char **cgroup) {
static int32_t mndSplitSubscribeKey(const char *key, char *topic, char *cgroup) {
int32_t i = 0;
while (key[i] != ':') {
while (key[i] != TMQ_SEPARATOR) {
i++;
}
key[i] = 0;
*cgroup = strdup(key);
key[i] = ':';
*topic = strdup(&key[i + 1]);
memcpy(topic, key, i - 1);
topic[i] = 0;
strcpy(cgroup, &key[i + 1]);
return 0;
}
......@@ -342,7 +348,7 @@ static SMqRebSubscribe *mndGetOrCreateRebSub(SHashObj *pHash, const char *key) {
if (pRebSub == NULL) {
pRebSub = tNewSMqRebSubscribe(key);
if (pRebSub == NULL) {
// TODO
terrno = TSDB_CODE_OUT_OF_MEMORY;
return NULL;
}
taosHashPut(pHash, key, strlen(key), pRebSub, sizeof(SMqRebSubscribe));
......@@ -369,8 +375,9 @@ static int32_t mndProcessMqTimerMsg(SMnodeMsg *pMsg) {
// get all topics of that topic
int32_t sz = taosArrayGetSize(pConsumer->currentTopics);
for (int32_t i = 0; i < sz; i++) {
char *topic = taosArrayGetP(pConsumer->currentTopics, i);
char *key = mndMakeSubscribeKey(pConsumer->cgroup, topic);
char *topic = taosArrayGetP(pConsumer->currentTopics, i);
char key[TSDB_SUBSCRIBE_KEY_LEN];
mndMakeSubscribeKey(key, pConsumer->cgroup, topic);
SMqRebSubscribe *pRebSub = mndGetOrCreateRebSub(pRebMsg->rebSubHash, key);
taosArrayPush(pRebSub->lostConsumers, &pConsumer->consumerId);
}
......@@ -386,8 +393,9 @@ static int32_t mndProcessMqTimerMsg(SMnodeMsg *pMsg) {
}
int32_t sz = taosArrayGetSize(rebSubs);
for (int32_t i = 0; i < sz; i++) {
char *topic = taosArrayGetP(rebSubs, i);
char *key = mndMakeSubscribeKey(pConsumer->cgroup, topic);
char *topic = taosArrayGetP(rebSubs, i);
char key[TSDB_SUBSCRIBE_KEY_LEN];
mndMakeSubscribeKey(key, pConsumer->cgroup, topic);
SMqRebSubscribe *pRebSub = mndGetOrCreateRebSub(pRebMsg->rebSubHash, key);
if (status == MQ_CONSUMER_STATUS__INIT) {
taosArrayPush(pRebSub->newConsumers, &pConsumer->consumerId);
......@@ -407,7 +415,11 @@ static int32_t mndProcessMqTimerMsg(SMnodeMsg *pMsg) {
}
if (taosHashGetSize(pRebMsg->rebSubHash) != 0) {
mInfo("mq rebalance will be triggered");
SRpcMsg rpcMsg = {.msgType = TDMT_MND_MQ_DO_REBALANCE, .pCont = pRebMsg, .contLen = sizeof(SMqDoRebalanceMsg)};
SRpcMsg rpcMsg = {
.msgType = TDMT_MND_MQ_DO_REBALANCE,
.pCont = pRebMsg,
.contLen = sizeof(SMqDoRebalanceMsg),
};
pMnode->putReqToMWriteQFp(pMnode->pDnode, &rpcMsg);
} else {
taosHashCleanup(pRebMsg->rebSubHash);
......@@ -520,9 +532,9 @@ static int32_t mndProcessDoRebalanceMsg(SMnodeMsg *pMsg) {
taosArrayPush(pSubConsumer->vgInfo, pConsumerEp);
if (pConsumerEp->oldConsumerId == -1) {
char *topic;
char *cgroup;
mndSplitSubscribeKey(pSub->key, &topic, &cgroup);
char topic[TSDB_TOPIC_FNAME_LEN];
char cgroup[TSDB_CGROUP_LEN];
mndSplitSubscribeKey(pSub->key, topic, cgroup);
SMqTopicObj *pTopic = mndAcquireTopic(pMnode, topic);
mInfo("mq set conn: assign vgroup %d of topic %s to consumer %ld", pConsumerEp->vgId, topic,
......@@ -530,8 +542,6 @@ static int32_t mndProcessDoRebalanceMsg(SMnodeMsg *pMsg) {
mndPersistMqSetConnReq(pMnode, pTrans, pTopic, cgroup, pConsumerEp);
mndReleaseTopic(pMnode, pTopic);
free(topic);
free(cgroup);
} else {
mInfo("mq rebalance: assign vgroup %d, from consumer %ld to consumer %ld", pConsumerEp->vgId,
pConsumerEp->oldConsumerId, pConsumerEp->consumerId);
......@@ -759,6 +769,7 @@ static int32_t mndProcessDoRebalanceMsg(SMnodeMsg *pMsg) {
}
#endif
#if 0
static int32_t mndInitUnassignedVg(SMnode *pMnode, const SMqTopicObj *pTopic, SMqSubscribeObj *pSub) {
SSdb *pSdb = pMnode->pSdb;
SVgObj *pVgroup = NULL;
......@@ -804,6 +815,7 @@ static int32_t mndInitUnassignedVg(SMnode *pMnode, const SMqTopicObj *pTopic, SM
/*qDestroyQueryDag(pDag);*/
return 0;
}
#endif
static int32_t mndPersistMqSetConnReq(SMnode *pMnode, STrans *pTrans, const SMqTopicObj *pTopic, const char *cgroup,
const SMqConsumerEp *pConsumerEp) {
......@@ -949,23 +961,19 @@ static int32_t mndSubActionUpdate(SSdb *pSdb, SMqSubscribeObj *pOldSub, SMqSubsc
return 0;
}
static char *mndMakeSubscribeKey(const char *cgroup, const char *topicName) {
char *key = malloc(TSDB_SHOW_SUBQUERY_LEN);
if (key == NULL) {
return NULL;
}
static int32_t mndMakeSubscribeKey(char *key, const char *cgroup, const char *topicName) {
int32_t tlen = strlen(cgroup);
memcpy(key, cgroup, tlen);
key[tlen] = ':';
key[tlen] = TMQ_SEPARATOR;
strcpy(key + tlen + 1, topicName);
return key;
return 0;
}
SMqSubscribeObj *mndAcquireSubscribe(SMnode *pMnode, const char *cgroup, const char *topicName) {
SSdb *pSdb = pMnode->pSdb;
char *key = mndMakeSubscribeKey(cgroup, topicName);
SSdb *pSdb = pMnode->pSdb;
char key[TSDB_SUBSCRIBE_KEY_LEN];
mndMakeSubscribeKey(key, cgroup, topicName);
SMqSubscribeObj *pSub = sdbAcquire(pSdb, SDB_SUBSCRIBE, key);
free(key);
if (pSub == NULL) {
terrno = TSDB_CODE_MND_SUBSCRIBE_NOT_EXIST;
}
......
source/dnode/mnode/impl/src/mndTelem.c
浏览文件 @ aa6e480e
......@@ -18,15 +18,15 @@
#include "mndCluster.h"
#include "mndSync.h"
#include "tbuffer.h"
#include "tjson.h"
#include "thttp.h"
#include "tjson.h"
#define TELEMETRY_SERVER "telemetry.taosdata.com"
#define TELEMETRY_PORT 80
static void mndBuildRuntimeInfo(SMnode* pMnode, SJson* pJson) {
SMnodeLoad load = {0};
if (mndGetLoad(pMnode, &load) != 0) return;
mndGetLoad(pMnode, &load);
tjsonAddDoubleToObject(pJson, "numOfDnode", load.numOfDnode);
tjsonAddDoubleToObject(pJson, "numOfMnode", load.numOfMnode);
......@@ -52,23 +52,20 @@ static char* mndBuildTelemetryReport(SMnode* pMnode) {
tjsonAddStringToObject(pJson, "instanceId", clusterName);
tjsonAddDoubleToObject(pJson, "reportVersion", 1);
if (taosGetOsReleaseName(tmp, sizeof(tmp))) {
if (taosGetOsReleaseName(tmp, sizeof(tmp)) == 0) {
tjsonAddStringToObject(pJson, "os", tmp);
}
int32_t numOfCores = 0;
if (taosGetCpuInfo(tmp, sizeof(tmp), &numOfCores)) {
float numOfCores = 0;
if (taosGetCpuInfo(tmp, sizeof(tmp), &numOfCores) == 0) {
tjsonAddStringToObject(pJson, "cpuModel", tmp);
tjsonAddDoubleToObject(pJson, "numOfCpu", numOfCores);
} else {
tjsonAddDoubleToObject(pJson, "numOfCpu", taosGetCpuCores());
tjsonAddDoubleToObject(pJson, "numOfCpu", tsNumOfCores);
}
uint64_t memoryKB = 0;
if (taosGetTotalSysMemoryKB(&memoryKB)) {
snprintf(tmp, sizeof(tmp), "%" PRIu64 " kB", memoryKB);
tjsonAddStringToObject(pJson, "memory", tmp);
}
snprintf(tmp, sizeof(tmp), "%" PRId64 " kB", tsTotalMemoryKB);
tjsonAddStringToObject(pJson, "memory", tmp);
tjsonAddStringToObject(pJson, "version", version);
tjsonAddStringToObject(pJson, "buildInfo", buildinfo);
......@@ -90,7 +87,7 @@ static int32_t mndProcessTelemTimer(SMnodeMsg* pReq) {
taosWLockLatch(&pMgmt->lock);
char* pCont = mndBuildTelemetryReport(pMnode);
if (pCont != NULL) {
taosSendHttpReport(TELEMETRY_SERVER, TELEMETRY_PORT, pCont, strlen(pCont));
taosSendHttpReport(TELEMETRY_SERVER, TELEMETRY_PORT, pCont, strlen(pCont), HTTP_FLAT);
free(pCont);
}
taosWUnLockLatch(&pMgmt->lock);
......
source/dnode/mnode/impl/src/mnode.c
浏览文件 @ aa6e480e
......@@ -96,7 +96,11 @@ static void mndCalMqRebalance(void *param, void *tmrId) {
if (mndIsMaster(pMnode)) {
int32_t contLen = 0;
void *pReq = mndBuildTimerMsg(&contLen);
SRpcMsg rpcMsg = {.msgType = TDMT_MND_MQ_TIMER, .pCont = pReq, .contLen = contLen};
SRpcMsg rpcMsg = {
.msgType = TDMT_MND_MQ_TIMER,
.pCont = pReq,
.contLen = contLen,
};
pMnode->putReqToMReadQFp(pMnode->pDnode, &rpcMsg);
}
......@@ -359,6 +363,7 @@ SMnode *mndOpen(const char *path, const SMnodeOpt *pOption) {
return NULL;
}
mndUpdateMnodeRole(pMnode);
mDebug("mnode open successfully ");
return pMnode;
}
......@@ -385,26 +390,6 @@ void mndDestroy(const char *path) {
mDebug("mnode is destroyed");
}
int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad) {
pLoad->numOfDnode = 0;
pLoad->numOfMnode = 0;
pLoad->numOfVgroup = 0;
pLoad->numOfDatabase = 0;
pLoad->numOfSuperTable = 0;
pLoad->numOfChildTable = 0;
pLoad->numOfColumn = 0;
pLoad->totalPoints = 0;
pLoad->totalStorage = 0;
pLoad->compStorage = 0;
return 0;
}
int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgroupInfo *pVgroupInfo,
SMonGrantInfo *pGrantInfo) {
return 0;
}
SMnodeMsg *mndInitMsg(SMnode *pMnode, SRpcMsg *pRpcMsg) {
SMnodeMsg *pMsg = taosAllocateQitem(sizeof(SMnodeMsg));
if (pMsg == NULL) {
......@@ -523,3 +508,131 @@ uint64_t mndGenerateUid(char *name, int32_t len) {
}
} while (true);
}
void mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad) {
memset(pLoad, 0, sizeof(SMnodeLoad));
SSdb *pSdb = pMnode->pSdb;
pLoad->numOfDnode = sdbGetSize(pSdb, SDB_DNODE);
pLoad->numOfMnode = sdbGetSize(pSdb, SDB_MNODE);
pLoad->numOfVgroup = sdbGetSize(pSdb, SDB_VGROUP);
pLoad->numOfDatabase = sdbGetSize(pSdb, SDB_DB);
pLoad->numOfSuperTable = sdbGetSize(pSdb, SDB_STB);
void *pIter = NULL;
while (1) {
SVgObj *pVgroup = NULL;
pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup);
if (pIter == NULL) break;
pLoad->numOfChildTable += pVgroup->numOfTables;
pLoad->numOfColumn += pVgroup->numOfTimeSeries;
pLoad->totalPoints += pVgroup->pointsWritten;
pLoad->totalStorage += pVgroup->totalStorage;
pLoad->compStorage += pVgroup->compStorage;
sdbRelease(pSdb, pVgroup);
}
}
int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgroupInfo *pVgroupInfo,
SMonGrantInfo *pGrantInfo) {
if (!mndIsMaster(pMnode)) return -1;
SSdb *pSdb = pMnode->pSdb;
int64_t ms = taosGetTimestampMs();
pClusterInfo->dnodes = taosArrayInit(sdbGetSize(pSdb, SDB_DNODE), sizeof(SMonDnodeDesc));
pClusterInfo->mnodes = taosArrayInit(sdbGetSize(pSdb, SDB_MNODE), sizeof(SMonMnodeDesc));
pVgroupInfo->vgroups = taosArrayInit(sdbGetSize(pSdb, SDB_VGROUP), sizeof(SMonVgroupDesc));
if (pClusterInfo->dnodes == NULL || pClusterInfo->mnodes == NULL || pVgroupInfo->vgroups == NULL) {
return -1;
}
// cluster info
tstrncpy(pClusterInfo->version, version, sizeof(pClusterInfo->version));
pClusterInfo->monitor_interval = tsMonitorInterval;
pClusterInfo->connections_total = mndGetNumOfConnections(pMnode);
void *pIter = NULL;
while (1) {
SDnodeObj *pObj = NULL;
pIter = sdbFetch(pSdb, SDB_DNODE, pIter, (void **)&pObj);
if (pIter == NULL) break;
SMonDnodeDesc desc = {0};
desc.dnode_id = pObj->id;
tstrncpy(desc.dnode_ep, pObj->ep, sizeof(desc.dnode_ep));
if (mndIsDnodeOnline(pMnode, pObj, ms)) {
tstrncpy(desc.status, "ready", sizeof(desc.status));
} else {
tstrncpy(desc.status, "offline", sizeof(desc.status));
}
taosArrayPush(pClusterInfo->dnodes, &desc);
sdbRelease(pSdb, pObj);
}
pIter = NULL;
while (1) {
SMnodeObj *pObj = NULL;
pIter = sdbFetch(pSdb, SDB_MNODE, pIter, (void **)&pObj);
if (pIter == NULL) break;
SMonMnodeDesc desc = {0};
desc.mnode_id = pObj->id;
tstrncpy(desc.mnode_ep, pObj->pDnode->ep, sizeof(desc.mnode_ep));
tstrncpy(desc.role, mndGetRoleStr(pObj->role), sizeof(desc.role));
taosArrayPush(pClusterInfo->mnodes, &desc);
sdbRelease(pSdb, pObj);
if (pObj->role == TAOS_SYNC_STATE_LEADER) {
pClusterInfo->first_ep_dnode_id = pObj->id;
tstrncpy(pClusterInfo->first_ep, pObj->pDnode->ep, sizeof(pClusterInfo->first_ep));
pClusterInfo->master_uptime = (ms - pObj->roleTime) / (86400000.0f);
}
}
// vgroup info
pIter = NULL;
while (1) {
SVgObj *pVgroup = NULL;
pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup);
if (pIter == NULL) break;
pClusterInfo->vgroups_total++;
SMonVgroupDesc desc = {0};
desc.vgroup_id = pVgroup->vgId;
strncpy(desc.database_name, pVgroup->dbName, sizeof(desc.database_name));
desc.tables_num = pVgroup->numOfTables;
pGrantInfo->timeseries_used += pVgroup->numOfTimeSeries;
tstrncpy(desc.status, "unsynced", sizeof(desc.status));
for (int32_t i = 0; i < pVgroup->replica; ++i) {
SVnodeGid *pVgid = &pVgroup->vnodeGid[i];
SMonVnodeDesc *pVnDesc = &desc.vnodes[i];
pVnDesc->dnode_id = pVgid->dnodeId;
tstrncpy(pVnDesc->vnode_role, mndGetRoleStr(pVgid->role), sizeof(pVnDesc->vnode_role));
if (pVgid->role == TAOS_SYNC_STATE_LEADER) {
tstrncpy(desc.status, "ready", sizeof(desc.status));
pClusterInfo->vgroups_alive++;
}
if (pVgid->role == TAOS_SYNC_STATE_LEADER || pVgid->role == TAOS_SYNC_STATE_CANDIDATE) {
pClusterInfo->vnodes_alive++;
}
pClusterInfo->vnodes_total++;
}
taosArrayPush(pVgroupInfo->vgroups, &desc);
sdbRelease(pSdb, pVgroup);
}
// grant info
pGrantInfo->expire_time = (pMnode->grant.expireTimeMS - ms) / 86400000.0f;
pGrantInfo->timeseries_total = pMnode->grant.timeseriesAllowed;
if (pMnode->grant.expireTimeMS == 0) {
pGrantInfo->expire_time = INT32_MAX;
pGrantInfo->timeseries_total = INT32_MAX;
}
return 0;
}
source/dnode/mnode/impl/test/db/db.cpp
浏览文件 @ aa6e480e
......@@ -292,9 +292,9 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
EXPECT_GT(pInfo->vgId, 0);
EXPECT_EQ(pInfo->hashBegin, 0);
EXPECT_EQ(pInfo->hashEnd, UINT32_MAX / 2 - 1);
EXPECT_EQ(pInfo->epset.inUse, 0);
EXPECT_EQ(pInfo->epset.numOfEps, 1);
SEp* pAddr = &pInfo->epset.eps[0];
EXPECT_EQ(pInfo->epSet.inUse, 0);
EXPECT_EQ(pInfo->epSet.numOfEps, 1);
SEp* pAddr = &pInfo->epSet.eps[0];
EXPECT_EQ(pAddr->port, 9030);
EXPECT_STREQ(pAddr->fqdn, "localhost");
}
......@@ -307,9 +307,9 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
EXPECT_GT(pInfo->vgId, 0);
EXPECT_EQ(pInfo->hashBegin, UINT32_MAX / 2);
EXPECT_EQ(pInfo->hashEnd, UINT32_MAX);
EXPECT_EQ(pInfo->epset.inUse, 0);
EXPECT_EQ(pInfo->epset.numOfEps, 1);
SEp* pAddr = &pInfo->epset.eps[0];
EXPECT_EQ(pInfo->epSet.inUse, 0);
EXPECT_EQ(pInfo->epSet.numOfEps, 1);
SEp* pAddr = &pInfo->epSet.eps[0];
EXPECT_EQ(pAddr->port, 9030);
EXPECT_STREQ(pAddr->fqdn, "localhost");
}
......
source/dnode/mnode/sdb/inc/sdbInt.h
浏览文件 @ aa6e480e
......@@ -28,12 +28,12 @@
extern "C" {
#endif
#define mFatal(...) { if (mDebugFlag & DEBUG_FATAL) { taosPrintLog("MND FATAL ", 255, __VA_ARGS__); }}
#define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("MND ERROR ", 255, __VA_ARGS__); }}
#define mWarn(...) { if (mDebugFlag & DEBUG_WARN) { taosPrintLog("MND WARN ", 255, __VA_ARGS__); }}
#define mInfo(...) { if (mDebugFlag & DEBUG_INFO) { taosPrintLog("MND ", 255, __VA_ARGS__); }}
#define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }}
#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }}
#define mFatal(...) { if (mDebugFlag & DEBUG_FATAL) { taosPrintLog("MND FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); }}
#define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("MND ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); }}
#define mWarn(...) { if (mDebugFlag & DEBUG_WARN) { taosPrintLog("MND WARN ", DEBUG_WARN, 255, __VA_ARGS__); }}
#define mInfo(...) { if (mDebugFlag & DEBUG_INFO) { taosPrintLog("MND ", DEBUG_INFO, 255, __VA_ARGS__); }}
#define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ", DEBUG_DEBUG, mDebugFlag, __VA_ARGS__); }}
#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", DEBUG_TRACE, mDebugFlag, __VA_ARGS__); }}
#define SDB_MAX_SIZE (32 * 1024)
......
source/dnode/snode/src/snode.c
浏览文件 @ aa6e480e
......@@ -17,6 +17,7 @@
SSnode *sndOpen(const char *path, const SSnodeOpt *pOption) {
SSnode *pSnode = calloc(1, sizeof(SSnode));
memcpy(&pSnode->cfg, pOption, sizeof(SSnodeOpt));
return pSnode;
}
......@@ -29,4 +30,4 @@ int32_t sndProcessMsg(SSnode *pSnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
return 0;
}
void sndDestroy(const char *path) {}
\ No newline at end of file
void sndDestroy(const char *path) {}
source/dnode/vnode/CMakeLists.txt
浏览文件 @ aa6e480e
......@@ -54,5 +54,5 @@ elseif(${META_DB_IMPL} STREQUAL "TDB")
endif()
if(${BUILD_TEST})
# add_subdirectory(test)
add_subdirectory(test)
endif(${BUILD_TEST})
source/dnode/vnode/inc/meta.h
浏览文件 @ aa6e480e
......@@ -24,8 +24,8 @@
extern "C" {
#endif
#define META_SUPER_TABLE TD_SUPER_TABLE
#define META_CHILD_TABLE TD_CHILD_TABLE
#define META_SUPER_TABLE TD_SUPER_TABLE
#define META_CHILD_TABLE TD_CHILD_TABLE
#define META_NORMAL_TABLE TD_NORMAL_TABLE
// Types exported
......@@ -38,22 +38,29 @@ typedef struct SMetaCfg {
typedef struct SMTbCursor SMTbCursor;
typedef struct SMCtbCursor SMCtbCursor;
typedef struct SMSmaCursor SMSmaCursor;
typedef SVCreateTbReq STbCfg;
typedef SVCreateTbReq STbCfg;
typedef SVCreateTSmaReq SSmaCfg;
// SMeta operations
SMeta *metaOpen(const char *path, const SMetaCfg *pMetaCfg, SMemAllocatorFactory *pMAF);
void metaClose(SMeta *pMeta);
void metaRemove(const char *path);
int metaCreateTable(SMeta *pMeta, STbCfg *pTbCfg);
int metaDropTable(SMeta *pMeta, tb_uid_t uid);
int metaCommit(SMeta *pMeta);
SMeta * metaOpen(const char *path, const SMetaCfg *pMetaCfg, SMemAllocatorFactory *pMAF);
void metaClose(SMeta *pMeta);
void metaRemove(const char *path);
int metaCreateTable(SMeta *pMeta, STbCfg *pTbCfg);
int metaDropTable(SMeta *pMeta, tb_uid_t uid);
int metaCommit(SMeta *pMeta);
int32_t metaCreateTSma(SMeta *pMeta, SSmaCfg *pCfg);
int32_t metaDropTSma(SMeta *pMeta, char *indexName);
// For Query
STbCfg * metaGetTbInfoByUid(SMeta *pMeta, tb_uid_t uid);
STbCfg * metaGetTbInfoByName(SMeta *pMeta, char *tbname, tb_uid_t *uid);
SSchemaWrapper *metaGetTableSchema(SMeta *pMeta, tb_uid_t uid, int32_t sver, bool isinline);
STSchema * metaGetTbTSchema(SMeta *pMeta, tb_uid_t uid, int32_t sver);
STSma * metaGetSmaInfoByName(SMeta *pMeta, const char *indexName);
STSmaWrapper * metaGetSmaInfoByUid(SMeta *pMeta, tb_uid_t uid);
SArray * metaGetSmaTbUids(SMeta *pMeta, bool isDup);
SMTbCursor *metaOpenTbCursor(SMeta *pMeta);
void metaCloseTbCursor(SMTbCursor *pTbCur);
......@@ -63,6 +70,10 @@ SMCtbCursor *metaOpenCtbCursor(SMeta *pMeta, tb_uid_t uid);
void metaCloseCtbCurosr(SMCtbCursor *pCtbCur);
tb_uid_t metaCtbCursorNext(SMCtbCursor *pCtbCur);
SMSmaCursor *metaOpenSmaCursor(SMeta *pMeta, tb_uid_t uid);
void metaCloseSmaCurosr(SMSmaCursor *pSmaCur);
const char * metaSmaCursorNext(SMSmaCursor *pSmaCur);
// Options
void metaOptionsInit(SMetaCfg *pMetaCfg);
void metaOptionsClear(SMetaCfg *pMetaCfg);
......
source/dnode/vnode/inc/tq.h
浏览文件 @ aa6e480e
......@@ -13,16 +13,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _TD_TQ_H_
#define _TD_TQ_H_
#ifndef _TQ_H_
#define _TQ_H_
#include "tcommon.h"
#include "executor.h"
#include "tmallocator.h"
#include "meta.h"
#include "scheduler.h"
#include "taoserror.h"
#include "tlist.h"
#include "tcommon.h"
#include "tmallocator.h"
#include "tmsg.h"
#include "trpc.h"
#include "ttimer.h"
......@@ -54,7 +52,7 @@ void tqClose(STQ*);
int tqPushMsg(STQ*, void* msg, tmsg_t msgType, int64_t version);
int tqCommit(STQ*);
int32_t tqProcessConsumeReq(STQ* pTq, SRpcMsg* pMsg);
int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg);
int32_t tqProcessSetConnReq(STQ* pTq, char* msg);
int32_t tqProcessRebReq(STQ* pTq, char* msg);
......@@ -62,4 +60,4 @@ int32_t tqProcessRebReq(STQ* pTq, char* msg);
}
#endif
#endif /*_TD_TQ_H_*/
#endif /*_TQ_H_*/
source/dnode/vnode/inc/tsdb.h
浏览文件 @ aa6e480e
......@@ -87,6 +87,27 @@ int tsdbInsertData(STsdb *pTsdb, SSubmitReq *pMsg, SSubmitRsp *pRsp);
int tsdbPrepareCommit(STsdb *pTsdb);
int tsdbCommit(STsdb *pTsdb);
/**
* @brief Insert tSma(Time-range-wise SMA) data from stream computing engine
*
* @param pTsdb
* @param param
* @param pData
* @return int32_t
*/
int32_t tsdbInsertTSmaData(STsdb *pTsdb, STSma *param, STSmaData *pData);
/**
* @brief Insert RSma(Time-range-wise Rollup SMA) data.
*
* @param pTsdb
* @param param
* @param pData
* @return int32_t
*/
int32_t tsdbInsertRSmaData(STsdb *pTsdb, SRSma *param, STSmaData *pData);
// STsdbCfg
int tsdbOptionsInit(STsdbCfg *);
void tsdbOptionsClear(STsdbCfg *);
......
source/dnode/vnode/inc/vnode.h
浏览文件 @ aa6e480e
......@@ -59,7 +59,7 @@ typedef struct {
SWalCfg walCfg;
uint32_t hashBegin;
uint32_t hashEnd;
int8_t hashMethod;
int8_t hashMethod;
} SVnodeCfg;
typedef struct {
......@@ -202,6 +202,22 @@ int32_t vnodeGetLoad(SVnode *pVnode, SVnodeLoad *pLoad);
/* ------------------------- TQ READ --------------------------- */
enum {
TQ_STREAM_TOKEN__DATA = 1,
TQ_STREAM_TOKEN__WATERMARK,
TQ_STREAM_TOKEN__CHECKPOINT,
};
typedef struct {
int8_t type;
int8_t reserved[7];
union {
void *data;
int64_t wmTs;
int64_t checkpointId;
};
} STqStreamToken;
STqReadHandle *tqInitSubmitMsgScanner(SMeta *pMeta);
static FORCE_INLINE void tqReadHandleSetColIdList(STqReadHandle *pReadHandle, SArray *pColIdList) {
......@@ -213,6 +229,10 @@ static FORCE_INLINE void tqReadHandleSetColIdList(STqReadHandle *pReadHandle, SA
//}
static FORCE_INLINE int tqReadHandleSetTbUidList(STqReadHandle *pHandle, const SArray *tbUidList) {
if (pHandle->tbIdHash) {
taosHashClear(pHandle->tbIdHash);
}
pHandle->tbIdHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK);
if (pHandle->tbIdHash == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
......@@ -227,6 +247,23 @@ static FORCE_INLINE int tqReadHandleSetTbUidList(STqReadHandle *pHandle, const S
return 0;
}
static FORCE_INLINE int tqReadHandleAddTbUidList(STqReadHandle *pHandle, const SArray *tbUidList) {
if (pHandle->tbIdHash == NULL) {
pHandle->tbIdHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK);
if (pHandle->tbIdHash == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
return -1;
}
}
for (int i = 0; i < taosArrayGetSize(tbUidList); i++) {
int64_t *pKey = (int64_t *)taosArrayGet(tbUidList, i);
taosHashPut(pHandle->tbIdHash, pKey, sizeof(int64_t), NULL, 0);
}
return 0;
}
int32_t tqReadHandleSetMsg(STqReadHandle *pHandle, SSubmitReq *pMsg, int64_t ver);
bool tqNextDataBlock(STqReadHandle *pHandle);
int tqRetrieveDataBlockInfo(STqReadHandle *pHandle, SDataBlockInfo *pBlockInfo);
......
source/dnode/vnode/src/inc/metaDef.h
浏览文件 @ aa6e480e
......@@ -33,6 +33,8 @@ int metaOpenDB(SMeta* pMeta);
void metaCloseDB(SMeta* pMeta);
int metaSaveTableToDB(SMeta* pMeta, STbCfg* pTbCfg);
int metaRemoveTableFromDb(SMeta* pMeta, tb_uid_t uid);
int metaSaveSmaToDB(SMeta* pMeta, STSma* pTbCfg);
int metaRemoveSmaFromDb(SMeta* pMeta, const char* indexName);
// SMetaCache
int metaOpenCache(SMeta* pMeta);
......@@ -76,4 +78,4 @@ struct SMeta {
}
#endif
#endif /*_TD_META_DEF_H_*/
\ No newline at end of file
#endif /*_TD_META_DEF_H_*/
source/dnode/vnode/src/inc/tqInt.h
浏览文件 @ aa6e480e
......@@ -19,49 +19,52 @@
#include "meta.h"
#include "tlog.h"
#include "tq.h"
#include "trpc.h"
#include "tqPush.h"
#ifdef __cplusplus
extern "C" {
#endif
extern int32_t tqDebugFlag;
#define tqFatal(...) \
{ \
if (tqDebugFlag & DEBUG_FATAL) { \
taosPrintLog("TQ FATAL ", 255, __VA_ARGS__); \
} \
#define tqFatal(...) \
{ \
if (tqDebugFlag & DEBUG_FATAL) { \
taosPrintLog("TQ FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); \
} \
}
#define tqError(...) \
{ \
if (tqDebugFlag & DEBUG_ERROR) { \
taosPrintLog("TQ ERROR ", 255, __VA_ARGS__); \
} \
#define tqError(...) \
{ \
if (tqDebugFlag & DEBUG_ERROR) { \
taosPrintLog("TQ ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); \
} \
}
#define tqWarn(...) \
{ \
if (tqDebugFlag & DEBUG_WARN) { \
taosPrintLog("TQ WARN ", 255, __VA_ARGS__); \
} \
#define tqWarn(...) \
{ \
if (tqDebugFlag & DEBUG_WARN) { \
taosPrintLog("TQ WARN ", DEBUG_WARN, 255, __VA_ARGS__); \
} \
}
#define tqInfo(...) \
{ \
if (tqDebugFlag & DEBUG_INFO) { \
taosPrintLog("TQ ", 255, __VA_ARGS__); \
} \
#define tqInfo(...) \
{ \
if (tqDebugFlag & DEBUG_INFO) { \
taosPrintLog("TQ ", DEBUG_INFO, 255, __VA_ARGS__); \
} \
}
#define tqDebug(...) \
{ \
if (tqDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("TQ ", tqDebugFlag, __VA_ARGS__); \
} \
#define tqDebug(...) \
{ \
if (tqDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("TQ ", DEBUG_DEBUG, tqDebugFlag, __VA_ARGS__); \
} \
}
#define tqTrace(...) \
{ \
if (tqDebugFlag & DEBUG_TRACE) { \
taosPrintLog("TQ ", tqDebugFlag, __VA_ARGS__); \
} \
#define tqTrace(...) \
{ \
if (tqDebugFlag & DEBUG_TRACE) { \
taosPrintLog("TQ ", DEBUG_TRACE, tqDebugFlag, __VA_ARGS__); \
} \
}
#define TQ_BUFFER_SIZE 8
......@@ -140,9 +143,7 @@ typedef struct {
// topics that are not connectted
STqMetaList* unconnectTopic;
// TODO:temporaral use, to be replaced by unified tfile
TdFilePtr pFile;
// TODO:temporaral use, to be replaced by unified tfile
TdFilePtr pIdxFile;
char* dirPath;
......@@ -159,6 +160,7 @@ struct STQ {
STqCfg* tqConfig;
STqMemRef tqMemRef;
STqMetaStore* tqMeta;
STqPushMgr* tqPushMgr;
SWal* pWal;
SMeta* pVnodeMeta;
};
......
source/dnode/vnode/src/inc/tqPush.h 0 → 100644
浏览文件 @ aa6e480e
/*
* 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/>.
*/
#ifndef _TQ_PUSH_H_
#define _TQ_PUSH_H_
#include "executor.h"
#include "thash.h"
#include "trpc.h"
#include "ttimer.h"
#include "vnode.h"
#ifdef __cplusplus
extern "C" {
#endif
enum {
TQ_PUSHER_TYPE__CLIENT = 1,
TQ_PUSHER_TYPE__STREAM,
};
typedef struct {
int8_t type;
int8_t reserved[3];
int32_t ttl;
int64_t consumerId;
SRpcMsg* pMsg;
// SMqPollRsp* rsp;
} STqClientPusher;
typedef struct {
int8_t type;
int8_t nodeType;
int8_t reserved[6];
int64_t streamId;
qTaskInfo_t task;
// TODO sync function
} STqStreamPusher;
typedef struct {
int8_t type; // mq or stream
} STqPusher;
typedef struct {
SHashObj* pHash; // <id, STqPush*>
} STqPushMgr;
typedef struct {
int8_t inited;
tmr_h timer;
} STqPushMgmt;
static STqPushMgmt tqPushMgmt;
int32_t tqPushMgrInit();
void tqPushMgrCleanUp();
STqPushMgr* tqPushMgrOpen();
void tqPushMgrClose(STqPushMgr* pushMgr);
STqClientPusher* tqAddClientPusher(STqPushMgr* pushMgr, SRpcMsg* pMsg, int64_t consumerId, int64_t ttl);
STqStreamPusher* tqAddStreamPusher(STqPushMgr* pushMgr, int64_t streamId, SEpSet* pEpSet);
#ifdef __cplusplus
}
#endif
#endif /*_TQ_PUSH_H_*/
source/dnode/vnode/src/inc/tsdbCommit.h
浏览文件 @ aa6e480e
......@@ -16,6 +16,10 @@
#ifndef _TD_TSDB_COMMIT_H_
#define _TD_TSDB_COMMIT_H_
#ifdef __cplusplus
extern "C" {
#endif
typedef struct {
int minFid;
int midFid;
......@@ -66,4 +70,8 @@ int tsdbApplyRtn(STsdbRepo *pRepo);
#endif
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_COMMIT_H_ */
\ No newline at end of file
source/dnode/vnode/src/inc/tsdbDef.h
浏览文件 @ aa6e480e
......@@ -35,6 +35,7 @@
#include "tsdbMemory.h"
#include "tsdbOptions.h"
#include "tsdbReadImpl.h"
#include "tsdbSma.h"
#ifdef __cplusplus
extern "C" {
......@@ -51,6 +52,7 @@ struct STsdb {
STsdbFS * fs;
SMeta * pMeta;
STfs * pTfs;
SSmaStat * pSmaStat;
};
#define REPO_ID(r) ((r)->vgId)
......
source/dnode/vnode/src/inc/tsdbFS.h
浏览文件 @ aa6e480e
......@@ -18,6 +18,10 @@
#include "tsdbFile.h"
#ifdef __cplusplus
extern "C" {
#endif
// ================== TSDB global config
extern bool tsdbForceKeepFile;
......@@ -38,6 +42,10 @@ typedef struct {
typedef struct {
STsdbFSMeta meta; // FS meta
SArray * df; // data file array
// SArray * v2f100.tsma.index_name
SArray * smaf; // sma data file array v2f1900.tsma.index_name
} SFSStatus;
typedef struct {
......@@ -111,4 +119,8 @@ static FORCE_INLINE int tsdbUnLockFS(STsdbFS *pFs) {
return 0;
}
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_FS_H_ */
source/dnode/vnode/src/inc/tsdbFile.h
浏览文件 @ aa6e480e
......@@ -19,6 +19,10 @@
#include "tchecksum.h"
#include "tfs.h"
#ifdef __cplusplus
extern "C" {
#endif
#define TSDB_FILE_HEAD_SIZE 512
#define TSDB_FILE_DELIMITER 0xF00AFA0F
#define TSDB_FILE_INIT_MAGIC 0xFFFFFFFF
......@@ -410,4 +414,8 @@ static FORCE_INLINE bool tsdbFSetIsOk(SDFileSet* pSet) {
return true;
}
#ifdef __cplusplus
}
#endif
#endif /* _TS_TSDB_FILE_H_ */
\ No newline at end of file
source/dnode/vnode/src/inc/tsdbLog.h
浏览文件 @ aa6e480e
......@@ -18,13 +18,21 @@
#include "tlog.h"
#ifdef __cplusplus
extern "C" {
#endif
extern int32_t tsdbDebugFlag;
#define tsdbFatal(...) do { if (tsdbDebugFlag & DEBUG_FATAL) { taosPrintLog("TDB FATAL ", 255, __VA_ARGS__); }} while(0)
#define tsdbError(...) do { if (tsdbDebugFlag & DEBUG_ERROR) { taosPrintLog("TDB ERROR ", 255, __VA_ARGS__); }} while(0)
#define tsdbWarn(...) do { if (tsdbDebugFlag & DEBUG_WARN) { taosPrintLog("TDB WARN ", 255, __VA_ARGS__); }} while(0)
#define tsdbInfo(...) do { if (tsdbDebugFlag & DEBUG_INFO) { taosPrintLog("TDB ", 255, __VA_ARGS__); }} while(0)
#define tsdbDebug(...) do { if (tsdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
#define tsdbTrace(...) do { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
#define tsdbFatal(...) do { if (tsdbDebugFlag & DEBUG_FATAL) { taosPrintLog("TDB FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); }} while(0)
#define tsdbError(...) do { if (tsdbDebugFlag & DEBUG_ERROR) { taosPrintLog("TDB ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); }} while(0)
#define tsdbWarn(...) do { if (tsdbDebugFlag & DEBUG_WARN) { taosPrintLog("TDB WARN ", DEBUG_WARN, 255, __VA_ARGS__); }} while(0)
#define tsdbInfo(...) do { if (tsdbDebugFlag & DEBUG_INFO) { taosPrintLog("TDB ", DEBUG_INFO, 255, __VA_ARGS__); }} while(0)
#define tsdbDebug(...) do { if (tsdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("TDB ", DEBUG_DEBUG, tsdbDebugFlag, __VA_ARGS__); }} while(0)
#define tsdbTrace(...) do { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", DEBUG_TRACE, tsdbDebugFlag, __VA_ARGS__); }} while(0)
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_LOG_H_ */
\ No newline at end of file
source/dnode/vnode/src/inc/tsdbMemory.h
浏览文件 @ aa6e480e
......@@ -16,6 +16,10 @@
#ifndef _TD_TSDB_MEMORY_H_
#define _TD_TSDB_MEMORY_H_
#ifdef __cplusplus
extern "C" {
#endif
static void * taosTMalloc(size_t size);
static void * taosTCalloc(size_t nmemb, size_t size);
static void * taosTRealloc(void *ptr, size_t size);
......@@ -70,5 +74,8 @@ static FORCE_INLINE void* taosTZfree(void* ptr) {
return NULL;
}
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_MEMORY_H_ */
\ No newline at end of file
source/dnode/vnode/src/inc/tsdbReadImpl.h
浏览文件 @ aa6e480e
......@@ -24,6 +24,10 @@
#include "tsdbMemory.h"
#include "tcommon.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct SReadH SReadH;
typedef struct {
......@@ -244,4 +248,8 @@ static FORCE_INLINE int tsdbMakeRoom(void **ppBuf, size_t size) {
return 0;
}
#ifdef __cplusplus
}
#endif
#endif /*_TD_TSDB_READ_IMPL_H_*/
source/dnode/vnode/src/inc/tsdbSma.h 0 → 100644
浏览文件 @ aa6e480e
/*
* 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/>.
*/
#ifndef _TD_TSDB_SMA_H_
#define _TD_TSDB_SMA_H_
typedef struct SSmaStat SSmaStat;
// insert/update interface
int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, STSma *param, STSmaData *pData);
int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, SRSma *param, STSmaData *pData);
// query interface
// TODO: This is the basic params, and should wrap the params to a queryHandle.
int32_t tsdbGetTSmaDataImpl(STsdb *pTsdb, STSma *param, STSmaData *pData, STimeWindow *queryWin, int32_t nMaxResult);
// management interface
int32_t tsdbUpdateExpiredWindow(STsdb *pTsdb, char *msg);
int32_t tsdbGetTSmaStatus(STsdb *pTsdb, STSma *param, void *result);
int32_t tsdbRemoveTSmaData(STsdb *pTsdb, STSma *param, STimeWindow *pWin);
int32_t tsdbFreeSmaState(SSmaStat *pSmaStat);
// internal func
static FORCE_INLINE int32_t tsdbEncodeTSmaKey(uint64_t tableUid, col_id_t colId, TSKEY tsKey, void **pData) {
int32_t len = 0;
len += taosEncodeFixedU64(pData, tableUid);
len += taosEncodeFixedU16(pData, colId);
len += taosEncodeFixedI64(pData, tsKey);
return len;
}
#endif /* _TD_TSDB_SMA_H_ */
\ No newline at end of file
source/dnode/vnode/src/inc/vnd.h
浏览文件 @ aa6e480e
......@@ -88,44 +88,41 @@ int vnodeScheduleTask(SVnodeTask* task);
int32_t vnodePutReqToVQueryQ(SVnode* pVnode, struct SRpcMsg* pReq);
void vnodeSendReqToDnode(SVnode* pVnode, struct SEpSet* epSet, struct SRpcMsg* pReq);
// For Log
extern int32_t vDebugFlag;
#define vFatal(...) \
do { \
if (vDebugFlag & DEBUG_FATAL) { \
taosPrintLog("VND FATAL ", 255, __VA_ARGS__); \
} \
#define vFatal(...) \
do { \
if (vDebugFlag & DEBUG_FATAL) { \
taosPrintLog("VND FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); \
} \
} while (0)
#define vError(...) \
do { \
if (vDebugFlag & DEBUG_ERROR) { \
taosPrintLog("VND ERROR ", 255, __VA_ARGS__); \
} \
#define vError(...) \
do { \
if (vDebugFlag & DEBUG_ERROR) { \
taosPrintLog("VND ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); \
} \
} while (0)
#define vWarn(...) \
do { \
if (vDebugFlag & DEBUG_WARN) { \
taosPrintLog("VND WARN ", 255, __VA_ARGS__); \
} \
#define vWarn(...) \
do { \
if (vDebugFlag & DEBUG_WARN) { \
taosPrintLog("VND WARN ", DEBUG_WARN, 255, __VA_ARGS__); \
} \
} while (0)
#define vInfo(...) \
do { \
if (vDebugFlag & DEBUG_INFO) { \
taosPrintLog("VND ", 255, __VA_ARGS__); \
} \
#define vInfo(...) \
do { \
if (vDebugFlag & DEBUG_INFO) { \
taosPrintLog("VND ", DEBUG_INFO, 255, __VA_ARGS__); \
} \
} while (0)
#define vDebug(...) \
do { \
if (vDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("VND ", tsdbDebugFlag, __VA_ARGS__); \
} \
#define vDebug(...) \
do { \
if (vDebugFlag & DEBUG_DEBUG) { \
taosPrintLog("VND ", DEBUG_DEBUG, tsdbDebugFlag, __VA_ARGS__); \
} \
} while (0)
#define vTrace(...) \
do { \
if (vDebugFlag & DEBUG_TRACE) { \
taosPrintLog("VND ", tsdbDebugFlag, __VA_ARGS__); \
} \
#define vTrace(...) \
do { \
if (vDebugFlag & DEBUG_TRACE) { \
taosPrintLog("VND ", DEBUG_TRACE, tsdbDebugFlag, __VA_ARGS__); \
} \
} while (0)
// vnodeCfg.h
......
source/dnode/vnode/src/meta/metaTable.c
浏览文件 @ aa6e480e
......@@ -50,3 +50,4 @@ int metaDropTable(SMeta *pMeta, tb_uid_t uid) {
return 0;
}
source/dnode/vnode/src/tq/tq.c
浏览文件 @ aa6e480e
此差异已折叠。
source/dnode/vnode/src/tq/tqMetaStore.c
浏览文件 @ aa6e480e
......@@ -90,7 +90,7 @@ STqMetaStore* tqStoreOpen(STQ* pTq, const char* path, FTqSerialize serializer, F
char name[pathLen + 10];
strcpy(name, path);
if (taosDirExist(name) != 0 && taosMkDir(name) != 0) {
if (!taosDirExist(name) && taosMkDir(name) != 0) {
terrno = TSDB_CODE_TQ_FAILED_TO_CREATE_DIR;
tqError("failed to create dir:%s since %s ", name, terrstr());
}
......
source/dnode/vnode/src/tq/tqPush.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/dnode/vnode/src/tq/tqRead.c
浏览文件 @ aa6e480e
此差异已折叠。
source/dnode/vnode/src/tsdb/tsdbBDBImpl.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/dnode/vnode/src/tsdb/tsdbSma.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/dnode/vnode/test/tsdbSmaTest.cpp 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/CMakeLists.txt
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/catalog/src/catalog.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/executor/inc/executil.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/executor/inc/tsimplehash.h 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/executor/src/executor.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/executor/src/tsimplehash.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/executor/src/tsort.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/index/inc/indexInt.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/index/src/index_tfile.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/index/test/fstTest.cc
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/monitor/CMakeLists.txt
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/monitor/inc/monInt.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/monitor/src/monitor.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/qcom/src/queryUtil.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/scalar/inc/filterInt.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/scalar/src/filter.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/scalar/src/scalar.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/scalar/src/sclvector.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/inc/syncElection.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/inc/syncEnv.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/inc/syncIO.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/inc/syncIndexMgr.h 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/inc/syncInt.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/inc/syncMessage.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/inc/syncTimeout.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/inc/syncUtil.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/inc/syncVoteMgr.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncElection.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncEnv.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncIO.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncIndexMgr.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncMain.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncMessage.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncRaftLog.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncTimeout.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncUtil.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/src/syncVoteMgr.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/test/syncEnqTest.cpp 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/test/syncIndexMgrTest.cpp 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/test/syncIndexTest.cpp 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/test/syncInitTest.cpp 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/test/syncTest.cpp
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/test/syncUtilTest.cpp 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/test/syncVotesGrantedTest.cpp 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/sync/test/syncVotesRespondTest.cpp 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/tdb/src/db/tdb.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/tdb/src/db/tdbUtil.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/tdb/src/inc/tdbUtil.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/tdb/test/tdbTest.cpp
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/tfs/CMakeLists.txt
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/tfs/inc/tfsInt.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/tfs/src/tfs.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/tfs/test/tfsTest.cpp
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/transport/inc/rpcLog.h
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/transport/src/rpcTcp.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/transport/src/rpcUdp.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/transport/src/thttp.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/wal/src/walMeta.c
浏览文件 @ aa6e480e
此差异已折叠。
source/libs/wal/src/walWrite.c
浏览文件 @ aa6e480e
此差异已折叠。
source/os/CMakeLists.txt
浏览文件 @ aa6e480e
此差异已折叠。
source/os/src/osDir.c
浏览文件 @ aa6e480e
此差异已折叠。
source/os/src/osEnv.c
浏览文件 @ aa6e480e
此差异已折叠。
source/os/src/osFile.c
浏览文件 @ aa6e480e
此差异已折叠。
source/os/src/osSemaphore.c
浏览文件 @ aa6e480e
此差异已折叠。
source/os/src/osSocket.c
浏览文件 @ aa6e480e
此差异已折叠。
source/os/src/osSysinfo.c
浏览文件 @ aa6e480e
此差异已折叠。
source/os/src/osTimer.c
浏览文件 @ aa6e480e
此差异已折叠。
source/util/src/tcache.c
浏览文件 @ aa6e480e
此差异已折叠。
source/util/src/tconfig.c
浏览文件 @ aa6e480e
此差异已折叠。
source/util/src/terror.c
浏览文件 @ aa6e480e
此差异已折叠。
source/util/src/thash.c
浏览文件 @ aa6e480e
此差异已折叠。
source/util/src/thttp.c 已删除 100644 → 0
浏览文件 @ 19686d9a
此差异已折叠。
source/util/src/tlog.c
浏览文件 @ aa6e480e
此差异已折叠。
source/util/src/tpagedbuf.c
浏览文件 @ aa6e480e
此差异已折叠。
source/util/src/ttimer.c
浏览文件 @ aa6e480e
此差异已折叠。
source/util/src/version.c.in
浏览文件 @ aa6e480e
此差异已折叠。
source/util/test/arrayTest.cpp
浏览文件 @ aa6e480e
此差异已折叠。
source/util/test/cacheTest.cpp
浏览文件 @ aa6e480e
此差异已折叠。
source/util/test/encodeTest.cpp
浏览文件 @ aa6e480e
此差异已折叠。
source/util/test/freelistTest.cpp
浏览文件 @ aa6e480e
此差异已折叠。
source/util/test/hashTest.cpp
浏览文件 @ aa6e480e
此差异已折叠。
source/util/test/pageBufferTest.cpp
浏览文件 @ aa6e480e
此差异已折叠。
tests @ 08ed39f0
比较 08ed39f0...08ed39f0
此差异已折叠。
tests/CMakeLists.txt 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/Jenkinsfile 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/mas/Jenkinsfile 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/parallel_test/Jenkinsfile 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/TimeZone/TestCaseTimeZone.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/ZoneTimeTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/account/account_create.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/account/account_del.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alterColMultiTimes.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alterTabAddTagWithNULL.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alterTimestampColDataProcess.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alter_cacheLastRow.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alter_create_exception.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alter_debugFlag.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alter_keep.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alter_replica.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alter_stable.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alter_table.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/alter_table_crash.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/db_update_options.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/alter/file_corrupt.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/bug2265.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/client/alterDatabase.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/client/change_time_1_1.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/client/change_time_1_2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/client/client.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/client/noConnectionErrorTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/client/thousandsofClient.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/client/twoClients.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/client/version.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/TD-3693/how-to-use 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/TD-3693/insert1Data.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/TD-3693/insert2Data.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/TD-3693/multClient.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/TD-3693/multQuery.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/TD-3693/queryCount.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/bananceTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/basicTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/changeReplicaTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/clusterSetup.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/dataFileRecoveryTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/fullDnodesTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/killAndRestartDnodesTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/offlineThresholdTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/oneReplicaOfflineTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/queryTimeTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/stopAllDnodesTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/stopTwoDnodesTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/syncingTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cluster/testcluster.sh 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/concurrent_inquiry.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/concurrent_inquiry.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/connector/lua.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/cq.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen/README.md 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen/__init__.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen/crash_gen_main.py 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen/service_manager.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen/shared/config.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen/shared/db.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen/shared/misc.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen/shared/types.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen/valgrind_taos.supp 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/crash_gen_bootstrap.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dbmgmt/createTableAndDropDnodes.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dbmgmt/createTableAndKillDnodes.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dbmgmt/database-name-boundary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dbmgmt/dropDB_memory_test.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dbmgmt/nanoSecondCheck.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dockerCluster/Dockerfile 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dockerCluster/basic.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dockerCluster/buildClusterEnv.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dockerCluster/docker-compose.yml 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dockerCluster/insert.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dockerCluster/node3.yml 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/dockerCluster/taosdemoWrapper.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/fulltest.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/all_null_value.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_arithmetic.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_avg.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_avg_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_bottom.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_bottom_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_count.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_count_last_stab.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_count_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_derivative.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_diff.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_diff_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_first.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_first_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_interp.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_irate.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_last.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_last_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_last_row.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_last_row_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_leastsquares.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_leastsquares_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_max.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_max_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_min.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_min_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_operations.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_operations_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_percentile.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_percentile2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_percentile_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_spread.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_spread_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_stateWindow.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_stddev.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_stddev_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_stddev_td2555.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_sum.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_sum_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_top.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_top_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_twa.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_twa_restart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/function_twa_test2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/queryTestCases.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/functions/showOfflineThresholdIs864000.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/handle_crash_gen_val_log.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/handle_taosd_val_log.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/handle_val_log.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/hivemq-extension-test.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock1H.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock1HO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock1HPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock1S.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock1Sub.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock1T.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock1TO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock1TPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock2H.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock2HO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock2HPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock2S.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock2Sub.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock2T.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock2TO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlock2TPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importBlockbetween.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importCSV.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importCacheFileH.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importCacheFileHO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importCacheFileHPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importCacheFileS.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importCacheFileSub.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importCacheFileT.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importCacheFileTO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importCacheFileTPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataH2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataHO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataHO2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataHPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataLastH.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataLastHO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataLastHPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataLastS.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataLastSub.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataLastT.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataLastTO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataLastTPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataS.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataSub.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataT.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataTO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importDataTPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importHORestart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importHPORestart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importHRestart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importHead.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importHeadOverlap.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importHeadPartOverlap.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importInsertThenImport.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importLastH.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importLastHO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importLastHPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importLastS.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importLastSub.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importLastT.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importLastTO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importLastTPO.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importSRestart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importSpan.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importSubRestart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importTORestart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importTPORestart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importTRestart.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importTail.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importTailOverlap.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importTailPartOverlap.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/importToCommit.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/import_update_0.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/import_update_1.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/import_merge/import_update_2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/alterTableAndInsert.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/basic.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/basic_unsigned.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/before_1970.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/bigint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/binary-boundary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/binary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/bool.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/boundary2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/bug3654.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/date.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/double.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/float.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/flushwhiledrop.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/in_function.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/insertDemo.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/insertDynamicColBeforeVal.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/insertFromCSV.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/insertFromCSVPerformance.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/insertIntoTwoTables.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/insertJSONPayload.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/insertTelnetLines.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/insert_before_use_db.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/insert_locking.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/int.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/line_insert.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/metadataUpdate.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/modify_column.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/multi.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/nchar-boundary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/nchar-unicode.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/nchar.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/ningsiInsert.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/openTsdbTelnetLinesInsert.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/randomNullCommit.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/restful.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/restfulInsert.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/retentionpolicy.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/schemalessInsert.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/smallint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/sparseData.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/special_character_show.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/tagSepcified.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/tinyint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/unsignedBigint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/unsignedInt.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/unsignedSmallint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/unsignedTinyint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/insert/writeDBNonStop.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/manualTest/TD-5114/continueCreateDn.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/manualTest/TD-5114/rollingUpgrade.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/manualTest/cal_unavaliable_time_kill.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/manualTest/cal_unavaliable_time_stop.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/manualTest/manual_alter_block.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/manualTest/manual_alter_comp.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/manualTest/manual_change_time_2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/manualTest/manual_change_time_3.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/basic.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/dirNotExist.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/dirPermissionDenied.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/fileDistributionSameLevel.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/illegelLevelMountPoint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/middleLevelMissing.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/moreThan16disks.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/multiMainMountPoint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/noneMainMountPoint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/retentionTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/threeLevelMountPoint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/multilevel/wrongLevelMountPoint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/perf_gen.py 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/perf_gen.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/perfbenchmark/bug3433.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/perfbenchmark/bug3589.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/perfbenchmark/joinPerformance.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/perfbenchmark/taosdemoInsert.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug1471.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug1874.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug1875.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug1876.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug2117.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug2118.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug2119.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug2143.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug2218.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug2281.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug3351.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/bug3375.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/computeErrorinWhere.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/dataLossTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/distinctOneColTb.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/filter.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/filterAllIntTypes.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/filterAllUnsignedIntTypes.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/filterCombo.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/filterFloatAndDouble.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/filterNoKeyword.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/filterOtherTypes.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/filterWithinMultiNchar.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/floatCompare.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/in.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/intervalOffset.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/isNullTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/kill_query.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/last_cache.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/last_row_cache.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/long_where_query.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/natualInterval.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/nestedQuery/insertData.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/nestedQuery/nestedQueryJson.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/nestedQuery/queryInterval.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/nestedQuery/queryWithOrderLimit.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/nestedQuery/queryWithSpread.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/nestquery_last_row.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/operator_cost.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/query.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/query1970YearsAf.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryBetweenAnd.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryCnameDisplay.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryConnection.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryCountCSVData.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryDiffColsOr.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryError.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryFillTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryFilterTswithDateUnit.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryGroupbySort.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryGroupbyWithInterval.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryInsertValue.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryInterval.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryJoin.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryJoin10tables.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryLike.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryMetaData.py 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryMetaPerformace.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryNormal.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryNullValueTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryPerformance.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/querySecondtscolumnTowherenow.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/querySession.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/querySort.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryStableJoin.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryStateWindow.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryStddevWithGroupby.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryTbnameUpperLower.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryTscomputWithNow.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryTsisNull.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryWildcardLength.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/queryWithTaosdKilled.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/query_performance.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/removeDBAndSTable.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/select_last_crash.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/sliding.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/subqueryFilter.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/tbname.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/query/unionAllTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/queryCount.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/random-test/random-test-multi-threading.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/random-test/random-test.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/regressiontest.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/restful/restful_bind_db1.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/restful/restful_bind_db2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/simpletest_no_sudo.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/smoketest.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stable/insert.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stable/query_after_reset.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/cqSupportBefore1970.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/history.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/metric_1.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/metric_n.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/new.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/parser.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/showStreamExecTimeisNull.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/stream1.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/stream2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/stream3.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/sys.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/table_1.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/stream/table_n.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/subscribe/singlemeter.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/subscribe/stability.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/subscribe/supertable.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/alter_column.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/alter_wal0.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/boundary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/column_name.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/column_num.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/create-a-lot.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/create.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/createTableFromAnotherDb.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/create_sensitive.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/db_table.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/del_stable.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/max_table_length.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/table/tablename-boundary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/3.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/4.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/5.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/6.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/TestModifyTag.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/add.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/alter_tag.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/bigint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/binary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/binary_binary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/bool.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/bool_binary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/bool_int.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/change.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/column.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/commit.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/create-tags-boundary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/create.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/datatype-without-alter.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/datatype.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/delete.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/double.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/drop_auto_create.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/filter.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/float.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/int.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/int_binary.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/int_float.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/nchar.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/set.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/smallint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/timestamp.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/tinyint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/too_many_tag_condtions.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/unsignedBigint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/unsignedInt.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/unsignedSmallint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tag_lite/unsignedTinyint.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/test.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/test.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/testCompress.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/testMinTablesPerVnode.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/testNoCompress.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/test_data/__init__.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/test_data/disordered.csv 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/test_data/ordered.csv 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/insert-interlace.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/insert-tblimit-tboffset.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/insert-tblimit-tboffset0.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/insert-tblimit1-tboffset.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/insert.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/query.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/sampledata.csv 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/schemalessInsertPerformance.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemo-sampledata.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/1174-tag.csv 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/1174.csv 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/convertResFile.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-1s1tnt1r.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-1s1tntmr.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-disorder.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-illegal.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-newdb.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-newtable.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-offset.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-renewdb.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-sample.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert-timestep.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insertChildTab0.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insertRestful.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/insert_5M_rows.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/manual_block2.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/nano_samples.csv 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/nano_sampletags.csv 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/querrThreads0.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/query-interrupt.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/query-interrupt.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/queryInsertdata.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/queryQps.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/queryRestful.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/queryTaosc.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/queryTimes0.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/queryTimesless0.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/queryall.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/sample.csv 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/subAsync.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/subInsertdata.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/subSync.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/sub_no_result.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/subscribeNoResult.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoAllTest/tags.csv 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoPerformance.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoTestInterlace.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoTestLimitOffset.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoTestQuery.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoTestSampleData.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoTestTblAlt.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoTestWithJson.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdemoTestWithoutMetric.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdumpTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdumpTest2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tools/taosdumpTestNanoSupport.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/topic/topicQuery.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tsdb/insertDataDb1.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tsdb/insertDataDb1Replica2.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tsdb/insertDataDb2.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tsdb/insertDataDb2Newstab.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tsdb/insertDataDb2NewstabReplica2.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tsdb/insertDataDb2Replica2.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tsdb/tsdbComp.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tsdb/tsdbCompCluster.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/tsdb/tsdbCompClusterReplica2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/allow_update-0.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/allow_update.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/append_commit_data-0.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/append_commit_data.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/append_commit_last-0.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/append_commit_last.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/bug_td2279.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/merge_commit_data-0.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/merge_commit_data.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/merge_commit_data2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/merge_commit_data2_update0.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/merge_commit_last-0.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/update/merge_commit_last.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/user/pass_len.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/user/user_create.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/cases.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/common.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/dnodes-default.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/dnodes-no-random-fail.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/dnodes-random-fail.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/dnodes.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/log.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/pathFinding.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/sql.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/sub.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/util/taosdemoCfg.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/valgrind-test.sh 0 → 100755
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/addOldWalTest.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/insertDataDb1.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/insertDataDb1Replica2.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/insertDataDb2.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/insertDataDb2Newstab.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/insertDataDb2NewstabReplica2.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/insertDataDb2Replica2.json 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/sdbComp.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/sdbCompCluster.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/pytest/wal/sdbCompClusterReplica2.py 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/api/batchprepare.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/api/makefile 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/api/stmtBatchTest.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/api/stmtTest.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/api/stmt_function.c 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/basicSuite.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/bug.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/fullGeneralSuite.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/alter/count.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/alter/dnode.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/alter/import.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/alter/insert1.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/alter/insert2.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/alter/metrics.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/alter/table.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/alter/testSuite.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/cache/new_metrics.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/cache/restart_metrics.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/cache/restart_table.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/cache/testSuite.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/column/commit.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/column/metrics.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/column/table.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/column/testSuite.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compress/commitlog.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compress/compress.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compress/compress2.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compress/testSuite.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compress/uncompress.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/avg.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/block_dist.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/bottom.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/count.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/diff.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/diff2.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/first.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/interval.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/last.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/last_row.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/leastsquare.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/max.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/min.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/null.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/percentile.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/stddev.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/sum.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/testSuite.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/compute/top.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/connection/connection.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/connection/mqtt.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/connection/sim.tar.gz 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/connection/test_old_data.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/alter_option.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/alter_tables_d2.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/alter_tables_v1.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/alter_tables_v4.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/alter_vgroups.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/back_insert.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/backup/keep.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/basic2.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/basic3.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/basic4.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/basic5.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/delete.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/delete_reuse1.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/delete_reuse2.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/delete_reusevnode.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
tests/script/general/db/delete_reusevnode2.sim 0 → 100644
浏览文件 @ aa6e480e
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或