Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
f9606b0a
I
Iotdb
项目概览
apache
/
Iotdb
大约 1 年 前同步成功
通知
25
Star
3344
Fork
916
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iotdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f9606b0a
编写于
5月 02, 2020
作者:
J
Julian Feinauer
提交者:
Xiangdong Huang
5月 02, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added workaround when doing Aggregation over boolean Series.
上级
a4d421d6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
1 deletion
+26
-1
grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
...a/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
+24
-0
grafana/src/main/resources/application.properties
grafana/src/main/resources/application.properties
+2
-1
未找到文件。
grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
浏览文件 @
f9606b0a
...
...
@@ -39,6 +39,7 @@ import java.sql.ResultSet;
import
java.sql.SQLException
;
import
java.time.ZonedDateTime
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Properties
;
...
...
@@ -48,6 +49,8 @@ public class BasicDaoImpl implements BasicDao {
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
BasicDaoImpl
.
class
);
public
static
final
String
FALLBACK_AGG_FUNCTION
=
"LAST"
;
private
final
JdbcTemplate
jdbcTemplate
;
private
static
long
TIMESTAMP_RADIX
=
1L
;
...
...
@@ -98,8 +101,28 @@ public class BasicDaoImpl implements BasicDao {
return
(
List
<
String
>)
jdbcTemplate
.
execute
(
connectionCallback
);
}
/**
* Note: If the query fails this could be due to AGGREGATIION like AVG on booleayn field.
* Thus, we then do a retry with FIRST aggregation.
* This should be solved better in the long run.
*/
@Override
public
List
<
TimeValues
>
querySeries
(
String
s
,
Pair
<
ZonedDateTime
,
ZonedDateTime
>
timeRange
)
{
try
{
return
querySeriesInternal
(
s
,
timeRange
,
function
);
}
catch
(
Exception
e
)
{
logger
.
info
(
"Execution failed, trying now with FIRST Function!"
);
// Try it with FIRST
try
{
return
querySeriesInternal
(
s
,
timeRange
,
FALLBACK_AGG_FUNCTION
);
}
catch
(
Exception
e2
)
{
logger
.
warn
(
"Even FIRST query did not succeed, returning NULL now"
,
e2
);
return
Collections
.
emptyList
();
}
}
}
public
List
<
TimeValues
>
querySeriesInternal
(
String
s
,
Pair
<
ZonedDateTime
,
ZonedDateTime
>
timeRange
,
String
function
)
{
Long
from
=
zonedCovertToLong
(
timeRange
.
left
);
Long
to
=
zonedCovertToLong
(
timeRange
.
right
);
final
long
hours
=
Duration
.
between
(
timeRange
.
left
,
timeRange
.
right
).
toHours
();
...
...
@@ -126,6 +149,7 @@ public class BasicDaoImpl implements BasicDao {
rows
=
jdbcTemplate
.
query
(
sql
,
new
TimeValuesRowMapper
(
columnName
));
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
());
throw
new
RuntimeException
(
"Query did not sucees"
,
e
);
}
return
rows
;
}
...
...
grafana/src/main/resources/application.properties
浏览文件 @
f9606b0a
...
...
@@ -32,4 +32,5 @@ isDownSampling=true
interval
=
1m
# aggregation function to use to downsampling the data
# COUNT, FIRST_VALUE, LAST_VALUE, MAX_TIME, MAX_VALUE, AVG, MIN_TIME, MIN_VALUE, NOW, SUM
function
=
avg
\ No newline at end of file
# If it does fail (e.g. due to applying AVG to boolean) it will Fallback to LAST
function
=
AVG
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录