Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
buyaopa
TDengine
提交
4af36698
T
TDengine
项目概览
buyaopa
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
3
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,发现更多精彩内容 >>
提交
4af36698
编写于
12月 09, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TBASE-1297]
上级
a29d9b81
变更
13
显示空白变更内容
内联
并排
Showing
13 changed file
with
45 addition
and
36 deletion
+45
-36
src/inc/tutil.h
src/inc/tutil.h
+2
-0
src/system/detail/src/mgmtDb.c
src/system/detail/src/mgmtDb.c
+2
-2
src/system/detail/src/mgmtDnode.c
src/system/detail/src/mgmtDnode.c
+0
-1
src/system/detail/src/mgmtMeter.c
src/system/detail/src/mgmtMeter.c
+2
-2
src/system/detail/src/mgmtShell.c
src/system/detail/src/mgmtShell.c
+3
-3
src/system/detail/src/mgmtSupertableQuery.c
src/system/detail/src/mgmtSupertableQuery.c
+11
-2
src/system/detail/src/mgmtUser.c
src/system/detail/src/mgmtUser.c
+2
-2
src/system/detail/src/mgmtVgroup.c
src/system/detail/src/mgmtVgroup.c
+2
-2
src/system/detail/src/vnodeFile.c
src/system/detail/src/vnodeFile.c
+9
-10
src/system/detail/src/vnodeImport.c
src/system/detail/src/vnodeImport.c
+3
-3
src/system/detail/src/vnodeMeter.c
src/system/detail/src/vnodeMeter.c
+4
-4
src/system/detail/src/vnodeQueryImpl.c
src/system/detail/src/vnodeQueryImpl.c
+4
-2
src/util/src/tsocket.c
src/util/src/tsocket.c
+1
-3
未找到文件。
src/inc/tutil.h
浏览文件 @
4af36698
...
...
@@ -189,6 +189,8 @@ static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, unsigned int inLen, cha
char
*
taosIpStr
(
uint32_t
ipInt
);
uint32_t
ip2uint
(
const
char
*
const
ip_addr
);
#define TAOS_ALLOC_MODE_DEFAULT 0
#define TAOS_ALLOC_MODE_RANDOM_FAIL 1
#define TAOS_ALLOC_MODE_DETECT_LEAK 2
...
...
src/system/detail/src/mgmtDb.c
浏览文件 @
4af36698
...
...
@@ -54,8 +54,8 @@ void mgmtDbActionInit() {
}
void
*
mgmtDbAction
(
char
action
,
void
*
row
,
char
*
str
,
int
size
,
int
*
ssize
)
{
if
(
mgmtDbActionFp
[
action
]
!=
NULL
)
{
return
(
*
(
mgmtDbActionFp
[
action
]))(
row
,
str
,
size
,
ssize
);
if
(
mgmtDbActionFp
[
(
uint8_t
)
action
]
!=
NULL
)
{
return
(
*
(
mgmtDbActionFp
[
(
uint8_t
)
action
]))(
row
,
str
,
size
,
ssize
);
}
return
NULL
;
}
...
...
src/system/detail/src/mgmtDnode.c
浏览文件 @
4af36698
...
...
@@ -461,7 +461,6 @@ int mgmtRetrieveVnodes(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
SDnodeObj
*
pDnode
=
NULL
;
char
*
pWrite
;
int
cols
=
0
;
char
ipstr
[
20
];
if
(
0
==
rows
)
return
0
;
...
...
src/system/detail/src/mgmtMeter.c
浏览文件 @
4af36698
...
...
@@ -418,8 +418,8 @@ void *mgmtMeterActionAfterBatchUpdate(void *row, char *str, int size, int *ssize
}
void
*
mgmtMeterAction
(
char
action
,
void
*
row
,
char
*
str
,
int
size
,
int
*
ssize
)
{
if
(
mgmtMeterActionFp
[
action
]
!=
NULL
)
{
return
(
*
(
mgmtMeterActionFp
[
action
]))(
row
,
str
,
size
,
ssize
);
if
(
mgmtMeterActionFp
[
(
uint8_t
)
action
]
!=
NULL
)
{
return
(
*
(
mgmtMeterActionFp
[
(
uint8_t
)
action
]))(
row
,
str
,
size
,
ssize
);
}
return
NULL
;
}
...
...
src/system/detail/src/mgmtShell.c
浏览文件 @
4af36698
...
...
@@ -840,11 +840,11 @@ int mgmtProcessShowMsg(char *pMsg, int msgLen, SConnObj *pConn) {
pShowRsp
->
qhandle
=
(
uint64_t
)
pShow
;
// qhandle;
pConn
->
qhandle
=
pShowRsp
->
qhandle
;
code
=
(
*
mgmtGetMetaFp
[
pShowMsg
->
type
])(
&
pShowRsp
->
meterMeta
,
pShow
,
pConn
);
code
=
(
*
mgmtGetMetaFp
[
(
uint8_t
)
pShowMsg
->
type
])(
&
pShowRsp
->
meterMeta
,
pShow
,
pConn
);
if
(
code
==
0
)
{
pMsg
+=
sizeof
(
SShowRspMsg
)
+
sizeof
(
SSchema
)
*
pShow
->
numOfColumns
;
}
else
{
mError
(
"pShow:%p, type:%d %s, failed to get Meta, code:%d"
,
pShow
,
pShowMsg
->
type
,
taosMsg
[
pShowMsg
->
type
],
code
);
mError
(
"pShow:%p, type:%d %s, failed to get Meta, code:%d"
,
pShow
,
pShowMsg
->
type
,
taosMsg
[
(
uint8_t
)
pShowMsg
->
type
],
code
);
free
(
pShow
);
}
}
...
...
@@ -915,7 +915,7 @@ int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
// if free flag is set, client wants to clean the resources
if
((
pRetrieve
->
free
&
TSDB_QUERY_TYPE_FREE_RESOURCE
)
!=
TSDB_QUERY_TYPE_FREE_RESOURCE
)
rowsRead
=
(
*
mgmtRetrieveFp
[
pShow
->
type
])(
pShow
,
pRsp
->
data
,
rowsToRead
,
pConn
);
rowsRead
=
(
*
mgmtRetrieveFp
[
(
uint8_t
)
pShow
->
type
])(
pShow
,
pRsp
->
data
,
rowsToRead
,
pConn
);
if
(
rowsRead
<
0
)
{
rowsRead
=
0
;
...
...
src/system/detail/src/mgmtSupertableQuery.c
浏览文件 @
4af36698
...
...
@@ -203,7 +203,7 @@ static bool mgmtTablenameFilterCallback(tSkipListNode* pNode, void* param) {
static
void
mgmtRetrieveFromLikeOptr
(
tQueryResultset
*
pRes
,
const
char
*
str
,
STabObj
*
pMetric
)
{
SPatternCompareInfo
info
=
PATTERN_COMPARE_INFO_INITIALIZER
;
SMeterNameFilterSupporter
supporter
=
{
info
,
str
};
SMeterNameFilterSupporter
supporter
=
{
info
,
(
char
*
)
str
};
pRes
->
num
=
tSkipListIterateList
(
pMetric
->
pSkipList
,
(
tSkipListNode
***
)
&
pRes
->
pRes
,
mgmtTablenameFilterCallback
,
&
supporter
);
...
...
@@ -230,6 +230,12 @@ static void mgmtFilterByTableNameCond(tQueryResultset* pRes, char* condStr, int3
free
(
str
);
}
/*
*-Wunused-function"
*/
#if 0
static bool mgmtJoinFilterCallback(tSkipListNode* pNode, void* param) {
SJoinSupporter* pSupporter = (SJoinSupporter*)param;
...
...
@@ -259,6 +265,7 @@ static bool mgmtJoinFilterCallback(tSkipListNode* pNode, void* param) {
return false;
}
#endif
static
void
orderResult
(
SMetricMetaMsg
*
pMetricMetaMsg
,
tQueryResultset
*
pRes
,
int16_t
colIndex
,
int32_t
tableIndex
)
{
SMetricMetaElemMsg
*
pElem
=
(
SMetricMetaElemMsg
*
)((
char
*
)
pMetricMetaMsg
+
pMetricMetaMsg
->
metaElem
[
tableIndex
]);
...
...
@@ -691,7 +698,9 @@ static int32_t mgmtFilterMeterByIndex(STabObj* pMetric, tQueryResultset* pRes, c
return
TSDB_CODE_OPS_NOT_SUPPORT
;
}
else
{
// query according to the binary expression
SSyntaxTreeFilterSupporter
s
=
{.
pTagSchema
=
pTagSchema
,
.
numOfTags
=
pMetric
->
numOfTags
};
SBinaryFilterSupp
supp
=
{.
fp
=
tSkipListNodeFilterCallback
,
.
setupInfoFn
=
filterPrepare
,
.
pExtInfo
=
&
s
};
SBinaryFilterSupp
supp
=
{.
fp
=
(
__result_filter_fn_t
)
tSkipListNodeFilterCallback
,
.
setupInfoFn
=
(
__do_filter_suppl_fn_t
)
filterPrepare
,
.
pExtInfo
=
&
s
};
tSQLBinaryExprTraverse
(
pExpr
,
pMetric
->
pSkipList
,
pRes
,
&
supp
);
tSQLBinaryExprDestroy
(
&
pExpr
,
tSQLListTraverseDestroyInfo
);
...
...
src/system/detail/src/mgmtUser.c
浏览文件 @
4af36698
...
...
@@ -54,8 +54,8 @@ void mgmtUserActionInit() {
}
void
*
mgmtUserAction
(
char
action
,
void
*
row
,
char
*
str
,
int
size
,
int
*
ssize
)
{
if
(
mgmtUserActionFp
[
action
]
!=
NULL
)
{
return
(
*
(
mgmtUserActionFp
[
action
]))(
row
,
str
,
size
,
ssize
);
if
(
mgmtUserActionFp
[
(
uint8_t
)
action
]
!=
NULL
)
{
return
(
*
(
mgmtUserActionFp
[
(
uint8_t
)
action
]))(
row
,
str
,
size
,
ssize
);
}
return
NULL
;
}
...
...
src/system/detail/src/mgmtVgroup.c
浏览文件 @
4af36698
...
...
@@ -55,8 +55,8 @@ void mgmtVgroupActionInit() {
}
void
*
mgmtVgroupAction
(
char
action
,
void
*
row
,
char
*
str
,
int
size
,
int
*
ssize
)
{
if
(
mgmtVgroupActionFp
[
action
]
!=
NULL
)
{
return
(
*
(
mgmtVgroupActionFp
[
action
]))(
row
,
str
,
size
,
ssize
);
if
(
mgmtVgroupActionFp
[
(
uint8_t
)
action
]
!=
NULL
)
{
return
(
*
(
mgmtVgroupActionFp
[
(
uint8_t
)
action
]))(
row
,
str
,
size
,
ssize
);
}
return
NULL
;
}
...
...
src/system/detail/src/vnodeFile.c
浏览文件 @
4af36698
...
...
@@ -187,13 +187,13 @@ int vnodeCreateNeccessaryFiles(SVnodeObj *pVnode) {
if
(
pVnode
->
lastKeyOnFile
==
0
)
{
if
(
pCfg
->
daysPerFile
==
0
)
pCfg
->
daysPerFile
=
10
;
pVnode
->
fileId
=
pVnode
->
firstKey
/
tsMsPerDay
[
pVnode
->
cfg
.
precision
]
/
pCfg
->
daysPerFile
;
pVnode
->
lastKeyOnFile
=
(
int64_t
)(
pVnode
->
fileId
+
1
)
*
pCfg
->
daysPerFile
*
tsMsPerDay
[
pVnode
->
cfg
.
precision
]
-
1
;
pVnode
->
fileId
=
pVnode
->
firstKey
/
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
]
/
pCfg
->
daysPerFile
;
pVnode
->
lastKeyOnFile
=
(
int64_t
)(
pVnode
->
fileId
+
1
)
*
pCfg
->
daysPerFile
*
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
]
-
1
;
pVnode
->
numOfFiles
=
1
;
if
(
vnodeCreateEmptyCompFile
(
vnode
,
pVnode
->
fileId
)
<
0
)
return
-
1
;
}
numOfFiles
=
(
pVnode
->
lastKeyOnFile
-
pVnode
->
commitFirstKey
)
/
tsMsPerDay
[
pVnode
->
cfg
.
precision
]
/
pCfg
->
daysPerFile
;
numOfFiles
=
(
pVnode
->
lastKeyOnFile
-
pVnode
->
commitFirstKey
)
/
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
]
/
pCfg
->
daysPerFile
;
if
(
pVnode
->
commitFirstKey
>
pVnode
->
lastKeyOnFile
)
numOfFiles
=
-
1
;
dTrace
(
"vid:%d, commitFirstKey:%ld lastKeyOnFile:%ld numOfFiles:%d fileId:%d vnodeNumOfFiles:%d"
,
pVnode
->
vnode
,
...
...
@@ -221,15 +221,15 @@ int vnodeCreateNeccessaryFiles(SVnodeObj *pVnode) {
#else
return
-
1
;
#endif
pVnode
->
lastKeyOnFile
+=
(
int64_t
)
tsMsPerDay
[
pVnode
->
cfg
.
precision
]
*
pCfg
->
daysPerFile
;
pVnode
->
lastKeyOnFile
+=
(
int64_t
)
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
]
*
pCfg
->
daysPerFile
;
filesAdded
=
1
;
numOfFiles
=
0
;
// hacker way
}
fileId
=
pVnode
->
fileId
-
numOfFiles
;
pVnode
->
commitLastKey
=
pVnode
->
lastKeyOnFile
-
(
int64_t
)
numOfFiles
*
tsMsPerDay
[
pVnode
->
cfg
.
precision
]
*
pCfg
->
daysPerFile
;
pVnode
->
commitFirstKey
=
pVnode
->
commitLastKey
-
(
int64_t
)
tsMsPerDay
[
pVnode
->
cfg
.
precision
]
*
pCfg
->
daysPerFile
+
1
;
pVnode
->
lastKeyOnFile
-
(
int64_t
)
numOfFiles
*
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
]
*
pCfg
->
daysPerFile
;
pVnode
->
commitFirstKey
=
pVnode
->
commitLastKey
-
(
int64_t
)
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
]
*
pCfg
->
daysPerFile
+
1
;
pVnode
->
commitFileId
=
fileId
;
pVnode
->
numOfFiles
=
pVnode
->
numOfFiles
+
filesAdded
;
...
...
@@ -244,8 +244,7 @@ int vnodeOpenCommitFiles(SVnodeObj *pVnode, int noTempLast) {
int
len
=
0
;
struct
stat
filestat
;
int
vnode
=
pVnode
->
vnode
;
int
fileId
,
numOfFiles
,
filesAdded
=
0
;
SVnodeCfg
*
pCfg
=
&
pVnode
->
cfg
;
int
fileId
;
if
(
vnodeCreateNeccessaryFiles
(
pVnode
)
<
0
)
return
-
1
;
...
...
@@ -1246,7 +1245,7 @@ int vnodeWriteBlockToFile(SMeterObj *pObj, SCompBlock *pCompBlock, SData *data[]
// assert(data[i]->len == points*pObj->schema[i].bytes);
if
(
pCfg
->
compression
)
{
cdata
[
i
]
->
len
=
(
*
pCompFunc
[
pObj
->
schema
[
i
].
type
])(
data
[
i
]
->
data
,
points
*
pObj
->
schema
[
i
].
bytes
,
points
,
cdata
[
i
]
->
len
=
(
*
pCompFunc
[
(
uint8_t
)
pObj
->
schema
[
i
].
type
])(
data
[
i
]
->
data
,
points
*
pObj
->
schema
[
i
].
bytes
,
points
,
cdata
[
i
]
->
data
,
pObj
->
schema
[
i
].
bytes
*
pObj
->
pointsPerFileBlock
+
EXTRA_BYTES
,
pCfg
->
compression
,
buffer
,
bufferSize
);
fields
[
i
].
len
=
cdata
[
i
]
->
len
;
...
...
@@ -1338,7 +1337,7 @@ int vnodeSearchPointInFile(SMeterObj *pObj, SQuery *pQuery) {
if
(
pVnode
->
numOfFiles
<=
0
)
return
0
;
SVnodeCfg
*
pCfg
=
&
pVnode
->
cfg
;
delta
=
(
int64_t
)
pCfg
->
daysPerFile
*
tsMsPerDay
[
pVnode
->
cfg
.
precision
];
delta
=
(
int64_t
)
pCfg
->
daysPerFile
*
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
];
latest
=
pObj
->
lastKeyOnFile
;
oldest
=
(
pVnode
->
fileId
-
pVnode
->
numOfFiles
+
1
)
*
delta
;
...
...
src/system/detail/src/vnodeImport.c
浏览文件 @
4af36698
...
...
@@ -146,7 +146,7 @@ int vnodeFindKeyInCache(SImportInfo *pImport, int order) {
void
vnodeGetValidDataRange
(
int
vnode
,
TSKEY
now
,
TSKEY
*
minKey
,
TSKEY
*
maxKey
)
{
SVnodeObj
*
pVnode
=
vnodeList
+
vnode
;
int64_t
delta
=
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
pVnode
->
cfg
.
precision
];
int64_t
delta
=
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
];
int
fid
=
now
/
delta
;
*
minKey
=
(
fid
-
pVnode
->
maxFiles
+
1
)
*
delta
;
*
maxKey
=
(
fid
+
2
)
*
delta
-
1
;
...
...
@@ -682,7 +682,7 @@ static int vnodeMergeDataIntoFile(SImportInfo *pImport, const char *payload, int
SCacheInfo
*
pInfo
=
(
SCacheInfo
*
)(
pObj
->
pCache
);
TSKEY
lastKeyImported
=
0
;
TSKEY
delta
=
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
pVnode
->
cfg
.
precision
];
TSKEY
delta
=
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
];
TSKEY
minFileKey
=
fid
*
delta
;
TSKEY
maxFileKey
=
minFileKey
+
delta
-
1
;
TSKEY
firstKey
=
KEY_AT_INDEX
(
payload
,
pObj
->
bytesPerPoint
,
0
);
...
...
@@ -1499,7 +1499,7 @@ int vnodeImportDataToFiles(SImportInfo *pImport, char *payload, const int rows)
SMeterObj
*
pObj
=
(
SMeterObj
*
)(
pImport
->
pObj
);
SVnodeObj
*
pVnode
=
vnodeList
+
pObj
->
vnode
;
int64_t
delta
=
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
pVnode
->
cfg
.
precision
];
int64_t
delta
=
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
];
int
sfid
=
KEY_AT_INDEX
(
payload
,
pObj
->
bytesPerPoint
,
0
)
/
delta
;
int
efid
=
KEY_AT_INDEX
(
payload
,
pObj
->
bytesPerPoint
,
rows
-
1
)
/
delta
;
...
...
src/system/detail/src/vnodeMeter.c
浏览文件 @
4af36698
...
...
@@ -604,10 +604,10 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
TSKEY
firstKey
=
*
((
TSKEY
*
)
pData
);
TSKEY
lastKey
=
*
((
TSKEY
*
)(
pData
+
pObj
->
bytesPerPoint
*
(
numOfPoints
-
1
)));
int
cfid
=
now
/
pVnode
->
cfg
.
daysPerFile
/
tsMsPerDay
[
pVnode
->
cfg
.
precision
];
int
cfid
=
now
/
pVnode
->
cfg
.
daysPerFile
/
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
];
TSKEY
minAllowedKey
=
(
cfid
-
pVnode
->
maxFiles
+
1
)
*
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
pVnode
->
cfg
.
precision
];
TSKEY
maxAllowedKey
=
(
cfid
+
2
)
*
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
pVnode
->
cfg
.
precision
]
-
2
;
TSKEY
minAllowedKey
=
(
cfid
-
pVnode
->
maxFiles
+
1
)
*
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
];
TSKEY
maxAllowedKey
=
(
cfid
+
2
)
*
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
]
-
2
;
if
(
firstKey
<
minAllowedKey
||
firstKey
>
maxAllowedKey
||
lastKey
<
minAllowedKey
||
lastKey
>
maxAllowedKey
)
{
dError
(
"vid:%d sid:%d id:%s, vnode lastKeyOnFile:%lld, data is out of range, numOfPoints:%d firstKey:%lld lastKey:%lld minAllowedKey:%lld maxAllowedKey:%lld"
,
pObj
->
vnode
,
pObj
->
sid
,
pObj
->
meterId
,
pVnode
->
lastKeyOnFile
,
numOfPoints
,
firstKey
,
lastKey
,
minAllowedKey
,
maxAllowedKey
);
...
...
@@ -634,7 +634,7 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
continue
;
}
if
(
!
VALID_TIMESTAMP
(
*
((
TSKEY
*
)
pData
),
tsKey
,
pVnode
->
cfg
.
precision
))
{
if
(
!
VALID_TIMESTAMP
(
*
((
TSKEY
*
)
pData
),
tsKey
,
(
uint8_t
)
pVnode
->
cfg
.
precision
))
{
code
=
TSDB_CODE_TIMESTAMP_OUT_OF_RANGE
;
break
;
}
...
...
src/system/detail/src/vnodeQueryImpl.c
浏览文件 @
4af36698
...
...
@@ -1055,7 +1055,7 @@ static void *getGenericDataBlock(SMeterObj *pMeterObj, SQuery *pQuery, int32_t s
static
int32_t
getFileIdFromKey
(
int32_t
vid
,
TSKEY
key
)
{
SVnodeObj
*
pVnode
=
&
vnodeList
[
vid
];
int64_t
delta
=
(
int64_t
)
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
pVnode
->
cfg
.
precision
];
int64_t
delta
=
(
int64_t
)
pVnode
->
cfg
.
daysPerFile
*
tsMsPerDay
[
(
uint8_t
)
pVnode
->
cfg
.
precision
];
return
(
int32_t
)(
key
/
delta
);
// set the starting fileId
}
...
...
@@ -2227,7 +2227,7 @@ static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
// get maximum time interval in each file
static
int64_t
getOldestKey
(
int32_t
numOfFiles
,
int64_t
fileId
,
SVnodeCfg
*
pCfg
)
{
int64_t
duration
=
pCfg
->
daysPerFile
*
tsMsPerDay
[
pCfg
->
precision
];
int64_t
duration
=
pCfg
->
daysPerFile
*
tsMsPerDay
[
(
uint8_t
)
pCfg
->
precision
];
return
(
fileId
-
numOfFiles
+
1
)
*
duration
;
}
...
...
@@ -6332,6 +6332,8 @@ int32_t setIntervalQueryExecutionContext(SMeterQuerySupportObj *pSupporter, int3
tsBufSetCursor
(
pSupporter
->
runtimeEnv
.
pTSBuf
,
&
pMeterQueryInfo
->
cur
);
}
}
return
0
;
}
static
void
doApplyIntervalQueryOnBlock
(
SMeterQuerySupportObj
*
pSupporter
,
SMeterQueryInfo
*
pInfo
,
...
...
src/util/src/tsocket.c
浏览文件 @
4af36698
...
...
@@ -19,8 +19,6 @@
#include "tsocket.h"
#include "tutil.h"
unsigned
int
ip2uint
(
const
char
*
const
ip_addr
);
/*
* Function to get the public ip address of current machine. If get IP
* successfully, return 0, else, return -1. The return values is ip.
...
...
@@ -105,7 +103,7 @@ int taosGetPublicIp(char *const ip) {
}
// Function converting an IP address string to an unsigned int.
u
nsigned
in
t
ip2uint
(
const
char
*
const
ip_addr
)
{
u
int32_
t
ip2uint
(
const
char
*
const
ip_addr
)
{
char
ip_addr_cpy
[
20
];
char
ip
[
5
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录