Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱划水de鲸鱼哥~
TDengine
提交
32d5fc54
T
TDengine
项目概览
爱划水de鲸鱼哥~
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
32d5fc54
编写于
4月 25, 2020
作者:
weixin_48148422
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/develop' into feature/tbname2
上级
886d8d58
f4538acf
变更
53
隐藏空白更改
内联
并排
Showing
53 changed file
with
856 addition
and
592 deletion
+856
-592
.travis.yml
.travis.yml
+1
-1
src/client/inc/tscUtil.h
src/client/inc/tscUtil.h
+2
-2
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+2
-3
src/client/src/TSDBJNIConnector.c
src/client/src/TSDBJNIConnector.c
+3
-3
src/client/src/tscAsync.c
src/client/src/tscAsync.c
+1
-1
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+6
-2
src/client/src/tscServer.c
src/client/src/tscServer.c
+3
-2
src/client/src/tscSql.c
src/client/src/tscSql.c
+3
-1
src/client/src/tscStream.c
src/client/src/tscStream.c
+3
-3
src/client/src/tscSystem.c
src/client/src/tscSystem.c
+5
-21
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+20
-8
src/common/inc/tglobal.h
src/common/inc/tglobal.h
+67
-75
src/common/src/tglobal.c
src/common/src/tglobal.c
+21
-59
src/inc/taosdef.h
src/inc/taosdef.h
+2
-5
src/inc/taoserror.h
src/inc/taoserror.h
+55
-55
src/mnode/inc/mgmtDef.h
src/mnode/inc/mgmtDef.h
+20
-28
src/mnode/src/mgmtDb.c
src/mnode/src/mgmtDb.c
+101
-155
src/mnode/src/mgmtShell.c
src/mnode/src/mgmtShell.c
+1
-1
src/mnode/src/mgmtTable.c
src/mnode/src/mgmtTable.c
+10
-10
src/mnode/src/mgmtVgroup.c
src/mnode/src/mgmtVgroup.c
+16
-16
src/plugins/http/src/gcHandle.c
src/plugins/http/src/gcHandle.c
+4
-2
src/plugins/http/src/gcJson.c
src/plugins/http/src/gcJson.c
+2
-4
src/plugins/http/src/httpAuth.c
src/plugins/http/src/httpAuth.c
+3
-1
src/plugins/http/src/httpCode.c
src/plugins/http/src/httpCode.c
+3
-0
src/plugins/http/src/httpHandle.c
src/plugins/http/src/httpHandle.c
+7
-10
src/plugins/http/src/httpJson.c
src/plugins/http/src/httpJson.c
+5
-10
src/plugins/http/src/httpResp.c
src/plugins/http/src/httpResp.c
+8
-9
src/plugins/http/src/httpServer.c
src/plugins/http/src/httpServer.c
+1
-0
src/plugins/http/src/httpSession.c
src/plugins/http/src/httpSession.c
+7
-9
src/plugins/http/src/httpSql.c
src/plugins/http/src/httpSql.c
+31
-30
src/plugins/http/src/httpSystem.c
src/plugins/http/src/httpSystem.c
+5
-5
src/plugins/http/src/httpUtil.c
src/plugins/http/src/httpUtil.c
+4
-3
src/plugins/http/src/restHandle.c
src/plugins/http/src/restHandle.c
+3
-1
src/plugins/http/src/restJson.c
src/plugins/http/src/restJson.c
+1
-0
src/plugins/http/src/tgHandle.c
src/plugins/http/src/tgHandle.c
+4
-3
src/plugins/http/src/tgJson.c
src/plugins/http/src/tgJson.c
+10
-9
src/query/src/queryExecutor.c
src/query/src/queryExecutor.c
+27
-13
src/query/tests/patternMatchTest.cpp
src/query/tests/patternMatchTest.cpp
+5
-1
tests/examples/c/demo.c
tests/examples/c/demo.c
+2
-2
tests/pytest/insert/float.py
tests/pytest/insert/float.py
+147
-0
tests/pytest/insert/int.py
tests/pytest/insert/int.py
+184
-0
tests/pytest/simpletest.sh
tests/pytest/simpletest.sh
+6
-0
tests/pytest/test.py
tests/pytest/test.py
+1
-1
tests/pytest/util/cases.py
tests/pytest/util/cases.py
+6
-2
tests/pytest/util/dnodes.py
tests/pytest/util/dnodes.py
+21
-11
tests/pytest/util/sql.py
tests/pytest/util/sql.py
+1
-1
tests/script/general/http/restful.sim
tests/script/general/http/restful.sim
+2
-2
tests/script/general/http/restful_full.sim
tests/script/general/http/restful_full.sim
+5
-5
tests/script/general/http/testSuite.sim
tests/script/general/http/testSuite.sim
+1
-2
tests/script/sh/deploy.sh
tests/script/sh/deploy.sh
+2
-2
tests/script/unique/http/opentsdb.sim
tests/script/unique/http/opentsdb.sim
+0
-0
tests/script/unique/http/testSuite.sim
tests/script/unique/http/testSuite.sim
+2
-1
tests/test-all.sh
tests/test-all.sh
+4
-2
未找到文件。
.travis.yml
浏览文件 @
32d5fc54
...
...
@@ -64,7 +64,7 @@ matrix:
memError=`grep -m 1 'ERROR SUMMARY' mem-error-out.txt | awk '{print $4}'`
if [ -n "$memError" ]; then
if [ "$memError" -gt 16 ]
&&
[ "$defiMemError" -gt 0 ]; then
if [ "$memError" -gt 16 ]
||
[ "$defiMemError" -gt 0 ]; then
echo -e "${RED} ## Memory errors number valgrind reports is $memError.\
Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
travis_terminate $memError
...
...
src/client/inc/tscUtil.h
浏览文件 @
32d5fc54
...
...
@@ -196,14 +196,14 @@ STableMetaInfo* tscGetMetaInfo(SQueryInfo *pQueryInfo, int32_t tableIndex);
SQueryInfo
*
tscGetQueryInfoDetail
(
SSqlCmd
*
pCmd
,
int32_t
subClauseIndex
);
int32_t
tscGetQueryInfoDetailSafely
(
SSqlCmd
*
pCmd
,
int32_t
subClauseIndex
,
SQueryInfo
**
pQueryInfo
);
void
tscClear
Meter
MetaInfo
(
STableMetaInfo
*
pTableMetaInfo
,
bool
removeFromCache
);
void
tscClear
Table
MetaInfo
(
STableMetaInfo
*
pTableMetaInfo
,
bool
removeFromCache
);
STableMetaInfo
*
tscAddTableMetaInfo
(
SQueryInfo
*
pQueryInfo
,
const
char
*
name
,
STableMeta
*
pTableMeta
,
SVgroupsInfo
*
vgroupList
,
SArray
*
pTagCols
);
STableMetaInfo
*
tscAddEmptyMetaInfo
(
SQueryInfo
*
pQueryInfo
);
int32_t
tscAddSubqueryInfo
(
SSqlCmd
*
pCmd
);
void
tscFree
Subq
ueryInfo
(
SSqlCmd
*
pCmd
);
void
tscFree
Q
ueryInfo
(
SSqlCmd
*
pCmd
);
void
tscClearSubqueryInfo
(
SSqlCmd
*
pCmd
);
int
tscGetSTableVgroupInfo
(
SSqlObj
*
pSql
,
int32_t
clauseIndex
);
...
...
src/client/inc/tsclient.h
浏览文件 @
32d5fc54
...
...
@@ -298,6 +298,7 @@ typedef struct STscObj {
char
sversion
[
TSDB_VERSION_LEN
];
char
writeAuth
:
1
;
char
superAuth
:
1
;
void
*
pMgmtConn
;
struct
SSqlObj
*
pSql
;
struct
SSqlObj
*
pHb
;
struct
SSqlObj
*
sqlList
;
...
...
@@ -359,7 +360,7 @@ typedef struct SSqlStream {
struct
SSqlStream
*
prev
,
*
next
;
}
SSqlStream
;
int32_t
tscInitRpc
(
const
char
*
user
,
const
char
*
secret
);
int32_t
tscInitRpc
(
const
char
*
user
,
const
char
*
secret
,
void
**
pMgmtConn
);
void
tscInitMsgsFp
();
int
tsParseSql
(
SSqlObj
*
pSql
,
bool
multiVnodeInsertion
);
...
...
@@ -427,9 +428,7 @@ int32_t tscToSQLCmd(SSqlObj *pSql, struct SSqlInfo *pInfo);
char
*
tscGetResultColumnChr
(
SSqlRes
*
pRes
,
SQueryInfo
*
pQueryInfo
,
int32_t
column
);
extern
void
*
pVnodeConn
;
extern
void
*
pTscMgmtConn
;
extern
void
*
tscCacheHandle
;
extern
int
slaveIndex
;
extern
void
*
tscTmr
;
extern
void
*
tscQhandle
;
extern
int
tscKeepConn
[];
...
...
src/client/src/TSDBJNIConnector.c
浏览文件 @
32d5fc54
...
...
@@ -281,7 +281,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
int
code
=
taos_query
(
tscon
,
dst
);
if
(
code
!=
0
)
{
jniError
(
"jobj:%p, conn:%p, code:%
d, msg:%s"
,
jobj
,
tscon
,
code
,
taos_errstr
(
tscon
));
jniError
(
"jobj:%p, conn:%p, code:%
s, msg:%s"
,
jobj
,
tscon
,
tstrerror
(
code
)
,
taos_errstr
(
tscon
));
free
(
dst
);
return
JNI_TDENGINE_ERROR
;
}
else
{
...
...
@@ -290,9 +290,9 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
if
(
pSql
->
cmd
.
command
==
TSDB_SQL_INSERT
)
{
affectRows
=
taos_affected_rows
(
tscon
);
jniTrace
(
"jobj:%p, conn:%p, code:%
d, affect rows:%d"
,
jobj
,
tscon
,
code
,
affectRows
);
jniTrace
(
"jobj:%p, conn:%p, code:%
s, affect rows:%d"
,
jobj
,
tscon
,
tstrerror
(
code
)
,
affectRows
);
}
else
{
jniTrace
(
"jobj:%p, conn:%p, code:%
d"
,
jobj
,
tscon
,
code
);
jniTrace
(
"jobj:%p, conn:%p, code:%
s"
,
jobj
,
tscon
,
tstrerror
(
code
)
);
}
free
(
dst
);
...
...
src/client/src/tscAsync.c
浏览文件 @
32d5fc54
...
...
@@ -46,7 +46,7 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, void (*fp)(), void* param, const
pSql
->
signature
=
pSql
;
pSql
->
param
=
param
;
pSql
->
pTscObj
=
pObj
;
pSql
->
maxRetry
=
1
;
pSql
->
maxRetry
=
TSDB_REPLICA_MAX_NUM
;
pSql
->
fp
=
fp
;
if
(
TSDB_CODE_SUCCESS
!=
tscAllocPayload
(
pCmd
,
TSDB_DEFAULT_PAYLOAD_SIZE
))
{
...
...
src/client/src/tscSQLParser.c
浏览文件 @
32d5fc54
...
...
@@ -733,7 +733,7 @@ int32_t tscSetTableId(STableMetaInfo* pTableMetaInfo, SSQLToken* pzTableName, SS
*/
if
(
size
>
0
)
{
if
(
strncasecmp
(
oldName
,
pTableMetaInfo
->
name
,
tListLen
(
pTableMetaInfo
->
name
))
!=
0
)
{
tscClear
Meter
MetaInfo
(
pTableMetaInfo
,
false
);
tscClear
Table
MetaInfo
(
pTableMetaInfo
,
false
);
}
}
else
{
assert
(
pTableMetaInfo
->
pTableMeta
==
NULL
);
...
...
@@ -2477,6 +2477,10 @@ int32_t parseGroupbyClause(SQueryInfo* pQueryInfo, tVariantList* pList, SSqlCmd*
return
TSDB_CODE_SUCCESS
;
}
if
(
pQueryInfo
->
colList
==
NULL
)
{
pQueryInfo
->
colList
=
taosArrayInit
(
4
,
POINTER_BYTES
);
}
pQueryInfo
->
groupbyExpr
.
numOfGroupCols
=
pList
->
nExpr
;
if
(
pList
->
nExpr
>
TSDB_MAX_TAGS
)
{
return
invalidSqlErrMsg
(
pQueryInfo
->
msg
,
msg1
);
...
...
@@ -4915,7 +4919,7 @@ void doAddGroupColumnForSubquery(SQueryInfo* pQueryInfo, int32_t tagIndex) {
list
.
num
=
1
;
list
.
ids
[
0
]
=
colIndex
;
insertResultField
(
pQueryInfo
,
size
-
1
,
&
list
,
pSchema
->
bytes
,
pSchema
->
type
,
pSchema
->
name
,
pExpr
);
insertResultField
(
pQueryInfo
,
size
,
&
list
,
pSchema
->
bytes
,
pSchema
->
type
,
pSchema
->
name
,
pExpr
);
SFieldSupInfo
*
pInfo
=
tscFieldInfoGetSupp
(
&
pQueryInfo
->
fieldsInfo
,
size
-
1
);
pInfo
->
visible
=
false
;
}
...
...
src/client/src/tscServer.c
浏览文件 @
32d5fc54
...
...
@@ -190,6 +190,7 @@ void tscProcessActivityTimer(void *handle, void *tmrId) {
}
int
tscSendMsgToServer
(
SSqlObj
*
pSql
)
{
STscObj
*
pObj
=
pSql
->
pTscObj
;
SSqlCmd
*
pCmd
=
&
pSql
->
cmd
;
char
*
pMsg
=
rpcMallocCont
(
pCmd
->
payloadLen
);
...
...
@@ -223,7 +224,7 @@ int tscSendMsgToServer(SSqlObj *pSql) {
.
handle
=
pSql
,
.
code
=
0
};
rpcSendRequest
(
p
Tsc
MgmtConn
,
&
pSql
->
ipList
,
&
rpcMsg
);
rpcSendRequest
(
p
Obj
->
p
MgmtConn
,
&
pSql
->
ipList
,
&
rpcMsg
);
}
return
TSDB_CODE_SUCCESS
;
...
...
@@ -2607,7 +2608,7 @@ int tscGetSTableVgroupInfo(SSqlObj *pSql, int32_t clauseIndex) {
// if (pSql->fp != NULL && pSql->pStream == NULL) {
// pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
// tscFree
Subq
ueryInfo(pCmd);
// tscFree
Q
ueryInfo(pCmd);
// }
tscTrace
(
"%p allocate new pSqlObj:%p to get stable vgroupInfo"
,
pSql
,
pNew
);
...
...
src/client/src/tscSql.c
浏览文件 @
32d5fc54
...
...
@@ -66,7 +66,8 @@ STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con
return
NULL
;
}
if
(
tscInitRpc
(
user
,
pass
)
!=
0
)
{
void
*
pMgmtConn
=
NULL
;
if
(
tscInitRpc
(
user
,
pass
,
&
pMgmtConn
)
!=
0
)
{
terrno
=
TSDB_CODE_NETWORK_UNAVAIL
;
return
NULL
;
}
...
...
@@ -118,6 +119,7 @@ STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con
strtolower
(
pObj
->
db
,
tmp
);
}
pObj
->
pMgmtConn
=
pMgmtConn
;
pthread_mutex_init
(
&
pObj
->
mutex
,
NULL
);
SSqlObj
*
pSql
=
(
SSqlObj
*
)
calloc
(
1
,
sizeof
(
SSqlObj
));
...
...
src/client/src/tscStream.c
浏览文件 @
32d5fc54
...
...
@@ -147,7 +147,7 @@ static void tscProcessStreamQueryCallback(void *param, TAOS_RES *tres, int numOf
retryDelay
);
STableMetaInfo
*
pTableMetaInfo
=
tscGetTableMetaInfoFromCmd
(
&
pStream
->
pSql
->
cmd
,
0
,
0
);
tscClear
Meter
MetaInfo
(
pTableMetaInfo
,
true
);
tscClear
Table
MetaInfo
(
pTableMetaInfo
,
true
);
tscSetRetryTimer
(
pStream
,
pStream
->
pSql
,
retryDelay
);
return
;
...
...
@@ -177,7 +177,7 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
if
(
pSql
==
NULL
||
numOfRows
<
0
)
{
int64_t
retryDelayTime
=
tscGetRetryDelayTime
(
pStream
->
slidingTime
,
pStream
->
precision
);
tscError
(
"%p stream:%p, retrieve data failed, code:%d, retry in %"
PRId64
"ms"
,
pSql
,
pStream
,
numOfRows
,
retryDelayTime
);
tscClear
Meter
MetaInfo
(
pTableMetaInfo
,
true
);
tscClear
Table
MetaInfo
(
pTableMetaInfo
,
true
);
tscSetRetryTimer
(
pStream
,
pStream
->
pSql
,
retryDelayTime
);
return
;
...
...
@@ -259,7 +259,7 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
pStream
->
numOfRes
);
// release the metric/meter meta information reference, so data in cache can be updated
tscClear
Meter
MetaInfo
(
pTableMetaInfo
,
false
);
tscClear
Table
MetaInfo
(
pTableMetaInfo
,
false
);
tscSetNextLaunchTimer
(
pStream
,
pSql
);
}
}
...
...
src/client/src/tscSystem.c
浏览文件 @
32d5fc54
...
...
@@ -33,16 +33,12 @@
// global, not configurable
void
*
pVnodeConn
;
void
*
pVMeterConn
;
void
*
pTscMgmtConn
;
void
*
pSlaveConn
;
void
*
tscCacheHandle
;
int
slaveIndex
;
void
*
tscTmr
;
void
*
tscQhandle
;
void
*
tscCheckDiskUsageTmr
;
int
tsInsertHeadSize
;
char
tsLastUser
[
TSDB_USER_LEN
+
1
];
int
tscNumOfThreads
;
...
...
@@ -55,7 +51,7 @@ void tscCheckDiskUsage(void *para, void *unused) {
taosTmrReset
(
tscCheckDiskUsage
,
1000
,
NULL
,
tscTmr
,
&
tscCheckDiskUsageTmr
);
}
int32_t
tscInitRpc
(
const
char
*
user
,
const
char
*
secret
)
{
int32_t
tscInitRpc
(
const
char
*
user
,
const
char
*
secret
,
void
**
pMgmtConn
)
{
SRpcInit
rpcInit
;
char
secretEncrypt
[
32
]
=
{
0
};
taosEncryptPass
((
uint8_t
*
)
secret
,
strlen
(
secret
),
secretEncrypt
);
...
...
@@ -81,14 +77,7 @@ int32_t tscInitRpc(const char *user, const char *secret) {
}
}
// not stop service, switch users
if
(
strcmp
(
tsLastUser
,
user
)
!=
0
&&
pTscMgmtConn
!=
NULL
)
{
tscTrace
(
"switch user from %s to %s"
,
user
,
tsLastUser
);
rpcClose
(
pTscMgmtConn
);
pTscMgmtConn
=
NULL
;
}
if
(
pTscMgmtConn
==
NULL
)
{
if
(
*
pMgmtConn
==
NULL
)
{
memset
(
&
rpcInit
,
0
,
sizeof
(
rpcInit
));
rpcInit
.
localIp
=
tsLocalIp
;
rpcInit
.
localPort
=
0
;
...
...
@@ -101,11 +90,11 @@ int32_t tscInitRpc(const char *user, const char *secret) {
rpcInit
.
idleTime
=
2000
;
rpcInit
.
user
=
(
char
*
)
user
;
rpcInit
.
ckey
=
"key"
;
rpcInit
.
spi
=
1
;
rpcInit
.
secret
=
secretEncrypt
;
strcpy
(
tsLastUser
,
user
);
pTsc
MgmtConn
=
rpcOpen
(
&
rpcInit
);
if
(
pTsc
MgmtConn
==
NULL
)
{
*
p
MgmtConn
=
rpcOpen
(
&
rpcInit
);
if
(
*
p
MgmtConn
==
NULL
)
{
tscError
(
"failed to init connection to mgmt"
);
return
-
1
;
}
...
...
@@ -219,11 +208,6 @@ void taos_cleanup() {
pVnodeConn
=
NULL
;
}
if
(
pTscMgmtConn
!=
NULL
)
{
rpcClose
(
pTscMgmtConn
);
pTscMgmtConn
=
NULL
;
}
taosTmrCleanUp
(
tscTmr
);
}
...
...
src/client/src/tscUtil.c
浏览文件 @
32d5fc54
...
...
@@ -337,7 +337,7 @@ void tscResetSqlCmdObj(SSqlCmd* pCmd) {
pCmd
->
pTableList
=
NULL
;
pCmd
->
pDataBlocks
=
tscDestroyBlockArrayList
(
pCmd
->
pDataBlocks
);
tscFree
Subq
ueryInfo
(
pCmd
);
tscFree
Q
ueryInfo
(
pCmd
);
}
/*
...
...
@@ -761,6 +761,8 @@ void tscCloseTscObj(STscObj* pObj) {
tscFreeSqlObj
(
pSql
);
sem_destroy
(
&
pSql
->
rspSem
);
rpcClose
(
pObj
->
pMgmtConn
);
pthread_mutex_destroy
(
&
pObj
->
mutex
);
tscTrace
(
"%p DB connection is closed"
,
pObj
);
...
...
@@ -1459,7 +1461,7 @@ bool tscShouldFreeHeatBeat(SSqlObj* pHb) {
void
tscCleanSqlCmd
(
SSqlCmd
*
pCmd
)
{
pCmd
->
pDataBlocks
=
tscDestroyBlockArrayList
(
pCmd
->
pDataBlocks
);
tscFree
Subq
ueryInfo
(
pCmd
);
tscFree
Q
ueryInfo
(
pCmd
);
uint32_t
allocSize
=
pCmd
->
allocSize
;
char
*
allocPtr
=
pCmd
->
payload
;
...
...
@@ -1601,7 +1603,7 @@ int32_t tscAddSubqueryInfo(SSqlCmd* pCmd) {
return
TSDB_CODE_SUCCESS
;
}
static
void
doClearSubqueryInfo
(
SQueryInfo
*
pQueryInfo
)
{
static
void
freeQueryInfoImpl
(
SQueryInfo
*
pQueryInfo
)
{
tscTagCondRelease
(
&
pQueryInfo
->
tagCond
);
tscFieldInfoClear
(
&
pQueryInfo
->
fieldsInfo
);
...
...
@@ -1611,6 +1613,11 @@ static void doClearSubqueryInfo(SQueryInfo* pQueryInfo) {
tscColumnListDestroy
(
pQueryInfo
->
colList
);
memset
(
&
pQueryInfo
->
colList
,
0
,
sizeof
(
pQueryInfo
->
colList
));
if
(
pQueryInfo
->
groupbyExpr
.
columnInfo
!=
NULL
)
{
taosArrayDestroy
(
pQueryInfo
->
groupbyExpr
.
columnInfo
);
pQueryInfo
->
groupbyExpr
.
columnInfo
=
NULL
;
}
pQueryInfo
->
tsBuf
=
tsBufDestory
(
pQueryInfo
->
tsBuf
);
tfree
(
pQueryInfo
->
defaultVal
);
...
...
@@ -1619,11 +1626,11 @@ static void doClearSubqueryInfo(SQueryInfo* pQueryInfo) {
void
tscClearSubqueryInfo
(
SSqlCmd
*
pCmd
)
{
for
(
int32_t
i
=
0
;
i
<
pCmd
->
numOfClause
;
++
i
)
{
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfoDetail
(
pCmd
,
i
);
doClearSubqueryInfo
(
pQueryInfo
);
freeQueryInfoImpl
(
pQueryInfo
);
}
}
void
tscFree
Subq
ueryInfo
(
SSqlCmd
*
pCmd
)
{
void
tscFree
Q
ueryInfo
(
SSqlCmd
*
pCmd
)
{
if
(
pCmd
==
NULL
||
pCmd
->
numOfClause
==
0
)
{
return
;
}
...
...
@@ -1632,7 +1639,7 @@ void tscFreeSubqueryInfo(SSqlCmd* pCmd) {
char
*
addr
=
(
char
*
)
pCmd
-
offsetof
(
SSqlObj
,
cmd
);
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfoDetail
(
pCmd
,
i
);
doClearSubqueryInfo
(
pQueryInfo
);
freeQueryInfoImpl
(
pQueryInfo
);
tscClearAllTableMetaInfo
(
pQueryInfo
,
(
const
char
*
)
addr
,
false
);
tfree
(
pQueryInfo
);
}
...
...
@@ -1691,7 +1698,7 @@ void doRemoveTableMetaInfo(SQueryInfo* pQueryInfo, int32_t index, bool removeFro
STableMetaInfo
*
pTableMetaInfo
=
tscGetMetaInfo
(
pQueryInfo
,
index
);
tscClear
Meter
MetaInfo
(
pTableMetaInfo
,
removeFromCache
);
tscClear
Table
MetaInfo
(
pTableMetaInfo
,
removeFromCache
);
free
(
pTableMetaInfo
);
int32_t
after
=
pQueryInfo
->
numOfTables
-
index
-
1
;
...
...
@@ -1713,13 +1720,18 @@ void tscClearAllTableMetaInfo(SQueryInfo* pQueryInfo, const char* address, bool
tfree
(
pQueryInfo
->
pTableMetaInfo
);
}
void
tscClear
Meter
MetaInfo
(
STableMetaInfo
*
pTableMetaInfo
,
bool
removeFromCache
)
{
void
tscClear
Table
MetaInfo
(
STableMetaInfo
*
pTableMetaInfo
,
bool
removeFromCache
)
{
if
(
pTableMetaInfo
==
NULL
)
{
return
;
}
taosCacheRelease
(
tscCacheHandle
,
(
void
**
)
&
(
pTableMetaInfo
->
pTableMeta
),
removeFromCache
);
tfree
(
pTableMetaInfo
->
vgroupList
);
if
(
pTableMetaInfo
->
tagColList
!=
NULL
)
{
taosArrayDestroy
(
pTableMetaInfo
->
tagColList
);
pTableMetaInfo
->
tagColList
=
NULL
;
}
}
void
tscResetForNextRetrieve
(
SSqlRes
*
pRes
)
{
...
...
src/common/inc/tglobal.h
浏览文件 @
32d5fc54
...
...
@@ -48,11 +48,9 @@ extern int32_t tsEnableCoreFile;
extern
int32_t
tsTotalMemoryMB
;
extern
int32_t
tsVersion
;
extern
int
tscEmbedded
;
extern
int32_t
tscEmbedded
;
extern
int64_t
tsMsPerDay
[
2
];
extern
char
tsMasterIp
[];
extern
char
tsSecondIp
[];
extern
uint16_t
tsMnodeDnodePort
;
...
...
@@ -61,94 +59,88 @@ extern uint16_t tsDnodeShellPort;
extern
uint16_t
tsDnodeMnodePort
;
extern
uint16_t
tsSyncPort
;
extern
int
tsStatusInterval
;
extern
int
tsShellActivityTimer
;
extern
int
tsVnodePeerHBTimer
;
extern
int
tsMgmtPeerHBTimer
;
extern
int
tsMeterMetaKeepTimer
;
extern
int
tsMetricMetaKeepTimer
;
extern
float
tsNumOfThreadsPerCore
;
extern
float
tsRatioOfQueryThreads
;
extern
char
tsPublicIp
[];
extern
char
tsPrivateIp
[];
extern
short
tsNumOfVnodesPerCore
;
extern
short
tsNumOfTotalVnodes
;
extern
short
tsCheckHeaderFile
;
extern
int32_t
tsStatusInterval
;
extern
int32_t
tsShellActivityTimer
;
extern
int32_t
tsVnodePeerHBTimer
;
extern
int32_t
tsMgmtPeerHBTimer
;
extern
int32_t
tsMeterMetaKeepTimer
;
extern
int32_t
tsMetricMetaKeepTimer
;
extern
float
tsNumOfThreadsPerCore
;
extern
float
tsRatioOfQueryThreads
;
extern
char
tsPublicIp
[];
extern
char
tsPrivateIp
[];
extern
int16_t
tsNumOfVnodesPerCore
;
extern
int16_t
tsNumOfTotalVnodes
;
extern
uint32_t
tsPublicIpInt
;
extern
short
tsAffectedRowsMod
;
extern
int
tsSessionsPerVnode
;
extern
int
tsAverageCacheBlocks
;
extern
int
tsCacheBlockSize
;
extern
int
tsRowsInFileBlock
;
extern
float
tsFileBlockMinPercent
;
extern
short
tsNumOfBlocksPerMeter
;
extern
short
tsCommitTime
;
// seconds
extern
short
tsCommitLog
;
extern
short
tsAsyncLog
;
extern
shor
t
tsCompression
;
extern
short
tsDaysPerFile
;
extern
int
tsDaysToKeep
;
extern
int
tsReplications
;
extern
int
tsNumOfMPeers
;
extern
int
tsMaxShellConns
;
extern
int
tsMaxTables
;
extern
int
32_t
tsMaxCacheSize
;
extern
int32_t
tsSessionsPerVnode
;
extern
int16_t
tsDaysPerFile
;
extern
int32_t
tsDaysToKeep
;
extern
int32_t
tsRowsInFileBlock
;
extern
int16_t
tsCommitTime
;
// seconds
extern
int32_t
tsTimePrecision
;
extern
int16_
t
tsCompression
;
extern
int16_t
tsCommitLog
;
extern
int
32_t
tsReplications
;
extern
int16_t
tsAffectedRowsMod
;
extern
int
32_t
tsNumOfMPeers
;
extern
int
32_t
tsMaxShellConns
;
extern
int
32_t
tsMaxTables
;
extern
char
tsLocalIp
[];
extern
char
tsDefaultDB
[];
extern
char
tsDefaultUser
[];
extern
char
tsDefaultPass
[];
extern
int
tsMaxMeterConnections
;
extern
int
tsMaxVnodeConnections
;
extern
int
tsMaxMgmtConnections
;
extern
int
tsBalanceMonitorInterval
;
extern
int
tsBalanceStartInterval
;
extern
int
tsBalancePolicy
;
extern
int
tsOfflineThreshold
;
extern
int
tsMgmtEqualVnodeNum
;
extern
int
tsEnableHttp
Module
;
extern
int
tsEnableMonitorModule
;
extern
int
tsRestRowLimit
;
extern
int
tsCompressMsgSize
;
extern
int
tsMaxSQLStringLen
;
extern
int
tsMaxNumOfOrderedResults
;
extern
int
32_t
tsMaxMeterConnections
;
extern
int
32_t
tsMaxVnodeConnections
;
extern
int
32_t
tsMaxMgmtConnections
;
extern
int
32_t
tsBalanceMonitorInterval
;
extern
int
32_t
tsBalanceStartInterval
;
extern
int
32_t
tsOfflineThreshold
;
extern
int
32_t
tsMgmtEqualVnodeNum
;
extern
int32_t
tsEnableHttpModule
;
extern
int
32_t
tsEnableMonitor
Module
;
extern
int
32_t
tsRestRowLimit
;
extern
int
32_t
tsMaxSQLStringLen
;
extern
int
32_t
tsCompressMsgSize
;
extern
int
32_t
tsMaxNumOfOrderedResults
;
extern
char
tsSocketType
[
4
];
extern
int
tsTimePrecision
;
extern
int
tsMinSlidingTime
;
extern
int
tsMinIntervalTime
;
extern
int
tsMaxStreamComputDelay
;
extern
int
tsStreamCompStartDelay
;
extern
int
tsStreamCompRetryDelay
;
extern
int32_t
tsMinSlidingTime
;
extern
int32_t
tsMinIntervalTime
;
extern
int32_t
tsMaxStreamComputDelay
;
extern
int32_t
tsStreamCompStartDelay
;
extern
int32_t
tsStreamCompRetryDelay
;
extern
float
tsStreamComputDelayRatio
;
// the delayed computing ration of the whole time window
extern
int
tsProjectExecInterval
;
extern
int64_t
tsMaxRetentWindow
;
extern
char
tsHttpIp
[];
extern
char
tsHttpIp
[];
extern
uint16_t
tsHttpPort
;
extern
int
tsHttpCacheSessions
;
extern
int
tsHttpSessionExpire
;
extern
int
tsHttpMaxThreads
;
extern
int
tsHttpEnableCompress
;
extern
int
tsHttpEnableRecordSql
;
extern
int
tsTelegrafUseFieldNum
;
extern
int
tsTscEnableRecordSql
;
extern
int
tsAnyIp
;
extern
char
tsMonitorDbName
[];
extern
char
tsInternalPass
[];
extern
int
tsMonitorInterval
;
extern
int
tsNumOfLogLines
;
extern
int32_t
tsHttpCacheSessions
;
extern
int32_t
tsHttpSessionExpire
;
extern
int32_t
tsHttpMaxThreads
;
extern
int32_t
tsHttpEnableCompress
;
extern
int32_t
tsHttpEnableRecordSql
;
extern
int32_t
tsTelegrafUseFieldNum
;
extern
int32_t
tsTscEnableRecordSql
;
extern
int32_t
tsAnyIp
;
extern
char
tsMonitorDbName
[];
extern
char
tsInternalPass
[];
extern
int32_t
tsMonitorInterval
;
extern
int32_t
tsAsyncLog
;
extern
int32_t
tsNumOfLogLines
;
extern
int32_t
ddebugFlag
;
extern
int32_t
mdebugFlag
;
extern
int32_t
cdebugFlag
;
...
...
src/common/src/tglobal.c
浏览文件 @
32d5fc54
...
...
@@ -74,16 +74,15 @@ int32_t tsVnodePeerHBTimer = 1; // second
int32_t
tsMgmtPeerHBTimer
=
1
;
// second
int32_t
tsMeterMetaKeepTimer
=
7200
;
// second
int32_t
tsMetricMetaKeepTimer
=
600
;
// second
int
tsRpcTimer
=
300
;
int
tsRpcMaxTime
=
600
;
// seconds;
int
32_t
tsRpcTimer
=
300
;
int
32_t
tsRpcMaxTime
=
600
;
// seconds;
float
tsNumOfThreadsPerCore
=
1
.
0
;
float
tsRatioOfQueryThreads
=
0
.
5
;
char
tsPublicIp
[
TSDB_IPv4ADDR_LEN
]
=
{
0
};
char
tsPrivateIp
[
TSDB_IPv4ADDR_LEN
]
=
{
0
};
float
tsNumOfThreadsPerCore
=
1
.
0
;
float
tsRatioOfQueryThreads
=
0
.
5
;
char
tsPublicIp
[
TSDB_IPv4ADDR_LEN
]
=
{
0
};
char
tsPrivateIp
[
TSDB_IPv4ADDR_LEN
]
=
{
0
};
int16_t
tsNumOfVnodesPerCore
=
8
;
int16_t
tsNumOfTotalVnodes
=
TSDB_INVALID_VNODE_NUM
;
int16_t
tsCheckHeaderFile
=
0
;
#ifdef _TD_ARM_32_
int32_t
tsSessionsPerVnode
=
100
;
...
...
@@ -91,26 +90,22 @@ int32_t tsSessionsPerVnode = 100;
int32_t
tsSessionsPerVnode
=
1000
;
#endif
int32_t
tsCacheBlockSize
=
16384
;
// 256 columns
int32_t
tsAverageCacheBlocks
=
TSDB_DEFAULT_AVG_BLOCKS
;
int32_t
tsMaxCacheSize
=
64
;
//64M
int16_t
tsDaysPerFile
=
10
;
int32_t
tsDaysToKeep
=
3650
;
int32_t
tsRowsInFileBlock
=
4096
;
int16_t
tsCommitTime
=
3600
;
// seconds
int32_t
tsTimePrecision
=
TSDB_TIME_PRECISION_MILLI
;
int16_t
tsCompression
=
TSDB_MAX_COMPRESSION_LEVEL
;
int16_t
tsCommitLog
=
1
;
int32_t
tsReplications
=
TSDB_REPLICA_MIN_NUM
;
/**
* Change the meaning of affected rows:
* 0: affected rows not include those duplicate records
* 1: affected rows include those duplicate records
*/
int16_t
tsAffectedRowsMod
=
0
;
int32_t
tsRowsInFileBlock
=
4096
;
float
tsFileBlockMinPercent
=
0
.
05
;
int16_t
tsNumOfBlocksPerMeter
=
100
;
int16_t
tsCommitTime
=
3600
;
// seconds
int16_t
tsCommitLog
=
1
;
int16_t
tsCompression
=
TSDB_MAX_COMPRESSION_LEVEL
;
int16_t
tsDaysPerFile
=
10
;
int32_t
tsDaysToKeep
=
3650
;
int32_t
tsReplications
=
TSDB_REPLICA_MIN_NUM
;
int32_t
tsNumOfMPeers
=
3
;
int32_t
tsMaxShellConns
=
2000
;
int32_t
tsMaxTables
=
100000
;
...
...
@@ -125,15 +120,16 @@ int32_t tsMaxVnodeConnections = 10000;
int32_t
tsBalanceMonitorInterval
=
2
;
// seconds
int32_t
tsBalanceStartInterval
=
300
;
// seconds
int32_t
tsBalancePolicy
=
0
;
// 1-use sys.montor
int32_t
tsOfflineThreshold
=
864000
;
// seconds 10days
int32_t
tsMgmtEqualVnodeNum
=
4
;
int32_t
tsEnableHttpModule
=
1
;
int32_t
tsEnableMonitorModule
=
0
;
int32_t
tsRestRowLimit
=
10240
;
int32_t
tsMaxSQLStringLen
=
TSDB_MAX_SQL_LEN
;
int32_t
tsNumOfLogLines
=
10000000
;
int32_t
mdebugFlag
=
135
;
int32_t
sdbDebugFlag
=
135
;
int32_t
ddebugFlag
=
131
;
...
...
@@ -146,7 +142,6 @@ int32_t qdebugFlag = 131;
int32_t
rpcDebugFlag
=
131
;
int32_t
uDebugFlag
=
131
;
int32_t
debugFlag
=
131
;
int
tsNumOfLogLines
=
10000000
;
// the maximum number of results for projection query on super table that are returned from
// one virtual node, to order according to timestamp
...
...
@@ -165,9 +160,6 @@ int32_t tsCompressMsgSize = -1;
// use UDP by default[option: udp, tcp]
char
tsSocketType
[
4
]
=
"udp"
;
// time precision, millisecond by default
int32_t
tsTimePrecision
=
TSDB_TIME_PRECISION_MILLI
;
// 10 ms for sliding time, the value will changed in case of time precision changed
int32_t
tsMinSlidingTime
=
10
;
...
...
@@ -747,11 +739,11 @@ static void doInitGlobalConfig() {
taosInitConfigOption
(
cfg
);
cfg
.
option
=
"cache"
;
cfg
.
ptr
=
&
ts
CacheBlock
Size
;
cfg
.
ptr
=
&
ts
MaxCache
Size
;
cfg
.
valType
=
TAOS_CFG_VTYPE_INT32
;
cfg
.
cfgType
=
TSDB_CFG_CTYPE_B_CONFIG
|
TSDB_CFG_CTYPE_B_SHOW
;
cfg
.
minValue
=
1
00
;
cfg
.
maxValue
=
10
48576
;
cfg
.
minValue
=
1
;
cfg
.
maxValue
=
10
0000
;
cfg
.
ptrLength
=
0
;
cfg
.
unitType
=
TAOS_CFG_UTYPE_BYTE
;
taosInitConfigOption
(
cfg
);
...
...
@@ -766,36 +758,6 @@ static void doInitGlobalConfig() {
cfg
.
unitType
=
TAOS_CFG_UTYPE_NONE
;
taosInitConfigOption
(
cfg
);
cfg
.
option
=
"fileBlockMinPercent"
;
cfg
.
ptr
=
&
tsFileBlockMinPercent
;
cfg
.
valType
=
TAOS_CFG_VTYPE_FLOAT
;
cfg
.
cfgType
=
TSDB_CFG_CTYPE_B_CONFIG
;
cfg
.
minValue
=
0
;
cfg
.
maxValue
=
1
.
0
;
cfg
.
ptrLength
=
0
;
cfg
.
unitType
=
TAOS_CFG_UTYPE_NONE
;
taosInitConfigOption
(
cfg
);
cfg
.
option
=
"ablocks"
;
cfg
.
ptr
=
&
tsAverageCacheBlocks
;
cfg
.
valType
=
TAOS_CFG_VTYPE_INT32
;
cfg
.
cfgType
=
TSDB_CFG_CTYPE_B_CONFIG
|
TSDB_CFG_CTYPE_B_SHOW
;
cfg
.
minValue
=
TSDB_MIN_AVG_BLOCKS
;
cfg
.
maxValue
=
TSDB_MAX_AVG_BLOCKS
;
cfg
.
ptrLength
=
0
;
cfg
.
unitType
=
TAOS_CFG_UTYPE_NONE
;
taosInitConfigOption
(
cfg
);
cfg
.
option
=
"tblocks"
;
cfg
.
ptr
=
&
tsNumOfBlocksPerMeter
;
cfg
.
valType
=
TAOS_CFG_VTYPE_INT16
;
cfg
.
cfgType
=
TSDB_CFG_CTYPE_B_CONFIG
|
TSDB_CFG_CTYPE_B_SHOW
;
cfg
.
minValue
=
32
;
cfg
.
maxValue
=
4096
;
cfg
.
ptrLength
=
0
;
cfg
.
unitType
=
TAOS_CFG_UTYPE_NONE
;
taosInitConfigOption
(
cfg
);
// login configs
cfg
.
option
=
"defaultDB"
;
cfg
.
ptr
=
tsDefaultDB
;
...
...
src/inc/taosdef.h
浏览文件 @
32d5fc54
...
...
@@ -222,9 +222,6 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
#define TSDB_MAX_MGMT_IPS (TSDB_MAX_MPEERS+1)
#define TSDB_REPLICA_MIN_NUM 1
/*
* this is defined in CMakeList.txt
*/
#define TSDB_REPLICA_MAX_NUM 3
#define TSDB_TBNAME_COLUMN_INDEX (-1)
...
...
@@ -246,8 +243,8 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
#define TSDB_MIN_ROWS_IN_FILEBLOCK 200
#define TSDB_MAX_ROWS_IN_FILEBLOCK 500000
#define TSDB_MIN_CACHE_BLOCK_SIZE 1
00
#define TSDB_MAX_CACHE_BLOCK_SIZE 10
48576
00
#define TSDB_MIN_CACHE_BLOCK_SIZE 1
#define TSDB_MAX_CACHE_BLOCK_SIZE 10
000
00
#define TSDB_MIN_CACHE_BLOCKS 100
#define TSDB_MAX_CACHE_BLOCKS 409600
...
...
src/inc/taoserror.h
浏览文件 @
32d5fc54
...
...
@@ -99,71 +99,71 @@ TAOS_DEFINE_ERROR(TSDB_CODE_NOT_ACTIVE_TABLE, 0, 205, "not active tabl
TAOS_DEFINE_ERROR
(
TSDB_CODE_TABLE_ID_MISMATCH
,
0
,
206
,
"table id mismatch"
)
// dnode & mnode
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_ENOUGH_DNODES
,
0
,
30
0
,
"no enough dnodes"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_DNODE_ALREADY_EXIST
,
0
,
30
1
,
"dnode already exist"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_DNODE_NOT_EXIST
,
0
,
30
2
,
"dnode not exist"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_MASTER
,
0
,
30
3
,
"no master"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_REMOVE_MASTER
,
0
,
30
4
,
"no remove master"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_QUERY_ID
,
0
,
30
5
,
"invalid query id"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_STREAM_ID
,
0
,
30
6
,
"invalid stream id"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_CONNECTION
,
0
,
30
7
,
"invalid connection"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_SDB_ERROR
,
0
,
30
8
,
"sdb error"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_ENOUGH_DNODES
,
0
,
25
0
,
"no enough dnodes"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_DNODE_ALREADY_EXIST
,
0
,
25
1
,
"dnode already exist"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_DNODE_NOT_EXIST
,
0
,
25
2
,
"dnode not exist"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_MASTER
,
0
,
25
3
,
"no master"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_REMOVE_MASTER
,
0
,
25
4
,
"no remove master"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_QUERY_ID
,
0
,
25
5
,
"invalid query id"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_STREAM_ID
,
0
,
25
6
,
"invalid stream id"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_CONNECTION
,
0
,
25
7
,
"invalid connection"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_SDB_ERROR
,
0
,
25
8
,
"sdb error"
)
// acct
TAOS_DEFINE_ERROR
(
TSDB_CODE_ACCT_ALREADY_EXIST
,
0
,
4
00
,
"accounts already exist"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_ACCT
,
0
,
4
01
,
"invalid account"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_ACCT_PARAMETER
,
0
,
4
02
,
"invalid account parameter"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_ACCTS
,
0
,
4
03
,
"too many accounts"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_USERS
,
0
,
4
04
,
"too many users"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_TABLES
,
0
,
4
05
,
"too many tables"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_DATABASES
,
0
,
4
06
,
"too many databases"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_TIME_SERIES
,
0
,
4
07
,
"not enough time series"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_ACCT_ALREADY_EXIST
,
0
,
3
00
,
"accounts already exist"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_ACCT
,
0
,
3
01
,
"invalid account"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_ACCT_PARAMETER
,
0
,
3
02
,
"invalid account parameter"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_ACCTS
,
0
,
3
03
,
"too many accounts"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_USERS
,
0
,
3
04
,
"too many users"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_TABLES
,
0
,
3
05
,
"too many tables"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_DATABASES
,
0
,
3
06
,
"too many databases"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TOO_MANY_TIME_SERIES
,
0
,
3
07
,
"not enough time series"
)
// grant
TAOS_DEFINE_ERROR
(
TSDB_CODE_AUTH_FAILURE
,
0
,
40
0
,
"auth failure"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_RIGHTS
,
0
,
40
1
,
"no rights"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_WRITE_ACCESS
,
0
,
40
2
,
"no write access"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_READ_ACCESS
,
0
,
40
3
,
"no read access"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_EXPIRED
,
0
,
40
4
,
"grant expired"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_DNODE_LIMITED
,
0
,
40
5
,
"grant dnode limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_ACCT_LIMITED
,
0
,
40
6
,
"grant account limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_TIMESERIES_LIMITED
,
0
,
40
7
,
"grant timeseries limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_DB_LIMITED
,
0
,
40
8
,
"grant db limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_USER_LIMITED
,
0
,
40
9
,
"grant user limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_CONN_LIMITED
,
0
,
41
0
,
"grant conn limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_STREAM_LIMITED
,
0
,
41
1
,
"grant stream limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_SPEED_LIMITED
,
0
,
41
2
,
"grant speed limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_STORAGE_LIMITED
,
0
,
41
3
,
"grant storage limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_QUERYTIME_LIMITED
,
0
,
41
4
,
"grant query time limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_CPU_LIMITED
,
0
,
41
5
,
"grant cpu limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_AUTH_FAILURE
,
0
,
35
0
,
"auth failure"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_RIGHTS
,
0
,
35
1
,
"no rights"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_WRITE_ACCESS
,
0
,
35
2
,
"no write access"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_READ_ACCESS
,
0
,
35
3
,
"no read access"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_EXPIRED
,
0
,
35
4
,
"grant expired"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_DNODE_LIMITED
,
0
,
35
5
,
"grant dnode limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_ACCT_LIMITED
,
0
,
35
6
,
"grant account limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_TIMESERIES_LIMITED
,
0
,
35
7
,
"grant timeseries limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_DB_LIMITED
,
0
,
35
8
,
"grant db limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_USER_LIMITED
,
0
,
35
9
,
"grant user limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_CONN_LIMITED
,
0
,
36
0
,
"grant conn limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_STREAM_LIMITED
,
0
,
36
1
,
"grant stream limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_SPEED_LIMITED
,
0
,
36
2
,
"grant speed limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_STORAGE_LIMITED
,
0
,
36
3
,
"grant storage limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_QUERYTIME_LIMITED
,
0
,
36
4
,
"grant query time limited"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_GRANT_CPU_LIMITED
,
0
,
36
5
,
"grant cpu limited"
)
// server
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_VGROUP_ID
,
0
,
5
00
,
"invalid vgroup id"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_VNODE_ID
,
0
,
5
01
,
"invalid vnode id"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NOT_ACTIVE_VNODE
,
0
,
5
02
,
"not active vnode"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_VG_INIT_FAILED
,
0
,
5
03
,
"vg init failed"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_SERV_NO_DISKSPACE
,
0
,
5
04
,
"server no diskspace"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_SERV_OUT_OF_MEMORY
,
0
,
5
05
,
"server out of memory"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_DISK_PERMISSIONS
,
0
,
5
06
,
"no disk permissions"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_FILE_CORRUPTED
,
0
,
5
07
,
"file corrupted"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_MEMORY_CORRUPTED
,
0
,
5
08
,
"memory corrupted"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_VGROUP_ID
,
0
,
4
00
,
"invalid vgroup id"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_VNODE_ID
,
0
,
4
01
,
"invalid vnode id"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NOT_ACTIVE_VNODE
,
0
,
4
02
,
"not active vnode"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_VG_INIT_FAILED
,
0
,
4
03
,
"vg init failed"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_SERV_NO_DISKSPACE
,
0
,
4
04
,
"server no diskspace"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_SERV_OUT_OF_MEMORY
,
0
,
4
05
,
"server out of memory"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_NO_DISK_PERMISSIONS
,
0
,
4
06
,
"no disk permissions"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_FILE_CORRUPTED
,
0
,
4
07
,
"file corrupted"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_MEMORY_CORRUPTED
,
0
,
4
08
,
"memory corrupted"
)
// client
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_CLIENT_VERSION
,
0
,
60
1
,
"invalid client version"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_CLI_OUT_OF_MEMORY
,
0
,
60
2
,
"client out of memory"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_CLI_NO_DISKSPACE
,
0
,
60
3
,
"client no disk space"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_TIME_STAMP
,
0
,
60
4
,
"invalid timestamp"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_SQL
,
0
,
60
5
,
"invalid sql"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_QUERY_CACHE_ERASED
,
0
,
60
6
,
"query cache erased"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_QUERY_MSG
,
0
,
60
7
,
"invalid query message"
)
// failed to validate the sql expression msg by vnode
TAOS_DEFINE_ERROR
(
TSDB_CODE_SORTED_RES_TOO_MANY
,
0
,
60
8
,
"sorted res too many"
)
// too many result for ordered super table projection query
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_QHANDLE
,
0
,
60
9
,
"invalid handle"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_QUERY_CANCELLED
,
0
,
61
0
,
"query cancelled"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_IE
,
0
,
61
1
,
"invalid ie"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_VALUE
,
0
,
61
2
,
"invalid value"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_CLIENT_VERSION
,
0
,
45
1
,
"invalid client version"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_CLI_OUT_OF_MEMORY
,
0
,
45
2
,
"client out of memory"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_CLI_NO_DISKSPACE
,
0
,
45
3
,
"client no disk space"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_TIME_STAMP
,
0
,
45
4
,
"invalid timestamp"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_SQL
,
0
,
45
5
,
"invalid sql"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_QUERY_CACHE_ERASED
,
0
,
45
6
,
"query cache erased"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_QUERY_MSG
,
0
,
45
7
,
"invalid query message"
)
// failed to validate the sql expression msg by vnode
TAOS_DEFINE_ERROR
(
TSDB_CODE_SORTED_RES_TOO_MANY
,
0
,
45
8
,
"sorted res too many"
)
// too many result for ordered super table projection query
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_QHANDLE
,
0
,
45
9
,
"invalid handle"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_QUERY_CANCELLED
,
0
,
46
0
,
"query cancelled"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_IE
,
0
,
46
1
,
"invalid ie"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_VALUE
,
0
,
46
2
,
"invalid value"
)
// others
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_FILE_FORMAT
,
0
,
7
00
,
"invalid file format"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_INVALID_FILE_FORMAT
,
0
,
5
00
,
"invalid file format"
)
#ifdef TAOS_ERROR_C
...
...
src/mnode/inc/mgmtDef.h
浏览文件 @
32d5fc54
...
...
@@ -29,32 +29,6 @@ struct SAcctObj;
struct
SUserObj
;
struct
SMnodeObj
;
typedef
struct
{
char
acct
[
TSDB_USER_LEN
];
char
db
[
TSDB_DB_NAME_LEN
];
uint32_t
vgId
;
int32_t
maxSessions
;
int32_t
cacheBlockSize
;
union
{
int32_t
totalBlocks
;
float
fraction
;
}
cacheNumOfBlocks
;
int32_t
daysPerFile
;
int32_t
daysToKeep1
;
int32_t
daysToKeep2
;
int32_t
daysToKeep
;
int32_t
commitTime
;
int32_t
rowsInFileBlock
;
int16_t
blocksPerTable
;
int8_t
compression
;
int8_t
commitLog
;
int8_t
replications
;
int8_t
repStrategy
;
int8_t
loadLatest
;
// load into mem or not
uint8_t
precision
;
// time resolution
int8_t
reserved
[
16
];
}
SDbCfg
;
typedef
struct
SDnodeObj
{
int32_t
dnodeId
;
uint32_t
privateIp
;
...
...
@@ -168,12 +142,30 @@ typedef struct SVgObj {
SChildTableObj
**
tableList
;
}
SVgObj
;
typedef
struct
{
int64_t
maxCacheSize
;
int32_t
maxTables
;
int32_t
daysPerFile
;
int32_t
daysToKeep
;
int32_t
daysToKeep1
;
int32_t
daysToKeep2
;
int32_t
minRowsPerFileBlock
;
// minimum rows per file block
int32_t
maxRowsPerFileBlock
;
// maximum rows per file block
int32_t
commitTime
;
int8_t
precision
;
int8_t
compression
;
int8_t
commitLog
;
int8_t
replications
;
int8_t
reserved
[
16
];
}
SDbCfg
;
typedef
struct
SDbObj
{
char
name
[
TSDB_DB_NAME_LEN
+
1
];
int8_t
status
;
char
acct
[
TSDB_USER_LEN
+
1
]
;
int64_t
createdTime
;
SDbCfg
cfg
;
int8_t
reserved
[
15
];
int8_t
status
;
int8_t
reserved
[
14
];
int8_t
updateEnd
[
1
];
int32_t
refCount
;
int32_t
numOfVgroups
;
...
...
src/mnode/src/mgmtDb.c
浏览文件 @
32d5fc54
...
...
@@ -54,7 +54,7 @@ static int32_t mgmtDbActionDestroy(SSdbOper *pOper) {
static
int32_t
mgmtDbActionInsert
(
SSdbOper
*
pOper
)
{
SDbObj
*
pDb
=
pOper
->
pObj
;
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
cfg
.
acct
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
acct
);
pDb
->
pHead
=
NULL
;
pDb
->
pTail
=
NULL
;
...
...
@@ -67,7 +67,7 @@ static int32_t mgmtDbActionInsert(SSdbOper *pOper) {
mgmtDecAcctRef
(
pAcct
);
}
else
{
mError
(
"db:%s, acct:%s info not exist in sdb"
,
pDb
->
name
,
pDb
->
cfg
.
acct
);
mError
(
"db:%s, acct:%s info not exist in sdb"
,
pDb
->
name
,
pDb
->
acct
);
return
TSDB_CODE_INVALID_ACCT
;
}
...
...
@@ -76,7 +76,7 @@ static int32_t mgmtDbActionInsert(SSdbOper *pOper) {
static
int32_t
mgmtDbActionDelete
(
SSdbOper
*
pOper
)
{
SDbObj
*
pDb
=
pOper
->
pObj
;
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
cfg
.
acct
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
acct
);
mgmtDropDbFromAcct
(
pAcct
,
pDb
);
mgmtDropAllChildTables
(
pDb
);
...
...
@@ -176,132 +176,108 @@ SDbObj *mgmtGetDbByTableId(char *tableId) {
return
(
SDbObj
*
)
sdbGetRow
(
tsDbSdb
,
db
);
}
static
int32_t
mgmtCheckD
BParams
(
SCMCreateDbMsg
*
pCreate
)
{
if
(
pC
reate
->
commitLog
<
0
||
pCreate
->
commitLog
>
2
)
{
mError
(
"invalid db option
commitLog: %d, only 0-2 allowed"
,
pCreate
->
commitLog
);
return
TSDB_CODE_INVALID_OPTION
;
static
int32_t
mgmtCheckD
bCfg
(
SDbCfg
*
pCfg
)
{
if
(
pC
fg
->
maxCacheSize
<
TSDB_MIN_CACHE_BLOCK_SIZE
||
pCfg
->
maxCacheSize
>
TSDB_MAX_CACHE_BLOCK_SIZE
)
{
mError
(
"invalid db option
maxCacheSize:%d valid range: [%d, %d]"
,
pCfg
->
maxCacheSize
,
TSDB_MIN_CACHE_BLOCK_SIZE
,
TSDB_MAX_CACHE_BLOCK_SIZE
)
;
}
if
(
pC
reate
->
replications
<
TSDB_REPLICA_MIN_NUM
||
pCreate
->
replications
>
TSDB_REPLICA_MAX_NUM
)
{
mError
(
"invalid db option
replications: %d valid range: [%d, %d]"
,
pCreate
->
replications
,
TSDB_REPLICA_MIN_NUM
,
TSDB_
REPLICA_MAX_NUM
);
if
(
pC
fg
->
maxTables
<
TSDB_MIN_TABLES_PER_VNODE
||
pCfg
->
maxTables
>
TSDB_MAX_TABLES_PER_VNODE
)
{
mError
(
"invalid db option
maxTables:%d valid range: [%d, %d]"
,
pCfg
->
maxTables
,
TSDB_MIN_TABLES_PER_VNODE
,
TSDB_
MAX_TABLES_PER_VNODE
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pC
reate
->
daysPerFile
<
TSDB_FILE_MIN_PARTITION_RANGE
||
pCreate
->
daysPerFile
>
TSDB_FILE_MAX_PARTITION_RANGE
)
{
mError
(
"invalid db option daysPerFile:
%d valid range: [%d, %d]"
,
pCreate
->
daysPerFile
,
TSDB_FILE_MIN_PARTITION_RANGE
,
if
(
pC
fg
->
daysPerFile
<
TSDB_FILE_MIN_PARTITION_RANGE
||
pCfg
->
daysPerFile
>
TSDB_FILE_MAX_PARTITION_RANGE
)
{
mError
(
"invalid db option daysPerFile:
%d valid range: [%d, %d]"
,
pCfg
->
daysPerFile
,
TSDB_FILE_MIN_PARTITION_RANGE
,
TSDB_FILE_MAX_PARTITION_RANGE
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pCreate
->
daysToKeep1
>
pCreate
->
daysToKeep2
||
pCreate
->
daysToKeep2
>
pCreate
->
daysToKeep
)
{
mError
(
"invalid db option daystokeep1: %d, daystokeep2: %d, daystokeep: %d"
,
pCreate
->
daysToKeep1
,
pCreate
->
daysToKeep2
,
pCreate
->
daysToKeep
);
if
(
pCfg
->
daysToKeep1
<
TSDB_FILE_MIN_PARTITION_RANGE
||
pCfg
->
daysToKeep1
<
pCfg
->
daysPerFile
)
{
mError
(
"invalid db option daystokeep:%d"
,
pCfg
->
daysToKeep
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pCreate
->
daysToKeep1
<
TSDB_FILE_MIN_PARTITION_RANGE
||
pCreate
->
daysToKeep1
<
pCreate
->
daysPerFile
)
{
mError
(
"invalid db option daystokeep: %d"
,
pCreate
->
daysToKeep
);
if
(
pCfg
->
daysToKeep2
>
pCfg
->
daysToKeep
||
pCfg
->
daysToKeep2
<
pCfg
->
daysToKeep1
)
{
mError
(
"invalid db option daystokeep1:%d, daystokeep2:%d, daystokeep:%d"
,
pCfg
->
daysToKeep1
,
pCfg
->
daysToKeep2
,
pCfg
->
daysToKeep
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pCfg
->
minRowsPerFileBlock
<
TSDB_MIN_ROWS_IN_FILEBLOCK
||
pCfg
->
minRowsPerFileBlock
>
TSDB_MAX_ROWS_IN_FILEBLOCK
)
{
mError
(
"invalid db option minRowsPerFileBlock:%d valid range: [%d, %d]"
,
pCfg
->
minRowsPerFileBlock
,
TSDB_MIN_ROWS_IN_FILEBLOCK
,
TSDB_MAX_ROWS_IN_FILEBLOCK
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pC
reate
->
rowsInFileBlock
<
TSDB_MIN_ROWS_IN_FILEBLOCK
||
pCreate
->
rowsIn
FileBlock
>
TSDB_MAX_ROWS_IN_FILEBLOCK
)
{
mError
(
"invalid db option
rowsInFileBlock: %d valid range: [%d, %d]"
,
pCreate
->
rowsIn
FileBlock
,
if
(
pC
fg
->
maxRowsPerFileBlock
<
TSDB_MIN_ROWS_IN_FILEBLOCK
||
pCfg
->
maxRowsPer
FileBlock
>
TSDB_MAX_ROWS_IN_FILEBLOCK
)
{
mError
(
"invalid db option
maxRowsPerFileBlock:%d valid range: [%d, %d]"
,
pCfg
->
maxRowsPer
FileBlock
,
TSDB_MIN_ROWS_IN_FILEBLOCK
,
TSDB_MAX_ROWS_IN_FILEBLOCK
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pC
reate
->
cacheBlockSize
<
TSDB_MIN_CACHE_BLOCK_SIZE
||
pCreate
->
cacheBlockSize
>
TSDB_MAX_CACHE_BLOCK_SIZE
)
{
mError
(
"invalid db option
cacheBlockSize: %d valid range: [%d, %d]"
,
pCreate
->
cacheBlockSize
,
TSDB_MIN_CACHE_BLOCK_SIZE
,
TSDB_MAX_CACHE_BLOCK_SIZE
);
if
(
pC
fg
->
maxRowsPerFileBlock
<
pCfg
->
minRowsPerFileBlock
)
{
mError
(
"invalid db option
minRowsPerFileBlock:%d maxRowsPerFileBlock:%d"
,
pCfg
->
minRowsPerFileBlock
,
pCfg
->
maxRowsPerFileBlock
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pC
reate
->
maxSessions
<
TSDB_MIN_TABLES_PER_VNODE
||
pCreate
->
maxSessions
>
TSDB_MAX_TABLES_PER_VNODE
)
{
mError
(
"invalid db option
maxSessions: %d valid range: [%d, %d]"
,
pCreate
->
maxSessions
,
TSDB_MIN_TABLES_PER_VNODE
,
TSDB_MAX_
TABLES_PER_VNODE
);
if
(
pC
fg
->
commitTime
<
TSDB_MIN_COMMIT_TIME_INTERVAL
||
pCfg
->
commitTime
>
TSDB_MAX_COMMIT_TIME_INTERVAL
)
{
mError
(
"invalid db option
commitTime:%d valid range: [%d, %d]"
,
pCfg
->
commitTime
,
TSDB_MIN_COMMIT_TIME_INTERVAL
,
TSDB_MAX_
COMMIT_TIME_INTERVAL
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pC
reate
->
precision
!=
TSDB_TIME_PRECISION_MILLI
&&
pCreate
->
precision
!=
TSDB_TIME_PRECISION_MICRO
)
{
mError
(
"invalid db option timePrecision:
%d valid value: [%d, %d]"
,
pCreate
->
precision
,
TSDB_TIME_PRECISION_MILLI
,
if
(
pC
fg
->
precision
!=
TSDB_TIME_PRECISION_MILLI
&&
pCfg
->
precision
!=
TSDB_TIME_PRECISION_MICRO
)
{
mError
(
"invalid db option timePrecision:
%d valid value: [%d, %d]"
,
pCfg
->
precision
,
TSDB_TIME_PRECISION_MILLI
,
TSDB_TIME_PRECISION_MICRO
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pCreate
->
cacheNumOfBlocks
.
fraction
<
TSDB_MIN_AVG_BLOCKS
||
pCreate
->
cacheNumOfBlocks
.
fraction
>
TSDB_MAX_AVG_BLOCKS
)
{
mError
(
"invalid db option ablocks: %f valid value: [%d, %d]"
,
pCreate
->
cacheNumOfBlocks
.
fraction
,
0
,
TSDB_MAX_AVG_BLOCKS
);
if
(
pCfg
->
compression
<
TSDB_MIN_COMPRESSION_LEVEL
||
pCfg
->
compression
>
TSDB_MAX_COMPRESSION_LEVEL
)
{
mError
(
"invalid db option compression:%d valid range: [%d, %d]"
,
pCfg
->
compression
,
TSDB_MIN_COMPRESSION_LEVEL
,
TSDB_MAX_COMPRESSION_LEVEL
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pCreate
->
commitTime
<
TSDB_MIN_COMMIT_TIME_INTERVAL
||
pCreate
->
commitTime
>
TSDB_MAX_COMMIT_TIME_INTERVAL
)
{
mError
(
"invalid db option commitTime: %d valid range: [%d, %d]"
,
pCreate
->
commitTime
,
TSDB_MIN_COMMIT_TIME_INTERVAL
,
TSDB_MAX_COMMIT_TIME_INTERVAL
);
if
(
pCfg
->
commitLog
<
0
||
pCfg
->
commitLog
>
2
)
{
mError
(
"invalid db option commitLog:%d, only 0-2 allowed"
,
pCfg
->
commitLog
);
return
TSDB_CODE_INVALID_OPTION
;
}
if
(
pC
reate
->
compression
<
TSDB_MIN_COMPRESSION_LEVEL
||
pCreate
->
compression
>
TSDB_MAX_COMPRESSION_LEVEL
)
{
mError
(
"invalid db option
compression: %d valid range: [%d, %d]"
,
pCreate
->
compression
,
TSDB_MIN_COMPRESSION_LEVEL
,
TSDB_
MAX_COMPRESSION_LEVEL
);
if
(
pC
fg
->
replications
<
TSDB_REPLICA_MIN_NUM
||
pCfg
->
replications
>
TSDB_REPLICA_MAX_NUM
)
{
mError
(
"invalid db option
replications:%d valid range: [%d, %d]"
,
pCfg
->
replications
,
TSDB_REPLICA_MIN_NUM
,
TSDB_
REPLICA_MAX_NUM
);
return
TSDB_CODE_INVALID_OPTION
;
}
return
TSDB_CODE_SUCCESS
;
}
static
int32_t
mgmtCheckDbParams
(
SCMCreateDbMsg
*
pCreate
)
{
// assign default parameters
if
(
pCreate
->
maxSessions
<
0
)
pCreate
->
maxSessions
=
tsSessionsPerVnode
;
if
(
pCreate
->
cacheBlockSize
<
0
)
pCreate
->
cacheBlockSize
=
tsCacheBlockSize
;
if
(
pCreate
->
daysPerFile
<
0
)
pCreate
->
daysPerFile
=
tsDaysPerFile
;
if
(
pCreate
->
daysToKeep
<
0
)
pCreate
->
daysToKeep
=
tsDaysToKeep
;
if
(
pCreate
->
daysToKeep1
<
0
)
pCreate
->
daysToKeep1
=
pCreate
->
daysToKeep
;
if
(
pCreate
->
daysToKeep2
<
0
)
pCreate
->
daysToKeep2
=
pCreate
->
daysToKeep
;
if
(
pCreate
->
commitTime
<
0
)
pCreate
->
commitTime
=
tsCommitTime
;
if
(
pCreate
->
compression
<
0
)
pCreate
->
compression
=
tsCompression
;
if
(
pCreate
->
commitLog
<
0
)
pCreate
->
commitLog
=
tsCommitLog
;
if
(
pCreate
->
replications
<
0
)
pCreate
->
replications
=
tsReplications
;
//
if
(
pCreate
->
rowsInFileBlock
<
0
)
pCreate
->
rowsInFileBlock
=
tsRowsInFileBlock
;
//
if
(
pCreate
->
cacheNumOfBlocks
.
fraction
<
0
)
pCreate
->
cacheNumOfBlocks
.
fraction
=
tsAverageCacheBlocks
;
//
if
(
mgmtCheckDBParams
(
pCreate
)
!=
TSDB_CODE_SUCCESS
)
{
return
TSDB_CODE_INVALID_OPTION
;
}
pCreate
->
cacheNumOfBlocks
.
totalBlocks
=
(
int32_t
)(
pCreate
->
cacheNumOfBlocks
.
fraction
*
pCreate
->
maxSessions
);
if
(
pCreate
->
cacheNumOfBlocks
.
totalBlocks
>
TSDB_MAX_CACHE_BLOCKS
)
{
mTrace
(
"invalid db option cacheNumOfBlocks: %d valid range: [%d, %d]"
,
pCreate
->
cacheNumOfBlocks
.
totalBlocks
,
TSDB_MIN_CACHE_BLOCKS
,
TSDB_MAX_CACHE_BLOCKS
);
return
TSDB_CODE_INVALID_OPTION
;
}
// calculate the blocks per table
if
(
pCreate
->
blocksPerTable
<
0
)
{
pCreate
->
blocksPerTable
=
pCreate
->
cacheNumOfBlocks
.
totalBlocks
/
4
;
}
if
(
pCreate
->
blocksPerTable
>
pCreate
->
cacheNumOfBlocks
.
totalBlocks
*
3
/
4
)
{
pCreate
->
blocksPerTable
=
pCreate
->
cacheNumOfBlocks
.
totalBlocks
*
3
/
4
;
}
if
(
pCreate
->
blocksPerTable
<
TSDB_MIN_AVG_BLOCKS
)
{
pCreate
->
blocksPerTable
=
TSDB_MIN_AVG_BLOCKS
;
}
return
TSDB_CODE_SUCCESS
;
static
void
mgmtSetDefaultDbCfg
(
SDbCfg
*
pCfg
)
{
if
(
pCfg
->
maxCacheSize
<
0
)
pCfg
->
maxCacheSize
=
tsMaxCacheSize
;
if
(
pCfg
->
maxTables
<
0
)
pCfg
->
maxTables
=
tsSessionsPerVnode
;
if
(
pCfg
->
daysPerFile
<
0
)
pCfg
->
daysPerFile
=
tsDaysPerFile
;
if
(
pCfg
->
daysToKeep
<
0
)
pCfg
->
daysToKeep
=
tsDaysToKeep
;
if
(
pCfg
->
daysToKeep1
<
0
)
pCfg
->
daysToKeep1
=
pCfg
->
daysToKeep
;
if
(
pCfg
->
daysToKeep2
<
0
)
pCfg
->
daysToKeep2
=
pCfg
->
daysToKeep
;
if
(
pCfg
->
minRowsPerFileBlock
<
0
)
pCfg
->
minRowsPerFileBlock
=
tsRowsInFileBlock
;
if
(
pCfg
->
maxRowsPerFileBlock
<
0
)
pCfg
->
maxRowsPerFileBlock
=
pCfg
->
minRowsPerFileBlock
*
2
;
if
(
pCfg
->
commitTime
<
0
)
pCfg
->
commitTime
=
tsCommitTime
;
if
(
pCfg
->
precision
<
0
)
pCfg
->
precision
=
tsTimePrecision
;
if
(
pCfg
->
compression
<
0
)
pCfg
->
compression
=
tsCompression
;
if
(
pCfg
->
commitLog
<
0
)
pCfg
->
commitLog
=
tsCommitLog
;
if
(
pCfg
->
replications
<
0
)
pCfg
->
replications
=
tsReplications
;
}
static
int32_t
mgmtCreateDb
(
SAcctObj
*
pAcct
,
SCMCreateDbMsg
*
pCreate
)
{
int32_t
code
=
acctCheck
(
pAcct
,
ACCT_GRANT_DB
);
if
(
code
!=
0
)
{
return
code
;
}
if
(
code
!=
0
)
return
code
;
SDbObj
*
pDb
=
mgmtGetDb
(
pCreate
->
db
);
if
(
pDb
!=
NULL
)
{
mgmtDecDbRef
(
pDb
);
mgmtDecDbRef
(
pDb
);
if
(
pCreate
->
ignoreExist
)
{
return
TSDB_CODE_SUCCESS
;
}
else
{
...
...
@@ -309,50 +285,41 @@ static int32_t mgmtCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate) {
}
}
code
=
mgmtCheckDbParams
(
pCreate
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
return
code
;
assert
(
pCreate
->
daysToKeep1
<=
pCreate
->
daysToKeep2
&&
pCreate
->
daysToKeep2
<=
pCreate
->
daysToKeep
);
code
=
grantCheck
(
TSDB_GRANT_DB
);
if
(
code
!=
0
)
{
return
code
;
}
if
(
code
!=
0
)
return
code
;
pDb
=
calloc
(
1
,
sizeof
(
SDbObj
));
strncpy
(
pDb
->
name
,
pCreate
->
db
,
TSDB_DB_NAME_LEN
);
strncpy
(
pCreate
->
acct
,
pAcct
->
user
,
TSDB_USER_LEN
);
pDb
->
createdTime
=
taosGetTimestampMs
();
strncpy
(
pDb
->
acct
,
pAcct
->
user
,
TSDB_USER_LEN
);
pDb
->
createdTime
=
taosGetTimestampMs
();
pDb
->
cfg
=
(
SDbCfg
)
{
.
vgId
=
pCreate
->
vgId
,
.
precision
=
pCreate
->
precision
,
.
maxSessions
=
pCreate
->
maxSessions
,
.
cacheNumOfBlocks
.
totalBlocks
=
pCreate
->
cacheNumOfBlocks
.
totalBlocks
,
.
rowsInFileBlock
=
pCreate
->
rowsInFileBlock
,
.
commitLog
=
pCreate
->
commitLog
,
.
replications
=
pCreate
->
replications
,
.
daysPerFile
=
pCreate
->
daysPerFile
,
.
cacheBlockSize
=
pCreate
->
cacheBlockSize
,
.
commitTime
=
pCreate
->
commitTime
,
.
blocksPerTable
=
pCreate
->
blocksPerTable
,
.
compression
=
pCreate
->
compression
,
.
daysToKeep
=
pCreate
->
daysToKeep
,
.
daysToKeep1
=
pCreate
->
daysToKeep1
,
.
daysToKeep2
=
pCreate
->
daysToKeep2
,
.
loadLatest
=
pCreate
->
loadLatest
,
.
repStrategy
=
pCreate
->
repStrategy
,
.
maxCacheSize
=
64
,
//(int64_t)pCreate->cacheBlockSize * pCreate->cacheNumOfBlocks.totalBlocks,
.
maxTables
=
pCreate
->
maxSessions
,
.
daysPerFile
=
pCreate
->
daysPerFile
,
.
daysToKeep
=
pCreate
->
daysToKeep
,
.
daysToKeep1
=
pCreate
->
daysToKeep1
,
.
daysToKeep2
=
pCreate
->
daysToKeep2
,
.
minRowsPerFileBlock
=
pCreate
->
rowsInFileBlock
*
1
,
.
maxRowsPerFileBlock
=
pCreate
->
rowsInFileBlock
*
2
,
.
commitTime
=
pCreate
->
commitTime
,
.
precision
=
pCreate
->
precision
,
.
compression
=
pCreate
->
compression
,
.
commitLog
=
pCreate
->
commitLog
,
.
replications
=
pCreate
->
replications
};
strncpy
(
pDb
->
cfg
.
db
,
pCreate
->
db
,
TSDB_DB_NAME_LEN
);
strncpy
(
pDb
->
cfg
.
acct
,
pCreate
->
acct
,
TSDB_USER_LEN
);
mgmtSetDefaultDbCfg
(
&
pDb
->
cfg
);
code
=
mgmtCheckDbCfg
(
&
pDb
->
cfg
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
tfree
(
pDb
);
return
code
;
}
SSdbOper
oper
=
{
.
type
=
SDB_OPER_GLOBAL
,
.
table
=
tsDbSdb
,
.
pObj
=
pDb
,
.
type
=
SDB_OPER_GLOBAL
,
.
table
=
tsDbSdb
,
.
pObj
=
pDb
,
.
rowSize
=
sizeof
(
SDbObj
),
};
...
...
@@ -498,19 +465,7 @@ static int32_t mgmtGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn)
pShow
->
bytes
[
cols
]
=
4
;
pSchema
[
cols
].
type
=
TSDB_DATA_TYPE_INT
;
strcpy
(
pSchema
[
cols
].
name
,
"cache(b)"
);
pSchema
[
cols
].
bytes
=
htons
(
pShow
->
bytes
[
cols
]);
cols
++
;
pShow
->
bytes
[
cols
]
=
4
;
pSchema
[
cols
].
type
=
TSDB_DATA_TYPE_FLOAT
;
strcpy
(
pSchema
[
cols
].
name
,
"ablocks"
);
pSchema
[
cols
].
bytes
=
htons
(
pShow
->
bytes
[
cols
]);
cols
++
;
pShow
->
bytes
[
cols
]
=
2
;
pSchema
[
cols
].
type
=
TSDB_DATA_TYPE_SMALLINT
;
strcpy
(
pSchema
[
cols
].
name
,
"tblocks"
);
strcpy
(
pSchema
[
cols
].
name
,
"cache(Mb)"
);
pSchema
[
cols
].
bytes
=
htons
(
pShow
->
bytes
[
cols
]);
cols
++
;
...
...
@@ -625,27 +580,15 @@ static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *
if
(
strcmp
(
pUser
->
user
,
"root"
)
==
0
)
{
#endif
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
*
(
int32_t
*
)
pWrite
=
pDb
->
cfg
.
maxSessions
;
// table num can be created should minus 1
cols
++
;
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
*
(
int32_t
*
)
pWrite
=
pDb
->
cfg
.
rowsInFileBlock
;
cols
++
;
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
*
(
int32_t
*
)
pWrite
=
pDb
->
cfg
.
cacheBlockSize
;
*
(
int32_t
*
)
pWrite
=
pDb
->
cfg
.
maxTables
;
// table num can be created should minus 1
cols
++
;
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
#ifdef _TD_ARM_32_
*
(
int32_t
*
)
pWrite
=
(
pDb
->
cfg
.
cacheNumOfBlocks
.
totalBlocks
*
1
.
0
/
(
pDb
->
cfg
.
maxSessions
));
#else
*
(
float
*
)
pWrite
=
(
pDb
->
cfg
.
cacheNumOfBlocks
.
totalBlocks
*
1
.
0
/
(
pDb
->
cfg
.
maxSessions
));
#endif
*
(
int32_t
*
)
pWrite
=
pDb
->
cfg
.
minRowsPerFileBlock
;
cols
++
;
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
*
(
int
16_t
*
)
pWrite
=
pDb
->
cfg
.
blocksPerTabl
e
;
*
(
int
32_t
*
)
pWrite
=
pDb
->
cfg
.
maxCacheSiz
e
;
cols
++
;
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
...
...
@@ -747,7 +690,7 @@ static void mgmtProcessCreateDbMsg(SQueuedMsg *pMsg) {
static
SDbCfg
mgmtGetAlterDbOption
(
SDbObj
*
pDb
,
SCMAlterDbMsg
*
pAlter
)
{
SDbCfg
newCfg
=
pDb
->
cfg
;
int32_t
daysToKeep
=
htonl
(
pAlter
->
daysToKeep
);
int32_t
max
Session
s
=
htonl
(
pAlter
->
maxSessions
);
int32_t
max
Table
s
=
htonl
(
pAlter
->
maxSessions
);
int8_t
replications
=
pAlter
->
replications
;
terrno
=
TSDB_CODE_SUCCESS
;
...
...
@@ -755,25 +698,28 @@ static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
if
(
daysToKeep
>
0
&&
daysToKeep
!=
pDb
->
cfg
.
daysToKeep
)
{
mTrace
(
"db:%s, daysToKeep:%d change to %d"
,
pDb
->
name
,
pDb
->
cfg
.
daysToKeep
,
daysToKeep
);
newCfg
.
daysToKeep
=
daysToKeep
;
}
else
if
(
replications
>
0
&&
replications
!=
pDb
->
cfg
.
replications
)
{
}
if
(
replications
>
0
&&
replications
!=
pDb
->
cfg
.
replications
)
{
mTrace
(
"db:%s, replica:%d change to %d"
,
pDb
->
name
,
pDb
->
cfg
.
replications
,
replications
);
if
(
replications
<
TSDB_REPLICA_MIN_NUM
||
replications
>
TSDB_REPLICA_MAX_NUM
)
{
mError
(
"invalid db option replica: %d valid range: %d--%d"
,
replications
,
TSDB_REPLICA_MIN_NUM
,
TSDB_REPLICA_MAX_NUM
);
terrno
=
TSDB_CODE_INVALID_OPTION
;
}
newCfg
.
replications
=
replications
;
}
else
if
(
maxSessions
>
0
&&
maxSessions
!=
pDb
->
cfg
.
maxSessions
)
{
mTrace
(
"db:%s, tables:%d change to %d"
,
pDb
->
name
,
pDb
->
cfg
.
maxSessions
,
maxSessions
);
if
(
maxSessions
<
TSDB_MIN_TABLES_PER_VNODE
||
maxSessions
>
TSDB_MAX_TABLES_PER_VNODE
)
{
mError
(
"invalid db option tables: %d valid range: %d--%d"
,
maxSessions
,
TSDB_MIN_TABLES_PER_VNODE
,
TSDB_MAX_TABLES_PER_VNODE
);
}
if
(
maxTables
>
0
&&
maxTables
!=
pDb
->
cfg
.
maxTables
)
{
mTrace
(
"db:%s, tables:%d change to %d"
,
pDb
->
name
,
pDb
->
cfg
.
maxTables
,
maxTables
);
if
(
maxTables
<
TSDB_MIN_TABLES_PER_VNODE
||
maxTables
>
TSDB_MAX_TABLES_PER_VNODE
)
{
mError
(
"invalid db option tables: %d valid range: %d--%d"
,
maxTables
,
TSDB_MIN_TABLES_PER_VNODE
,
TSDB_MAX_TABLES_PER_VNODE
);
terrno
=
TSDB_CODE_INVALID_OPTION
;
}
if
(
max
Sessions
<
pDb
->
cfg
.
maxSession
s
)
{
mError
(
"invalid db option tables: %d should larger than original:%d"
,
max
Sessions
,
pDb
->
cfg
.
maxSession
s
);
if
(
max
Tables
<
pDb
->
cfg
.
maxTable
s
)
{
mError
(
"invalid db option tables: %d should larger than original:%d"
,
max
Tables
,
pDb
->
cfg
.
maxTable
s
);
terrno
=
TSDB_CODE_INVALID_OPTION
;
}
newCfg
.
maxSessions
=
maxSessions
;
}
else
{
newCfg
.
maxTables
=
maxTables
;
}
return
newCfg
;
...
...
src/mnode/src/mgmtShell.c
浏览文件 @
32d5fc54
...
...
@@ -364,7 +364,7 @@ static void mgmtProcessHeartBeatMsg(SQueuedMsg *pMsg) {
}
static
int
mgmtShellRetriveAuth
(
char
*
user
,
char
*
spi
,
char
*
encrypt
,
char
*
secret
,
char
*
ckey
)
{
*
spi
=
0
;
*
spi
=
1
;
*
encrypt
=
0
;
*
ckey
=
0
;
...
...
src/mnode/src/mgmtTable.c
浏览文件 @
32d5fc54
...
...
@@ -106,9 +106,9 @@ static int32_t mgmtChildTableActionInsert(SSdbOper *pOper) {
}
mgmtDecDbRef
(
pDb
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
cfg
.
acct
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
acct
);
if
(
pAcct
==
NULL
)
{
mError
(
"ctable:%s, acct:%s not exists"
,
pTable
->
info
.
tableId
,
pDb
->
cfg
.
acct
);
mError
(
"ctable:%s, acct:%s not exists"
,
pTable
->
info
.
tableId
,
pDb
->
acct
);
return
TSDB_CODE_INVALID_ACCT
;
}
mgmtDecAcctRef
(
pAcct
);
...
...
@@ -148,9 +148,9 @@ static int32_t mgmtChildTableActionDelete(SSdbOper *pOper) {
}
mgmtDecDbRef
(
pDb
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
cfg
.
acct
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
acct
);
if
(
pAcct
==
NULL
)
{
mError
(
"ctable:%s, acct:%s not exists"
,
pTable
->
info
.
tableId
,
pDb
->
cfg
.
acct
);
mError
(
"ctable:%s, acct:%s not exists"
,
pTable
->
info
.
tableId
,
pDb
->
acct
);
return
TSDB_CODE_INVALID_ACCT
;
}
mgmtDecAcctRef
(
pAcct
);
...
...
@@ -929,7 +929,7 @@ static int32_t mgmtAddSuperTableColumn(SDbObj *pDb, SSuperTableObj *pStable, SSc
pStable
->
numOfColumns
+=
ncols
;
pStable
->
sversion
++
;
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
cfg
.
acct
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
acct
);
if
(
pAcct
!=
NULL
)
{
pAcct
->
acctInfo
.
numOfTimeSeries
+=
(
ncols
*
pStable
->
numOfTables
);
mgmtDecAcctRef
(
pAcct
);
...
...
@@ -966,7 +966,7 @@ static int32_t mgmtDropSuperTableColumn(SDbObj *pDb, SSuperTableObj *pStable, ch
int32_t
schemaSize
=
sizeof
(
SSchema
)
*
(
pStable
->
numOfTags
+
pStable
->
numOfColumns
);
pStable
->
schema
=
realloc
(
pStable
->
schema
,
schemaSize
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
cfg
.
acct
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
acct
);
if
(
pAcct
!=
NULL
)
{
pAcct
->
acctInfo
.
numOfTimeSeries
-=
pStable
->
numOfTables
;
mgmtDecAcctRef
(
pAcct
);
...
...
@@ -1218,7 +1218,7 @@ static void mgmtProcessSuperTableVgroupMsg(SQueuedMsg *pMsg) {
}
static
void
mgmtProcessDropSuperTableRsp
(
SRpcMsg
*
rpcMsg
)
{
mTrace
(
"drop stable rsp received, handle:%p code:%
d"
,
rpcMsg
->
handle
,
rpcMsg
->
code
);
mTrace
(
"drop stable rsp received, handle:%p code:%
s"
,
rpcMsg
->
handle
,
tstrerror
(
rpcMsg
->
code
)
);
}
static
void
*
mgmtBuildCreateChildTableMsg
(
SCMCreateTableMsg
*
pMsg
,
SChildTableObj
*
pTable
)
{
...
...
@@ -1505,7 +1505,7 @@ static int32_t mgmtAddNormalTableColumn(SDbObj *pDb, SChildTableObj *pTable, SSc
pTable
->
numOfColumns
+=
ncols
;
pTable
->
sversion
++
;
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
cfg
.
acct
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
acct
);
if
(
pAcct
!=
NULL
)
{
pAcct
->
acctInfo
.
numOfTimeSeries
+=
ncols
;
mgmtDecAcctRef
(
pAcct
);
...
...
@@ -1539,7 +1539,7 @@ static int32_t mgmtDropNormalTableColumn(SDbObj *pDb, SChildTableObj *pTable, ch
pTable
->
numOfColumns
--
;
pTable
->
sversion
++
;
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
cfg
.
acct
);
SAcctObj
*
pAcct
=
mgmtGetAcct
(
pDb
->
acct
);
if
(
pAcct
!=
NULL
)
{
pAcct
->
acctInfo
.
numOfTimeSeries
--
;
mgmtDecAcctRef
(
pAcct
);
...
...
@@ -1876,7 +1876,7 @@ static void mgmtProcessCreateChildTableRsp(SRpcMsg *rpcMsg) {
// not implemented yet
static
void
mgmtProcessAlterTableRsp
(
SRpcMsg
*
rpcMsg
)
{
mTrace
(
"alter table rsp received, handle:%p code:%
d"
,
rpcMsg
->
handle
,
rpcMsg
->
code
);
mTrace
(
"alter table rsp received, handle:%p code:%
s"
,
rpcMsg
->
handle
,
tstrerror
(
rpcMsg
->
code
)
);
}
static
void
mgmtProcessMultiTableMetaMsg
(
SQueuedMsg
*
pMsg
)
{
...
...
src/mnode/src/mgmtVgroup.c
浏览文件 @
32d5fc54
...
...
@@ -71,14 +71,14 @@ static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) {
pVgroup
->
prev
=
NULL
;
pVgroup
->
next
=
NULL
;
int32_t
size
=
sizeof
(
SChildTableObj
*
)
*
pDb
->
cfg
.
max
Session
s
;
pVgroup
->
tableList
=
calloc
(
pDb
->
cfg
.
max
Session
s
,
sizeof
(
SChildTableObj
*
));
int32_t
size
=
sizeof
(
SChildTableObj
*
)
*
pDb
->
cfg
.
max
Table
s
;
pVgroup
->
tableList
=
calloc
(
pDb
->
cfg
.
max
Table
s
,
sizeof
(
SChildTableObj
*
));
if
(
pVgroup
->
tableList
==
NULL
)
{
mError
(
"vgroup:%d, failed to malloc(size:%d) for the tableList of vgroups"
,
pVgroup
->
vgId
,
size
);
return
-
1
;
}
pVgroup
->
idPool
=
taosInitIdPool
(
pDb
->
cfg
.
max
Session
s
);
pVgroup
->
idPool
=
taosInitIdPool
(
pDb
->
cfg
.
max
Table
s
);
if
(
pVgroup
->
idPool
==
NULL
)
{
mError
(
"vgroup:%d, failed to taosInitIdPool for vgroups"
,
pVgroup
->
vgId
);
tfree
(
pVgroup
->
tableList
);
...
...
@@ -146,15 +146,15 @@ static int32_t mgmtVgroupActionUpdate(SSdbOper *pOper) {
int32_t
oldTables
=
taosIdPoolMaxSize
(
pVgroup
->
idPool
);
SDbObj
*
pDb
=
pVgroup
->
pDb
;
if
(
pDb
!=
NULL
)
{
if
(
pDb
->
cfg
.
max
Session
s
!=
oldTables
)
{
mPrint
(
"vgroup:%d tables change from %d to %d"
,
pVgroup
->
vgId
,
oldTables
,
pDb
->
cfg
.
max
Session
s
);
taosUpdateIdPool
(
pVgroup
->
idPool
,
pDb
->
cfg
.
max
Session
s
);
int32_t
size
=
sizeof
(
SChildTableObj
*
)
*
pDb
->
cfg
.
max
Session
s
;
if
(
pDb
->
cfg
.
max
Table
s
!=
oldTables
)
{
mPrint
(
"vgroup:%d tables change from %d to %d"
,
pVgroup
->
vgId
,
oldTables
,
pDb
->
cfg
.
max
Table
s
);
taosUpdateIdPool
(
pVgroup
->
idPool
,
pDb
->
cfg
.
max
Table
s
);
int32_t
size
=
sizeof
(
SChildTableObj
*
)
*
pDb
->
cfg
.
max
Table
s
;
pVgroup
->
tableList
=
(
SChildTableObj
**
)
realloc
(
pVgroup
->
tableList
,
size
);
}
}
mTrace
(
"vgroup:%d, is updated, tables:%d numOfVnode:%d"
,
pVgroup
->
vgId
,
pDb
->
cfg
.
max
Session
s
,
pVgroup
->
numOfVnodes
);
mTrace
(
"vgroup:%d, is updated, tables:%d numOfVnode:%d"
,
pVgroup
->
vgId
,
pDb
->
cfg
.
max
Table
s
,
pVgroup
->
numOfVnodes
);
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -511,7 +511,7 @@ void mgmtAddTableIntoVgroup(SVgObj *pVgroup, SChildTableObj *pTable) {
pVgroup
->
numOfTables
++
;
}
if
(
pVgroup
->
numOfTables
>=
pVgroup
->
pDb
->
cfg
.
max
Session
s
)
if
(
pVgroup
->
numOfTables
>=
pVgroup
->
pDb
->
cfg
.
max
Table
s
)
mgmtAddVgroupIntoDbTail
(
pVgroup
);
}
...
...
@@ -522,7 +522,7 @@ void mgmtRemoveTableFromVgroup(SVgObj *pVgroup, SChildTableObj *pTable) {
pVgroup
->
numOfTables
--
;
}
if
(
pVgroup
->
numOfTables
>=
pVgroup
->
pDb
->
cfg
.
max
Session
s
)
if
(
pVgroup
->
numOfTables
>=
pVgroup
->
pDb
->
cfg
.
max
Table
s
)
mgmtAddVgroupIntoDbTail
(
pVgroup
);
}
...
...
@@ -535,16 +535,16 @@ SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup) {
SMDVnodeCfg
*
pCfg
=
&
pVnode
->
cfg
;
pCfg
->
vgId
=
htonl
(
pVgroup
->
vgId
);
pCfg
->
maxTables
=
htonl
(
pDb
->
cfg
.
max
Session
s
);
pCfg
->
maxCacheSize
=
htobe64
(
(
int64_t
)
pDb
->
cfg
.
cacheBlockSize
*
pDb
->
cfg
.
cacheNumOfBlocks
.
totalBlocks
);
pCfg
->
maxCacheSize
=
htobe64
(
-
1
);
pCfg
->
minRowsPerFileBlock
=
htonl
(
-
1
);
pCfg
->
maxRowsPerFileBlock
=
htonl
(
-
1
);
pCfg
->
maxTables
=
htonl
(
pDb
->
cfg
.
max
Table
s
);
pCfg
->
maxCacheSize
=
htobe64
(
pDb
->
cfg
.
maxCacheSize
);
pCfg
->
maxCacheSize
=
htobe64
(
-
1
);
//TODO
pCfg
->
minRowsPerFileBlock
=
htonl
(
-
1
);
//TODO
pCfg
->
maxRowsPerFileBlock
=
htonl
(
-
1
);
//TODO
pCfg
->
daysPerFile
=
htonl
(
pDb
->
cfg
.
daysPerFile
);
pCfg
->
daysToKeep1
=
htonl
(
pDb
->
cfg
.
daysToKeep1
);
pCfg
->
daysToKeep2
=
htonl
(
pDb
->
cfg
.
daysToKeep2
);
pCfg
->
daysToKeep
=
htonl
(
pDb
->
cfg
.
daysToKeep
);
pCfg
->
daysToKeep
=
htonl
(
-
1
);
pCfg
->
daysToKeep
=
htonl
(
-
1
);
//TODO
pCfg
->
commitTime
=
htonl
(
pDb
->
cfg
.
commitTime
);
pCfg
->
precision
=
pDb
->
cfg
.
precision
;
pCfg
->
compression
=
pDb
->
cfg
.
compression
;
...
...
src/plugins/http/src/gcHandle.c
浏览文件 @
32d5fc54
...
...
@@ -13,11 +13,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "gcHandle.h"
#define _DEFAULT_SOURCE
#include "os.h"
#include "cJSON.h"
#include "httpLog.h"
#include "gcHandle.h"
#include "gcJson.h"
#include "taosdef.h"
#include "httpLog.h"
static
HttpDecodeMethod
gcDecodeMethod
=
{
"grafana"
,
gcProcessRequest
};
static
HttpEncodeMethod
gcHeartBeatMethod
=
{
NULL
,
gcSendHeartBeatResp
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
};
...
...
src/plugins/http/src/gcJson.c
浏览文件 @
32d5fc54
...
...
@@ -13,10 +13,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <string.h>
#include <unistd.h>
#define _DEFAULT_SOURCE
#include "os.h"
#include "gcHandle.h"
#include "gcJson.h"
#include "httpJson.h"
...
...
src/plugins/http/src/httpAuth.c
浏览文件 @
32d5fc54
...
...
@@ -13,12 +13,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "tkey.h"
#include "tutil.h"
#include "http.h"
#include "httpLog.h"
#include "httpHandle.h"
#include "tkey.h"
#define KEY_DES_4 4971256377704625728L
bool
httpParseBasicAuthToken
(
HttpContext
*
pContext
,
char
*
token
,
int
len
)
{
...
...
src/plugins/http/src/httpCode.c
浏览文件 @
32d5fc54
...
...
@@ -13,6 +13,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
char
*
httpMsg
[]
=
{
"success"
,
// 0
"http server is not online"
,
// 1
...
...
src/plugins/http/src/httpHandle.c
浏览文件 @
32d5fc54
...
...
@@ -13,21 +13,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <arpa/inet.h>
#include <stdint.h>
#include <string.h>
#include <unistd.h>
#include "http.h"
#include "httpCode.h"
#include "httpHandle.h"
#include "httpResp.h"
#include "shash.h"
#define _DEFAULT_SOURCE
#include "os.h"
#include "taos.h"
#include "tglobal.h"
#include "tsocket.h"
#include "ttimer.h"
#include "shash.h"
#include "http.h"
#include "httpLog.h"
#include "httpCode.h"
#include "httpHandle.h"
#include "httpResp.h"
void
httpToLowerUrl
(
char
*
url
)
{
/*ignore case */
...
...
src/plugins/http/src/httpJson.c
浏览文件 @
32d5fc54
...
...
@@ -13,20 +13,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#define _DEFAULT_SOURCE
#include "os.h"
#include "taosmsg.h"
#include "taoserror.h"
#include "http.h"
#include "httpLog.h"
#include "httpCode.h"
#include "httpJson.h"
#include "httpResp.h"
#include "taosmsg.h"
#include "httpLog.h"
#include "taoserror.h"
#define MAX_NUM_STR_SZ 25
...
...
src/plugins/http/src/httpResp.c
浏览文件 @
32d5fc54
...
...
@@ -13,14 +13,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "taoserror.h"
#include "taosmsg.h"
#include "httpLog.h"
#include "httpResp.h"
#include <stdio.h>
#include <string.h>
#include "httpCode.h"
#include "httpJson.h"
#include "taosmsg.h"
#include "httpLog.h"
#include "taoserror.h"
const
char
*
httpKeepAliveStr
[]
=
{
""
,
"Connection: Keep-Alive
\r\n
"
,
"Connection: Close
\r\n
"
};
...
...
@@ -44,9 +44,8 @@ const char *httpRespTemplate[] = {
"%s 200 OK
\r\n
Access-Control-Allow-Origin:*
\r\n
%sAccess-Control-Allow-Methods:POST, GET, OPTIONS, DELETE, PUT
\r\n
Access-Control-Allow-Headers:Accept, Content-Type
\r\n
Content-Type: application/json;charset=utf-8
\r\n
Content-Length: %d
\r\n\r\n
"
};
void
httpSendErrorRespImp
(
HttpContext
*
pContext
,
int
httpCode
,
char
*
httpCodeStr
,
int
errNo
,
char
*
desc
)
{
httpError
(
"context:%p, fd:%d, ip:%s, code:%d, error:%d:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
httpCode
,
errNo
,
desc
);
static
void
httpSendErrorRespImp
(
HttpContext
*
pContext
,
int
httpCode
,
char
*
httpCodeStr
,
int
errNo
,
char
*
desc
)
{
httpError
(
"context:%p, fd:%d, ip:%s, code:%d, error:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
httpCode
,
desc
);
char
head
[
512
]
=
{
0
};
char
body
[
512
]
=
{
0
};
...
...
@@ -184,7 +183,7 @@ void httpSendErrorResp(HttpContext *pContext, int errNo) { httpSendErrorRespWith
void
httpSendTaosdErrorResp
(
HttpContext
*
pContext
,
int
errCode
)
{
int
httpCode
=
400
;
httpSendErrorRespImp
(
pContext
,
httpCode
,
"Bad Request"
,
errCode
,
(
char
*
)
tstrerror
(
errCode
));
httpSendErrorRespImp
(
pContext
,
httpCode
,
"Bad Request"
,
1000
,
(
char
*
)
tstrerror
(
errCode
));
}
void
httpSendTaosdInvalidSqlErrorResp
(
HttpContext
*
pContext
,
char
*
errMsg
)
{
...
...
src/plugins/http/src/httpServer.c
浏览文件 @
32d5fc54
...
...
@@ -13,6 +13,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "taosmsg.h"
#include "tsocket.h"
...
...
src/plugins/http/src/httpSession.c
浏览文件 @
32d5fc54
...
...
@@ -13,20 +13,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
#include <time.h>
#include <unistd.h>
#include "http.h"
#include "httpCode.h"
#include "httpHandle.h"
#include "httpResp.h"
#define _DEFAULT_SOURCE
#include "os.h"
#include "shash.h"
#include "taos.h"
#include "ttime.h"
#include "ttimer.h"
#include "http.h"
#include "httpLog.h"
#include "httpCode.h"
#include "httpHandle.h"
#include "httpResp.h"
void
httpAccessSession
(
HttpContext
*
pContext
)
{
HttpServer
*
server
=
pContext
->
pThread
->
pServer
;
...
...
src/plugins/http/src/httpSql.c
浏览文件 @
32d5fc54
...
...
@@ -13,15 +13,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "tnote.h"
#include "taos.h"
#include "tsclient.h"
#include "http.h"
#include "httpLog.h"
#include "httpCode.h"
#include "httpHandle.h"
#include "httpResp.h"
#include "taos.h"
#include "tsclient.h"
#include "tnote.h"
#include "httpLog.h"
void
*
taos_connect_a
(
char
*
ip
,
char
*
user
,
char
*
pass
,
char
*
db
,
uint16_t
port
,
void
(
*
fp
)(
void
*
,
TAOS_RES
*
,
int
),
void
*
param
,
void
**
taos
);
...
...
@@ -55,8 +56,8 @@ void httpProcessMultiSqlRetrieveCallBack(void *param, TAOS_RES *result, int numO
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
,
numOfRows
,
sql
);
if
(
numOfRows
<
0
)
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, process pos:%d, retrieve failed code:%
d
, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
,
-
numOfRows
,
sql
);
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, process pos:%d, retrieve failed code:%
s
, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
,
tstrerror
(
numOfRows
)
,
sql
);
}
else
{
taos_free_result
(
result
);
}
...
...
@@ -79,21 +80,21 @@ void httpProcessMultiSqlCallBack(void *param, TAOS_RES *result, int code) {
HttpSqlCmd
*
singleCmd
=
multiCmds
->
cmds
+
multiCmds
->
pos
;
char
*
sql
=
httpGetCmdsString
(
pContext
,
singleCmd
->
sql
);
if
(
-
code
==
TSDB_CODE_ACTION_IN_PROGRESS
)
{
httpWarn
(
"context:%p, fd:%d, ip:%s, user:%s, process pos:%d, code:%
d
:inprogress, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
,
-
code
,
sql
);
if
(
code
==
TSDB_CODE_ACTION_IN_PROGRESS
)
{
httpWarn
(
"context:%p, fd:%d, ip:%s, user:%s, process pos:%d, code:%
s
:inprogress, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
,
tstrerror
(
code
)
,
sql
);
return
;
}
if
(
code
<
0
)
{
if
(
encode
->
checkFinishedFp
!=
NULL
&&
!
encode
->
checkFinishedFp
(
pContext
,
singleCmd
,
code
>=
0
?
0
:
-
code
))
{
singleCmd
->
code
=
-
code
;
httpTrace
(
"context:%p, fd:%d, ip:%s, user:%s, process pos jump to:%d, last code:%
d
, last sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
+
1
,
-
code
,
sql
);
if
(
encode
->
checkFinishedFp
!=
NULL
&&
!
encode
->
checkFinishedFp
(
pContext
,
singleCmd
,
code
>=
0
?
0
:
code
))
{
singleCmd
->
code
=
code
;
httpTrace
(
"context:%p, fd:%d, ip:%s, user:%s, process pos jump to:%d, last code:%
s
, last sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
+
1
,
tstrerror
(
code
)
,
sql
);
}
else
{
singleCmd
->
code
=
-
code
;
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, process pos:%d, error code:%
d
, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
,
-
code
,
sql
);
singleCmd
->
code
=
code
;
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, process pos:%d, error code:%
s
, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
,
tstrerror
(
code
)
,
sql
);
if
(
singleCmd
->
cmdReturnType
==
HTTP_CMD_RETURN_TYPE_WITH_RETURN
)
{
if
(
encode
->
startJsonFp
)
(
encode
->
startJsonFp
)(
pContext
,
singleCmd
,
result
);
...
...
@@ -209,8 +210,8 @@ void httpProcessSingleSqlRetrieveCallBack(void *param, TAOS_RES *result, int num
pContext
->
user
,
numOfRows
);
if
(
numOfRows
<
0
)
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, retrieve failed, code:%
d
"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
-
numOfRows
);
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, retrieve failed, code:%
s
"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
tstrerror
(
numOfRows
)
);
}
else
{
taos_free_result
(
result
);
}
...
...
@@ -229,22 +230,22 @@ void httpProcessSingleSqlCallBack(void *param, TAOS_RES *result, int code) {
HttpEncodeMethod
*
encode
=
pContext
->
encodeMethod
;
if
(
-
code
==
TSDB_CODE_ACTION_IN_PROGRESS
)
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, query error, taos:%p, code:%
d
:inprogress, sqlObj:%p"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
pContext
->
session
->
taos
,
-
code
,
(
SSqlObj
*
)
result
);
if
(
code
==
TSDB_CODE_ACTION_IN_PROGRESS
)
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, query error, taos:%p, code:%
s
:inprogress, sqlObj:%p"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
pContext
->
session
->
taos
,
tstrerror
(
code
)
,
(
SSqlObj
*
)
result
);
return
;
}
if
(
code
<
0
)
{
SSqlObj
*
pObj
=
(
SSqlObj
*
)
result
;
if
(
-
code
==
TSDB_CODE_INVALID_SQL
)
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, query error, taos:%p, code:%
d
:invalidsql, sqlObj:%p, error:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
pContext
->
session
->
taos
,
-
code
,
pObj
,
pObj
->
cmd
.
payload
);
if
(
code
==
TSDB_CODE_INVALID_SQL
)
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, query error, taos:%p, code:%
s
:invalidsql, sqlObj:%p, error:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
pContext
->
session
->
taos
,
tstrerror
(
code
)
,
pObj
,
pObj
->
cmd
.
payload
);
httpSendTaosdInvalidSqlErrorResp
(
pContext
,
pObj
->
cmd
.
payload
);
}
else
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, query error, taos:%p, code:%
d
, sqlObj:%p"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
pContext
->
session
->
taos
,
-
code
,
pObj
);
httpSendTaosdErrorResp
(
pContext
,
-
code
);
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, query error, taos:%p, code:%
s
, sqlObj:%p"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
pContext
->
session
->
taos
,
tstrerror
(
code
)
,
pObj
);
httpSendTaosdErrorResp
(
pContext
,
code
);
}
return
;
}
...
...
@@ -349,9 +350,9 @@ void httpProcessRequestCb(void *param, TAOS_RES *result, int code) {
if
(
pContext
==
NULL
||
pContext
->
signature
!=
pContext
)
return
;
if
(
code
<
0
)
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, login error, code:%
d
"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
-
code
);
httpSendTaosdErrorResp
(
pContext
,
-
code
);
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, login error, code:%
s
"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
tstrerror
(
code
)
);
httpSendTaosdErrorResp
(
pContext
,
code
);
return
;
}
...
...
src/plugins/http/src/httpSystem.c
浏览文件 @
32d5fc54
...
...
@@ -15,17 +15,17 @@
#define _DEFAULT_SOURCE
#include "os.h"
#include "shash.h"
#include "taos.h"
#include "tglobal.h"
#include "tsocket.h"
#include "ttimer.h"
#include "tadmin.h"
#include "http.h"
#include "httpCode.h"
#include "httpHandle.h"
#include "httpResp.h"
#include "httpLog.h"
#include "shash.h"
#include "taos.h"
#include "tglobal.h"
#include "tsocket.h"
#include "ttimer.h"
#include "gcHandle.h"
#include "httpHandle.h"
#include "restHandle.h"
...
...
src/plugins/http/src/httpUtil.c
浏览文件 @
32d5fc54
...
...
@@ -13,15 +13,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "tmd5.h"
#include "shash.h"
#include "taos.h"
#include "http.h"
#include "httpLog.h"
#include "httpCode.h"
#include "httpHandle.h"
#include "httpResp.h"
#include "shash.h"
#include "taos.h"
#include "httpLog.h"
bool
httpCheckUsedbSql
(
char
*
sql
)
{
if
(
strstr
(
sql
,
"use "
)
!=
NULL
)
{
...
...
src/plugins/http/src/restHandle.c
浏览文件 @
32d5fc54
...
...
@@ -13,9 +13,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "httpLog.h"
#include "restHandle.h"
#include "restJson.h"
#include "httpLog.h"
static
HttpDecodeMethod
restDecodeMethod
=
{
"rest"
,
restProcessRequest
};
static
HttpDecodeMethod
restDecodeMethod2
=
{
"restful"
,
restProcessRequest
};
...
...
src/plugins/http/src/restJson.c
浏览文件 @
32d5fc54
...
...
@@ -13,6 +13,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "tglobal.h"
#include "httpLog.h"
...
...
src/plugins/http/src/tgHandle.c
浏览文件 @
32d5fc54
...
...
@@ -13,14 +13,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "tg
Handle
.h"
#include "tg
lobal
.h"
#include "shash.h"
#include "taosdef.h"
#include "taosmsg.h"
#include "tgHandle.h"
#include "tgJson.h"
#include "taosdef.h"
#include "httpLog.h"
#include "tglobal.h"
/*
* taos.telegraf.cfg formats like
...
...
src/plugins/http/src/tgJson.c
浏览文件 @
32d5fc54
...
...
@@ -13,13 +13,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _DEFAULT_SOURCE
#include "os.h"
#include "taosmsg.h"
#include "httpLog.h"
#include "httpJson.h"
#include "httpResp.h"
#include "taosmsg.h"
#include "tgHandle.h"
#include "tgJson.h"
#include "httpLog.h"
void
tgInitQueryJson
(
HttpContext
*
pContext
)
{
JsonBuf
*
jsonBuf
=
httpMallocJsonBuf
(
pContext
);
...
...
@@ -97,8 +98,8 @@ void tgBuildSqlAffectRowsJson(HttpContext *pContext, HttpSqlCmd *cmd, int affect
bool
tgCheckFinished
(
struct
HttpContext
*
pContext
,
HttpSqlCmd
*
cmd
,
int
code
)
{
HttpSqlCmds
*
multiCmds
=
pContext
->
multiCmds
;
httpTrace
(
"context:%p, fd:%d, ip:%s, check telegraf command, code:%
d
, state:%d, type:%d, rettype:%d, tags:%d"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
code
,
cmd
->
cmdState
,
cmd
->
cmdType
,
cmd
->
cmdReturnType
,
cmd
->
tagNum
);
httpTrace
(
"context:%p, fd:%d, ip:%s, check telegraf command, code:%
s
, state:%d, type:%d, rettype:%d, tags:%d"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
tstrerror
(
code
)
,
cmd
->
cmdState
,
cmd
->
cmdType
,
cmd
->
cmdReturnType
,
cmd
->
tagNum
);
if
(
cmd
->
cmdType
==
HTTP_CMD_TYPE_INSERT
)
{
if
(
cmd
->
cmdState
==
HTTP_CMD_STATE_NOT_RUN_YET
)
{
...
...
@@ -124,11 +125,11 @@ bool tgCheckFinished(struct HttpContext *pContext, HttpSqlCmd *cmd, int code) {
}
}
else
if
(
cmd
->
cmdType
==
HTTP_CMD_TYPE_CREATE_DB
)
{
cmd
->
cmdState
=
HTTP_CMD_STATE_RUN_FINISHED
;
httpTrace
(
"context:%p, fd:%d, ip:%s, code:%
d
, create database failed"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
code
);
httpTrace
(
"context:%p, fd:%d, ip:%s, code:%
s
, create database failed"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
tstrerror
(
code
)
);
}
else
if
(
cmd
->
cmdType
==
HTTP_CMD_TYPE_CREATE_STBALE
)
{
cmd
->
cmdState
=
HTTP_CMD_STATE_RUN_FINISHED
;
httpTrace
(
"context:%p, fd:%d, ip:%s, code:%
d, create stable failed"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
code
);
httpTrace
(
"context:%p, fd:%d, ip:%s, code:%
s, create stable failed"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
tstrerror
(
code
)
);
}
else
{
}
...
...
@@ -137,8 +138,8 @@ bool tgCheckFinished(struct HttpContext *pContext, HttpSqlCmd *cmd, int code) {
void
tgSetNextCmd
(
struct
HttpContext
*
pContext
,
HttpSqlCmd
*
cmd
,
int
code
)
{
HttpSqlCmds
*
multiCmds
=
pContext
->
multiCmds
;
httpTrace
(
"context:%p, fd:%d, ip:%s, get telegraf next command, pos:%d, code:%
d
, state:%d, type:%d, rettype:%d, tags:%d"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
multiCmds
->
pos
,
code
,
cmd
->
cmdState
,
cmd
->
cmdType
,
httpTrace
(
"context:%p, fd:%d, ip:%s, get telegraf next command, pos:%d, code:%
s
, state:%d, type:%d, rettype:%d, tags:%d"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
multiCmds
->
pos
,
tstrerror
(
code
)
,
cmd
->
cmdState
,
cmd
->
cmdType
,
cmd
->
cmdReturnType
,
cmd
->
tagNum
);
if
(
cmd
->
cmdType
==
HTTP_CMD_TYPE_INSERT
)
{
...
...
src/query/src/queryExecutor.c
浏览文件 @
32d5fc54
...
...
@@ -990,9 +990,7 @@ static int32_t setGroupResultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, char *pDat
return
TSDB_CODE_SUCCESS
;
}
static
UNUSED_FUNC
char
*
getGroupbyColumnData
(
SQuery
*
pQuery
,
SData
**
data
,
int16_t
*
type
,
int16_t
*
bytes
)
{
char
*
groupbyColumnData
=
NULL
;
static
char
*
getGroupbyColumnData
(
SQuery
*
pQuery
,
int16_t
*
type
,
int16_t
*
bytes
,
SArray
*
pDataBlock
)
{
SSqlGroupbyExpr
*
pGroupbyExpr
=
pQuery
->
pGroupbyExpr
;
for
(
int32_t
k
=
0
;
k
<
pGroupbyExpr
->
numOfGroupCols
;
++
k
)
{
...
...
@@ -1015,12 +1013,22 @@ static UNUSED_FUNC char *getGroupbyColumnData(SQuery *pQuery, SData **data, int1
*
type
=
pQuery
->
colList
[
colIndex
].
type
;
*
bytes
=
pQuery
->
colList
[
colIndex
].
bytes
;
// groupbyColumnData = doGetDataBlocks(pQuery, data, pQuery->colList[colIndex].inf);
break
;
/*
* the colIndex is acquired from the first meter of all qualified meters in this vnode during query prepare
* stage, the remain meter may not have the required column in cache actually. So, the validation of required
* column in cache with the corresponding meter schema is reinforced.
*/
int32_t
numOfCols
=
taosArrayGetSize
(
pDataBlock
);
for
(
int32_t
i
=
0
;
i
<
numOfCols
;
++
i
)
{
SColumnInfoData
*
p
=
taosArrayGet
(
pDataBlock
,
i
);
if
(
pColIndex
->
colId
==
p
->
info
.
colId
)
{
return
p
->
pData
;
}
}
}
return
groupbyColumnData
;
return
NULL
;
}
static
int32_t
doTSJoinFilter
(
SQueryRuntimeEnv
*
pRuntimeEnv
,
int32_t
offset
)
{
...
...
@@ -1091,8 +1099,7 @@ static void rowwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *pS
char
*
groupbyColumnData
=
NULL
;
if
(
groupbyStateValue
)
{
assert
(
0
);
// groupbyColumnData = getGroupbyColumnData(pQuery, data, &type, &bytes);
groupbyColumnData
=
getGroupbyColumnData
(
pQuery
,
&
type
,
&
bytes
,
pDataBlock
);
}
for
(
int32_t
k
=
0
;
k
<
pQuery
->
numOfOutput
;
++
k
)
{
...
...
@@ -6097,9 +6104,16 @@ int32_t qCreateQueryInfo(void *tsdb, SQueryTableMsg *pQueryMsg, qinfo_t *pQInfo)
STableId
*
id
=
taosArrayGet
(
pTableIdList
,
0
);
id
->
uid
=
-
1
;
// todo fix me
/*int32_t ret =*/
tsdbQueryByTagsCond
(
tsdb
,
id
->
uid
,
tagCond
,
pQueryMsg
->
tagCondLen
,
pQueryMsg
->
tagNameRelType
,
tbnameCond
,
&
groupInfo
,
pGroupColIndex
,
pQueryMsg
->
numOfGroupCols
);
// group by normal column, do not pass the group by condition to tsdb to group table into different group
int32_t
numOfGroupByCols
=
pQueryMsg
->
numOfGroupCols
;
if
(
pQueryMsg
->
numOfGroupCols
==
1
&&
!
TSDB_COL_IS_TAG
(
pGroupColIndex
->
flag
))
{
numOfGroupByCols
=
0
;
}
// todo handle the error
/*int32_t ret =*/
tsdbQueryByTagsCond
(
tsdb
,
id
->
uid
,
tagCond
,
pQueryMsg
->
tagCondLen
,
pQueryMsg
->
tagNameRelType
,
tbnameCond
,
&
groupInfo
,
pGroupColIndex
,
numOfGroupByCols
);
if
(
groupInfo
.
numOfTables
==
0
)
{
// no qualified tables no need to do query
code
=
TSDB_CODE_SUCCESS
;
goto
_query_over
;
...
...
src/query/tests/patternMatchTest.cpp
浏览文件 @
32d5fc54
...
...
@@ -58,7 +58,7 @@ TEST(testCase, patternMatchTest) {
EXPECT_EQ
(
ret
,
TSDB_PATTERN_NOWILDCARDMATCH
);
str
=
"abcdefgabcdeju"
;
ret
=
patternMatch
(
"abc%f_"
,
str
,
1
,
&
info
);
ret
=
patternMatch
(
"abc%f_"
,
str
,
1
,
&
info
);
// pattern string is longe than the size
EXPECT_EQ
(
ret
,
TSDB_PATTERN_NOMATCH
);
str
=
"abcdefgabcdeju"
;
...
...
@@ -72,4 +72,8 @@ TEST(testCase, patternMatchTest) {
str
=
"abcdefgabcdeju"
;
ret
=
patternMatch
(
"a__"
,
str
,
2
,
&
info
);
EXPECT_EQ
(
ret
,
TSDB_PATTERN_NOMATCH
);
str
=
"carzero"
;
ret
=
patternMatch
(
"%o"
,
str
,
strlen
(
str
),
&
info
);
EXPECT_EQ
(
ret
,
TSDB_PATTERN_MATCH
);
}
tests/examples/c/demo.c
浏览文件 @
32d5fc54
...
...
@@ -75,7 +75,7 @@ int main(int argc, char *argv[]) {
doQuery
(
taos
,
"create database if not exists test"
);
doQuery
(
taos
,
"use test"
);
doQuery
(
taos
,
"
insert into tm99 values('2020-01-01 1:1:1', 99);
"
);
doQuery
(
taos
,
"
select count(*),k,sum(k) from m1 group by k
"
);
// doQuery(taos, "create table if not exists tm0 (ts timestamp, k int);");
// doQuery(taos, "insert into tm0 values('2020-1-1 1:1:1', 1);");
// doQuery(taos, "insert into tm0 values('2020-1-1 1:1:2', 2);");
...
...
@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
// doQuery(taos, "insert into tm0 values('2020-1-1 1:1:7', 7);");
// doQuery(taos, "insert into tm0 values('2020-1-1 1:1:8', 8);");
// doQuery(taos, "insert into tm0 values('2020-1-1 1:1:9', 9);");
doQuery
(
taos
,
"select sum(k),count(*) from m1 group by a"
);
//
doQuery(taos, "select sum(k),count(*) from m1 group by a");
taos_close
(
taos
);
return
0
;
...
...
tests/pytest/insert/float.py
0 → 100644
浏览文件 @
32d5fc54
###################################################################
# Copyright (c) 2016 by TAOS Technologies, Inc.
# All rights reserved.
#
# This file is proprietary and confidential to TAOS Technologies.
# No part of this file may be reproduced, stored, transmitted,
# disclosed or used in any form or by any means other than as
# expressly provided by the written permission from Jianhui Tao
#
###################################################################
# -*- coding: utf-8 -*-
import
sys
import
datetime
import
taos
from
util.log
import
*
from
util.cases
import
*
from
util.sql
import
*
class
TDTestCase
:
def
init
(
self
,
conn
):
tdLog
.
debug
(
"start to execute %s"
%
__file__
)
tdSql
.
init
(
conn
.
cursor
())
def
run
(
self
):
tdSql
.
prepare
()
tdLog
.
info
(
"=============== step1"
)
cmd
=
'create table tb (ts timestamp, speed float)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
cmd
=
'insert into tb values (now, -3.40E+38)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdLog
.
info
(
"=============== step2"
)
cmd
=
'insert into tb values (now+1a, 3.40E+308)'
tdLog
.
info
(
cmd
)
try
:
tdSql
.
execute
(
cmd
)
tdLog
.
exit
(
"This test failed: insert wrong data error _not_ catched"
)
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
tdLog
.
notice
(
"insert wrong data error catched"
)
cmd
=
'select * from tb order by ts desc'
tdLog
.
info
(
cmd
)
tdSql
.
query
(
cmd
)
tdSql
.
checkRows
(
1
)
tdLog
.
info
(
"=============== step3"
)
cmd
=
"insert into tb values (now+2a, 2.85)"
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
cmd
=
"select * from tb order by ts desc"
tdLog
.
info
(
cmd
)
ret
=
tdSql
.
query
(
cmd
)
tdSql
.
checkRows
(
2
)
if
((
abs
(
tdSql
.
getData
(
0
,
1
)
-
2.850000
))
>
1.0e-7
):
tdLog
.
exit
(
"data is not 2.850000"
)
tdLog
.
info
(
"=============== step4"
)
cmd
=
"insert into tb values (now+3a, 3.4)"
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
cmd
=
"select * from tb order by ts desc"
tdLog
.
info
(
cmd
)
tdSql
.
query
(
cmd
)
tdSql
.
checkRows
(
3
)
if
(
abs
(
tdSql
.
getData
(
0
,
1
)
-
3.400000
)
>
1.0e-7
):
tdLog
.
exit
(
"data is not 3.400000"
)
tdLog
.
info
(
"=============== step5"
)
cmd
=
"insert into tb values (now+4a, a2)"
tdLog
.
info
(
cmd
)
try
:
tdSql
.
execute
(
cmd
)
tdLog
.
exit
(
"This test failed:
\
insert wrong data error _not_ catched"
)
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
tdLog
.
notice
(
"insert wrong data error catched"
)
cmd
=
"insert into tb values (now+4a, 0)"
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
cmd
=
"select * from tb order by ts desc"
tdLog
.
info
(
cmd
)
tdSql
.
query
(
cmd
)
tdSql
.
checkRows
(
4
)
if
(
abs
(
tdSql
.
getData
(
0
,
1
)
-
0.000000
)
!=
0
):
tdLog
.
exit
(
"data is not 0.000000"
)
tdLog
.
info
(
"=============== step6"
)
cmd
=
"insert into tb values (now+5a, 2a)"
tdLog
.
info
(
cmd
)
try
:
tdSql
.
execute
(
cmd
)
tdLog
.
exit
(
"This test failed: insert wrong data error _not_ catched"
)
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
tdLog
.
notice
(
"insert wrong data error catched"
)
cmd
=
"insert into tb values (now+5a, 2)"
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
cmd
=
"select * from tb order by ts desc"
tdLog
.
info
(
cmd
)
ret
=
tdSql
.
query
(
cmd
)
tdSql
.
checkRows
(
5
)
if
(
abs
(
tdSql
.
getData
(
0
,
1
)
-
2.000000
)
>
1.0e-7
):
tdLog
.
info
(
"data is not 2.000000"
)
tdLog
.
info
(
"=============== step7"
)
cmd
=
"insert into tb values (now+6a, 2a'1)"
tdLog
.
info
(
cmd
)
try
:
tdSql
.
execute
(
cmd
)
tdLog
.
exit
(
"This test failed: insert wrong data error _not_ catched"
)
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
tdLog
.
notice
(
"insert wrong data error catched"
)
cmd
=
"insert into tb values (now+6a, 2)"
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
cmd
=
"select * from tb order by ts desc"
tdLog
.
info
(
cmd
)
tdSql
.
query
(
cmd
)
if
(
abs
(
tdSql
.
getData
(
0
,
1
)
-
2.000000
)
>
1.0e-7
):
tdLog
.
exit
(
"data is not 2.000000"
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
tdCases
.
addWindows
(
__file__
,
TDTestCase
())
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
tests/pytest/insert/int.py
0 → 100644
浏览文件 @
32d5fc54
###################################################################
# Copyright (c) 2016 by TAOS Technologies, Inc.
# All rights reserved.
#
# This file is proprietary and confidential to TAOS Technologies.
# No part of this file may be reproduced, stored, transmitted,
# disclosed or used in any form or by any means other than as
# expressly provided by the written permission from Jianhui Tao
#
###################################################################
# -*- coding: utf-8 -*-
import
sys
import
taos
import
datetime
from
util.log
import
*
from
util.cases
import
*
from
util.sql
import
*
class
TDTestCase
:
def
init
(
self
,
conn
):
tdLog
.
debug
(
"start to execute %s"
%
__file__
)
tdSql
.
init
(
conn
.
cursor
())
def
run
(
self
):
tdSql
.
prepare
()
tdLog
.
info
(
"=============== step1"
)
tdSql
.
execute
(
'create table tb (ts timestamp, speed int)'
)
cmd
=
'insert into tb values (now, NULL)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
1
)
if
(
tdSql
.
getData
(
0
,
1
)
is
not
None
):
tdLog
.
exit
(
"data is not NULL"
)
tdLog
.
info
(
"=============== step2"
)
cmd
=
'insert into tb values (now+1m, -2147483648)'
tdLog
.
info
(
cmd
)
try
:
tdSql
.
execute
(
cmd
)
tdLog
.
exit
(
"This test failed: INT data overflow error _not_ catched"
)
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
tdLog
.
notice
(
"INT data overflow error catched"
)
cmd
=
'insert into tb values (now+1m, NULL)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
2
)
if
(
tdSql
.
getData
(
0
,
1
)
is
not
None
):
tdLog
.
exit
(
"data is not NULL"
)
tdLog
.
info
(
"=============== step3"
)
cmd
=
'insert into tb values (now+2m, 2147483647)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
3
)
if
(
tdSql
.
getData
(
0
,
1
)
!=
2147483647
):
tdLog
.
exit
(
"data is not 2147483647"
)
tdLog
.
info
(
"=============== step4"
)
cmd
=
'insert into tb values (now+3m, 2147483648)'
tdLog
.
info
(
cmd
)
try
:
tdSql
.
execute
(
cmd
)
tdLog
.
exit
(
"This test failed: INT data overflow error _not_ catched"
)
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
tdLog
.
notice
(
"INT data overflow error catched"
)
cmd
=
'insert into tb values (now+3m, NULL)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
4
)
if
(
tdSql
.
getData
(
0
,
1
)
is
not
None
):
tdLog
.
exit
(
"data is not NULL"
)
tdLog
.
info
(
"=============== step5"
)
cmd
=
'insert into tb values (now+4m, a2)'
tdLog
.
info
(
cmd
)
try
:
tdSql
.
execute
(
cmd
)
tdLog
.
exit
(
"This test failed: insert wrong data error _not_ catched"
)
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
tdLog
.
notice
(
"insert wrong data error catched"
)
cmd
=
'insert into tb values (now+4m, 0)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
5
)
if
(
tdSql
.
getData
(
0
,
1
)
!=
0
):
tdLog
.
exit
(
"data is not 0"
)
tdLog
.
info
(
"=============== step6"
)
cmd
=
'insert into tb values (now+5m, 2a)'
tdLog
.
info
(
cmd
)
try
:
tdSql
.
execute
(
cmd
)
tdLog
.
exit
(
"This test failed: insert wrong data error _not_ catched"
)
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
tdLog
.
notice
(
"insert wrong data error catched"
)
cmd
=
'insert into tb values (now+5m, 2)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
6
)
if
(
tdSql
.
getData
(
0
,
1
)
!=
2
):
tdLog
.
exit
(
"data is not 2"
)
tdLog
.
info
(
"=============== step7"
)
cmd
=
"insert into tb values (now+6m, 2a'1)"
tdLog
.
info
(
cmd
)
try
:
tdSql
.
execute
(
cmd
)
tdLog
.
exit
(
"This test failed: insert wrong data error _not_ catched"
)
except
Exception
as
e
:
tdLog
.
info
(
repr
(
e
))
tdLog
.
notice
(
"insert wrong data error catched"
)
cmd
=
'insert into tb values (now+6m, 2)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
7
)
if
(
tdSql
.
getData
(
0
,
1
)
!=
2
):
tdLog
.
exit
(
"data is not 2"
)
tdLog
.
info
(
"=============== step8"
)
cmd
=
'insert into tb values (now+8m, "null")'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
8
)
if
(
tdSql
.
getData
(
0
,
1
)
is
not
None
):
tdLog
.
exit
(
"data is not null"
)
tdLog
.
info
(
"=============== step9"
)
cmd
=
"insert into tb values (now+9m, 'null')"
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
9
)
if
(
tdSql
.
getData
(
0
,
1
)
is
not
None
):
tdLog
.
exit
(
"data is not null"
)
tdLog
.
info
(
"=============== step10"
)
cmd
=
'insert into tb values (now+10m, -123)'
tdLog
.
info
(
cmd
)
tdSql
.
execute
(
cmd
)
tdSql
.
query
(
'select * from tb order by ts desc'
)
tdSql
.
checkRows
(
10
)
if
(
tdSql
.
getData
(
0
,
1
)
!=
-
123
):
tdLog
.
exit
(
"data is not -123"
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
tdCases
.
addWindows
(
__file__
,
TDTestCase
())
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
tests/pytest/simpletest.sh
浏览文件 @
32d5fc54
#!/bin/bash
python3 ./test.py
-f
insert/basic.py
$1
python3 ./test.py
-s
$1
sleep
1
python3 ./test.py
-f
insert/int.py
$1
python3 ./test.py
-s
$1
sleep
1
python3 ./test.py
-f
insert/float.py
$1
python3 ./test.py
-s
$1
tests/pytest/test.py
浏览文件 @
32d5fc54
...
...
@@ -100,7 +100,7 @@ if __name__ == "__main__":
tdDnodes
.
deploy
(
1
)
tdDnodes
.
start
(
1
)
conn
=
taos
.
connect
(
host
=
'1
92.168
.0.1'
,
host
=
'1
27.0
.0.1'
,
config
=
tdDnodes
.
getSimCfgPath
())
if
fileName
==
"all"
:
tdCases
.
runAllLinux
(
conn
)
...
...
tests/pytest/util/cases.py
浏览文件 @
32d5fc54
...
...
@@ -67,12 +67,16 @@ class TDCases:
if
tmp
.
name
.
find
(
fileName
)
!=
-
1
:
case
=
testModule
.
TDTestCase
()
case
.
init
(
conn
)
case
.
run
()
try
:
case
.
run
()
except
Exception
as
e
:
tdLog
.
notice
(
repr
(
e
))
tdLog
.
notice
(
"%s failed: %s"
%
(
__file__
,
fileName
))
case
.
stop
()
runNum
+=
1
continue
tdLog
.
notice
(
"total %d Linux test case(s) executed"
%
(
runNum
))
tdLog
.
success
(
"total %d Linux test case(s) executed"
%
(
runNum
))
def
runAllWindows
(
self
,
conn
):
# TODO: load all Windows cases here
...
...
tests/pytest/util/dnodes.py
浏览文件 @
32d5fc54
...
...
@@ -19,12 +19,19 @@ from util.log import *
class
TDSimClient
:
def
__init__
(
self
):
self
.
testCluster
=
False
def
init
(
self
,
path
):
self
.
__init__
()
self
.
path
=
path
def
getCfgDir
(
self
):
return
self
.
cfgDir
def
setTestCluster
(
self
,
value
):
self
.
testCluster
=
value
def
cfg
(
self
,
option
,
value
):
cmd
=
"echo '%s %s' >> %s"
%
(
option
,
value
,
self
.
cfgPath
)
if
os
.
system
(
cmd
)
!=
0
:
...
...
@@ -55,8 +62,9 @@ class TDSimClient:
if
os
.
system
(
cmd
)
!=
0
:
tdLog
.
exit
(
cmd
)
self
.
cfg
(
"masterIp"
,
"192.168.0.1"
)
self
.
cfg
(
"secondIp"
,
"192.168.0.2"
)
if
self
.
testCluster
:
self
.
cfg
(
"masterIp"
,
"192.168.0.1"
)
self
.
cfg
(
"secondIp"
,
"192.168.0.2"
)
self
.
cfg
(
"logDir"
,
self
.
logDir
)
self
.
cfg
(
"numOfLogLines"
,
"100000000"
)
self
.
cfg
(
"numOfThreadsPerCore"
,
"2.0"
)
...
...
@@ -128,11 +136,12 @@ class TDDnode:
if
self
.
testCluster
:
self
.
startIP
()
self
.
cfg
(
"masterIp"
,
"192.168.0.1"
)
self
.
cfg
(
"secondIp"
,
"192.168.0.2"
)
self
.
cfg
(
"publicIp"
,
"192.168.0.%d"
%
(
self
.
index
))
self
.
cfg
(
"internalIp"
,
"192.168.0.%d"
%
(
self
.
index
))
self
.
cfg
(
"privateIp"
,
"192.168.0.%d"
%
(
self
.
index
))
if
self
.
testCluster
:
self
.
cfg
(
"masterIp"
,
"192.168.0.1"
)
self
.
cfg
(
"secondIp"
,
"192.168.0.2"
)
self
.
cfg
(
"publicIp"
,
"192.168.0.%d"
%
(
self
.
index
))
self
.
cfg
(
"internalIp"
,
"192.168.0.%d"
%
(
self
.
index
))
self
.
cfg
(
"privateIp"
,
"192.168.0.%d"
%
(
self
.
index
))
self
.
cfg
(
"dataDir"
,
self
.
dataDir
)
self
.
cfg
(
"logDir"
,
self
.
logDir
)
self
.
cfg
(
"numOfLogLines"
,
"100000000"
)
...
...
@@ -291,10 +300,6 @@ class TDDnodes:
for
i
in
range
(
len
(
self
.
dnodes
)):
self
.
dnodes
[
i
].
init
(
self
.
path
)
self
.
sim
=
TDSimClient
()
self
.
sim
.
init
(
self
.
path
)
self
.
sim
.
deploy
()
def
setTestCluster
(
self
,
value
):
self
.
testCluster
=
value
...
...
@@ -302,6 +307,11 @@ class TDDnodes:
self
.
valgrind
=
value
def
deploy
(
self
,
index
):
self
.
sim
=
TDSimClient
()
self
.
sim
.
init
(
self
.
path
)
self
.
sim
.
setTestCluster
(
self
.
testCluster
)
self
.
sim
.
deploy
()
self
.
check
(
index
)
self
.
dnodes
[
index
-
1
].
setTestCluster
(
self
.
testCluster
)
self
.
dnodes
[
index
-
1
].
setValgrind
(
self
.
valgrind
)
...
...
tests/pytest/util/sql.py
浏览文件 @
32d5fc54
...
...
@@ -63,7 +63,7 @@ class TDSql:
def
checkRows
(
self
,
expectRows
):
if
self
.
queryRows
!=
expectRows
:
tdLog
.
exit
(
"sql:%.40s, queryRows:%d != expect:%d"
%
"
failed:
sql:%.40s, queryRows:%d != expect:%d"
%
(
self
.
sql
,
self
.
queryRows
,
expectRows
))
tdLog
.
info
(
"sql:%.40s, queryRows:%d == expect:%d"
%
(
self
.
sql
,
self
.
queryRows
,
expectRows
))
...
...
tests/script/general/http/restful.sim
浏览文件 @
32d5fc54
...
...
@@ -77,8 +77,8 @@ if $system_content != @{"status":"succ","code":0,"desc":"jIlItaLFFIPa8qdtNZmtONr
return -1
endi
system_content curl 127.0.0.1:6020/rest/login/u2/abcd_1234
system_content curl 127.0.0.1:6020/rest/login/u2/a
a
bcd_1234
print curl 127.0.0.1:6020/rest/login/u2/abcd_1234 -----> $system_content
if $system_content != @{"status":"
succ","code":0,"desc":"AZH3lNvWZiLa8qdtNZmtONryp201ma04QExCHYkbFFQB/46k1gwnPNryp201ma04
"}@ then
if $system_content != @{"status":"
error","code":1000,"desc":"auth failure
"}@ then
return -1
endi
tests/script/general/http/restful_full.sim
浏览文件 @
32d5fc54
system sh/stop_dnodes.sh
sleep 5000
#
sleep 5000
system sh/ip.sh -i 1 -s up
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c clog -v 0
system sh/exec.sh -n dnode1 -s start
sleep 3000
#
sleep 3000
sql connect
print ============================ dnode1 start
...
...
@@ -41,19 +41,19 @@ endi
system_content curl 192.168.0.1:6020/rest/login/root/123
print 5-> $system_content
if $system_content != @{"status":"error","code":10
,"desc":"authentication
failure"}@ then
if $system_content != @{"status":"error","code":10
00,"desc":"auth
failure"}@ then
return -1
endi
system_content curl 192.168.0.1:6020/rest/login/root/123/1/1/3
print 6-> $system_content
if $system_content != @{"status":"error","code":10
,"desc":"authentication
failure"}@ then
if $system_content != @{"status":"error","code":10
00,"desc":"auth
failure"}@ then
return -1
endi
system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'show databases' 192.168.0.1:6020/rest/login/root/1
print 7-> $system_content
if $system_content != @{"status":"error","code":10
,"desc":"authentication
failure"}@ then
if $system_content != @{"status":"error","code":10
00,"desc":"auth
failure"}@ then
return -1
endi
...
...
tests/script/general/http/testSuite.sim
浏览文件 @
32d5fc54
run general/http/grafana.sim
run general/http/restful.sim
run general/http/restful_full.sim
run general/http/telegraf.sim
run general/http/prepare.sim
run general/http/grafana_bug.sim
#run general/http/opentsdb
.sim
run general/http/grafana
.sim
tests/script/sh/deploy.sh
浏览文件 @
32d5fc54
...
...
@@ -93,10 +93,10 @@ echo "privateIp $NODE_IP" >> $TAOS_CFG
echo
"dDebugFlag 199"
>>
$TAOS_CFG
echo
"mDebugFlag 199"
>>
$TAOS_CFG
echo
"sdbDebugFlag 199"
>>
$TAOS_CFG
echo
"rpcDebugFlag 13
5
"
>>
$TAOS_CFG
echo
"rpcDebugFlag 13
1
"
>>
$TAOS_CFG
echo
"tmrDebugFlag 131"
>>
$TAOS_CFG
echo
"cDebugFlag 135"
>>
$TAOS_CFG
echo
"httpDebugFlag 13
1
"
>>
$TAOS_CFG
echo
"httpDebugFlag 13
5
"
>>
$TAOS_CFG
echo
"monitorDebugFlag 131"
>>
$TAOS_CFG
echo
"udebugFlag 131"
>>
$TAOS_CFG
echo
"jnidebugFlag 131"
>>
$TAOS_CFG
...
...
tests/script/
general
/http/opentsdb.sim
→
tests/script/
unique
/http/opentsdb.sim
浏览文件 @
32d5fc54
文件已移动
tests/script/unique/http/testSuite.sim
浏览文件 @
32d5fc54
run unique/http/admin.sim
\ No newline at end of file
run unique/http/admin.sim
#run general/http/opentsdb.sim
\ No newline at end of file
tests/test-all.sh
浏览文件 @
32d5fc54
...
...
@@ -25,15 +25,17 @@ if [ "$totalFailed" -ne "0" ]; then
fi
cd
../pytest
./simpletest.sh 2>&1 |
grep
'successfully executed\|failed'
|
tee
pytest-out.txt
./simpletest.sh 2>&1 |
tee
pytest-out.txt
totalPySuccess
=
`
grep
'successfully executed'
pytest-out.txt |
wc
-l
`
if
[
"
$totalPySuccess
"
-gt
"0"
]
;
then
grep
'successfully executed'
pytest-out.txt
echo
-e
"
${
GREEN
}
### Total
$totalPySuccess
python case(s) succeed! ###
${
NC
}
"
fi
totalPyFailed
=
`
grep
'failed'
pytest-out.txt |
wc
-l
`
totalPyFailed
=
`
grep
'failed
\|fault
'
pytest-out.txt |
wc
-l
`
if
[
"
$totalPyFailed
"
-ne
"0"
]
;
then
cat
pytest-out.txt
echo
-e
"
${
RED
}
### Total
$totalPyFailed
python case(s) failed! ###
${
NC
}
"
exit
$totalPyFailed
fi
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录