Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
adminstrot
TDengine
提交
c980d877
TDengine
项目概览
adminstrot
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
c980d877
编写于
4月 16, 2020
作者:
L
lihui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-125]
上级
9b232e72
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
17 addition
and
17 deletion
+17
-17
src/client/src/tscSQLParserImpl.c
src/client/src/tscSQLParserImpl.c
+2
-0
src/client/src/tscStream.c
src/client/src/tscStream.c
+2
-4
src/modules/http/src/restHandle.c
src/modules/http/src/restHandle.c
+1
-3
src/sdb/src/sdbEngine.c
src/sdb/src/sdbEngine.c
+1
-1
src/system/detail/src/vnodeQueryImpl.c
src/system/detail/src/vnodeQueryImpl.c
+1
-1
src/util/src/tglobalcfg.c
src/util/src/tglobalcfg.c
+6
-6
src/util/src/tinterpolation.c
src/util/src/tinterpolation.c
+1
-1
src/util/src/ttime.c
src/util/src/ttime.c
+2
-0
src/util/src/ttokenizer.c
src/util/src/ttokenizer.c
+1
-1
未找到文件。
src/client/src/tscSQLParserImpl.c
浏览文件 @
c980d877
...
...
@@ -446,6 +446,8 @@ int32_t getTimestampInUsFromStrImpl(int64_t val, char unit, int64_t *result) {
break
;
case
'a'
:
break
;
case
'u'
:
return
0
;
default:
{
;
return
-
1
;
...
...
src/client/src/tscStream.c
浏览文件 @
c980d877
...
...
@@ -374,8 +374,7 @@ static void tscSetNextLaunchTimer(SSqlStream *pStream, SSqlObj *pSql) {
}
static
void
tscSetSlidingWindowInfo
(
SSqlObj
*
pSql
,
SSqlStream
*
pStream
)
{
int64_t
minIntervalTime
=
(
pStream
->
precision
==
TSDB_TIME_PRECISION_MICRO
)
?
tsMinIntervalTime
*
1000L
:
tsMinIntervalTime
;
int64_t
minIntervalTime
=
tsMinIntervalTime
;
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfoDetail
(
&
pSql
->
cmd
,
0
);
...
...
@@ -391,8 +390,7 @@ static void tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) {
pQueryInfo
->
slidingTime
=
pQueryInfo
->
intervalTime
;
}
int64_t
minSlidingTime
=
(
pStream
->
precision
==
TSDB_TIME_PRECISION_MICRO
)
?
tsMinSlidingTime
*
1000L
:
tsMinSlidingTime
;
int64_t
minSlidingTime
=
tsMinSlidingTime
;
if
(
pQueryInfo
->
slidingTime
==
-
1
)
{
pQueryInfo
->
slidingTime
=
pQueryInfo
->
intervalTime
;
...
...
src/modules/http/src/restHandle.c
浏览文件 @
c980d877
...
...
@@ -68,9 +68,7 @@ bool restProcessSqlRequest(HttpContext* pContext, int timestampFmt) {
}
/*
* for async test
* /
// for async test
/*
if (httpCheckUsedbSql(sql)) {
httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB);
...
...
src/sdb/src/sdbEngine.c
浏览文件 @
c980d877
...
...
@@ -310,7 +310,7 @@ void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, char keyType, ch
pTable
->
appTool
=
appTool
;
sprintf
(
pTable
->
fn
,
"%s/%s.db"
,
directory
,
pTable
->
name
);
if
(
sdbInitIndexFp
[
keyType
]
!=
NULL
)
pTable
->
iHandle
=
(
*
sdbInitIndexFp
[
keyType
])(
maxRows
,
sizeof
(
SRowMeta
));
if
(
sdbInitIndexFp
[
(
int
)
keyType
]
!=
NULL
)
pTable
->
iHandle
=
(
*
sdbInitIndexFp
[(
int
)
keyType
])(
maxRows
,
sizeof
(
SRowMeta
));
pthread_mutex_init
(
&
pTable
->
mutex
,
NULL
);
...
...
src/system/detail/src/vnodeQueryImpl.c
浏览文件 @
c980d877
...
...
@@ -2665,7 +2665,7 @@ static int32_t rowwiseApplyAllFunctions(SQueryRuntimeEnv *pRuntimeEnv, int32_t *
int32_t
j
=
0
;
TSKEY
lastKey
=
-
1
;
int32_t
lastIndex
=
-
1
;
bool
firstAccessedPoint
=
true
;
//
bool firstAccessedPoint = true;
for
(
j
=
0
;
j
<
(
*
forwardStep
);
++
j
)
{
int32_t
offset
=
GET_COL_DATA_POS
(
pQuery
,
j
,
step
);
...
...
src/util/src/tglobalcfg.c
浏览文件 @
c980d877
...
...
@@ -155,11 +155,11 @@ char tsSocketType[4] = "udp";
// time precision, millisecond by default
int
tsTimePrecision
=
TSDB_TIME_PRECISION_MILLI
;
// 1
0 m
s for sliding time, the value will changed in case of time precision changed
int
tsMinSlidingTime
=
1
0
;
// 1
u
s for sliding time, the value will changed in case of time precision changed
int
tsMinSlidingTime
=
1
;
// 1
0 m
s for interval time range, changed accordingly
int
tsMinIntervalTime
=
1
0
;
// 1
u
s for interval time range, changed accordingly
int
tsMinIntervalTime
=
1
;
// 20sec, the maximum value of stream computing delay, changed accordingly
int
tsMaxStreamComputDelay
=
20000
;
...
...
@@ -631,10 +631,10 @@ static void doInitGlobalConfig() {
tsInitConfigOption
(
cfg
++
,
"minSlidingTime"
,
&
tsMinSlidingTime
,
TSDB_CFG_VTYPE_INT
,
TSDB_CFG_CTYPE_B_CONFIG
|
TSDB_CFG_CTYPE_B_SHOW
,
1
0
,
1
000000
,
0
,
TSDB_CFG_UTYPE_MS
);
1
,
1000
000000
,
0
,
TSDB_CFG_UTYPE_MS
);
tsInitConfigOption
(
cfg
++
,
"minIntervalTime"
,
&
tsMinIntervalTime
,
TSDB_CFG_VTYPE_INT
,
TSDB_CFG_CTYPE_B_CONFIG
|
TSDB_CFG_CTYPE_B_SHOW
,
1
0
,
1
000000
,
0
,
TSDB_CFG_UTYPE_MS
);
1
,
1000
000000
,
0
,
TSDB_CFG_UTYPE_MS
);
tsInitConfigOption
(
cfg
++
,
"maxStreamCompDelay"
,
&
tsMaxStreamComputDelay
,
TSDB_CFG_VTYPE_INT
,
TSDB_CFG_CTYPE_B_CONFIG
|
TSDB_CFG_CTYPE_B_SHOW
,
10
,
1000000000
,
0
,
TSDB_CFG_UTYPE_MS
);
...
...
src/util/src/tinterpolation.c
浏览文件 @
c980d877
...
...
@@ -27,7 +27,7 @@ int64_t taosGetIntervalStartTimestamp(int64_t startTime, int64_t timeRange, char
return
startTime
;
}
if
(
slidingTimeUnit
==
'a'
||
slidingTimeUnit
==
'm'
||
slidingTimeUnit
==
's'
||
slidingTimeUnit
==
'h'
)
{
if
(
slidingTimeUnit
==
'a'
||
slidingTimeUnit
==
'm'
||
slidingTimeUnit
==
's'
||
slidingTimeUnit
==
'h'
||
slidingTimeUnit
==
'u'
)
{
return
(
startTime
/
timeRange
)
*
timeRange
;
}
else
{
/*
...
...
src/util/src/ttime.c
浏览文件 @
c980d877
...
...
@@ -378,6 +378,8 @@ static int32_t getTimestampInUsFromStrImpl(int64_t val, char unit, int64_t* resu
break
;
case
'a'
:
break
;
case
'u'
:
return
0
;
default:
{
;
return
-
1
;
...
...
src/util/src/ttokenizer.c
浏览文件 @
c980d877
...
...
@@ -510,7 +510,7 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
/* here is the 1a/2s/3m/9y */
if
((
z
[
i
]
==
'a'
||
z
[
i
]
==
's'
||
z
[
i
]
==
'm'
||
z
[
i
]
==
'h'
||
z
[
i
]
==
'd'
||
z
[
i
]
==
'n'
||
z
[
i
]
==
'y'
||
z
[
i
]
==
'w'
||
z
[
i
]
==
'A'
||
z
[
i
]
==
'S'
||
z
[
i
]
==
'M'
||
z
[
i
]
==
'H'
||
z
[
i
]
==
'D'
||
z
[
i
]
==
'N'
||
z
[
i
]
==
'Y'
||
z
[
i
]
==
'W'
)
&&
z
[
i
]
==
'Y'
||
z
[
i
]
==
'W'
||
z
[
i
]
==
'u'
||
z
[
i
]
==
'U'
)
&&
(
isIdChar
[(
uint8_t
)
z
[
i
+
1
]]
==
0
))
{
*
tokenType
=
TK_VARIABLE
;
i
+=
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录