Merge branch 'develop' into feature/lihui
This commit is contained in:
huili
commit
a08f5e878b
|
|
@ -0,0 +1,219 @@
|
||||||
|
# 一分钟快速搭建一个DevOps监控系统
|
||||||
|
为了让更多的Devops领域的开发者快速体验TDengine的优秀特性，本文介绍了一种快速搭建Devops领域性能监控的demo，方便大家更方便的了解TDengine，并基于此文拓展Devops领域的应用。
|
||||||
|
为了快速上手，本文用到的软件全部采用Docker容器方式部署，大家只需要安装Docker软件，就可以直接通过脚本运行所有软件，无需安装。这个Demo用到了以下Docker容器，都可以从Dockerhub上拉取相关镜像
|
||||||
|
- tdengine/tdengine:1.6.4.5 TDengine开源版1.6.4.5.的镜像
|
||||||
|
- tdengine/blm_telegraf:latest 用于telegraf写入TDengine的API，可以schemaless的将telegraf的数据写入TDengine
|
||||||
|
- tdengine/blm_prometheus:latest 用于Prometheus写入TDengine的API，可以schemaless的将Prometheus的数据写入TDengine
|
||||||
|
- grafana/grafana Grafana的镜像，一个广泛应用的开源可视化监控软件
|
||||||
|
- telegraf:latest 一个广泛应用的开源数据采集程序
|
||||||
|
- prom/prometheus:latest 一个广泛应用的k8s领域的开源数据采集程序
|
||||||
|
## 说明
|
||||||
|
本文中的图片链接在Github上显示不出来，建议将MD文件下载后用vscode或其他md文件浏览工具进行查看
|
||||||
|
## 前提条件
|
||||||
|
1. 一台linux服务器或运行linux操作系统的虚拟机或者运行MacOS的计算机
|
||||||
|
2. 安装了Docker软件。Docker软件的安装方法请参考linux下安装Docker
|
||||||
|
3. sudo权限
|
||||||
|
4. 下载本文用到的配置文件和脚本压缩包:[下载地址](http://www.taosdata.com/download/minidevops.tar.gz)
|
||||||
|
|
||||||
|
压缩包下载下来后解压生成一个minidevops的文件夹，其结构如下
|
||||||
|
```sh
|
||||||
|
minidevops$ tree
|
||||||
|
.
|
||||||
|
├── demodashboard.json
|
||||||
|
├── grafana
|
||||||
|
│ └── tdengine
|
||||||
|
│ ├── README.md
|
||||||
|
│ ├── css
|
||||||
|
│ │ └── query-editor.css
|
||||||
|
│ ├── datasource.js
|
||||||
|
│ ├── img
|
||||||
|
│ │ └── taosdata_logo.png
|
||||||
|
│ ├── module.js
|
||||||
|
│ ├── partials
|
||||||
|
│ │ ├── config.html
|
||||||
|
│ │ └── query.editor.html
|
||||||
|
│ ├── plugin.json
|
||||||
|
│ └── query_ctrl.js
|
||||||
|
├── prometheus
|
||||||
|
│ └── prometheus.yml
|
||||||
|
├── run.sh
|
||||||
|
└── telegraf
|
||||||
|
└── telegraf.conf
|
||||||
|
```
|
||||||
|
`grafana`子文件夹里是TDengine的插件，用于在grafana中导入TDengine的数据源。
|
||||||
|
`prometheus`子文件夹里是prometheus需要的配置文件。
|
||||||
|
`run.sh`是运行脚本。
|
||||||
|
`telegraf`子文件夹里是telegraf的配置文件。
|
||||||
|
## 启动Docker镜像
|
||||||
|
启动前，请确保系统里没有运行TDengine和Grafana，以及Telegraf和Prometheus，因为这些程序会占用docker所需的端口，造成脚本运行失败，建议先关闭这些程序。
|
||||||
|
然后，只用在minidevops路径下执行
|
||||||
|
```sh
|
||||||
|
sudo run.sh
|
||||||
|
```
|
||||||
|
我们来看看`run.sh`里干了些什么：
|
||||||
|
```sh
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
LP=`pwd`
|
||||||
|
|
||||||
|
#为了让脚本能够顺利执行，避免重复执行时出现错误， 首先将系统里所有docker容器停止了。请注意，如果该linux上已经运行了其他docker容器，也会被停止掉。
|
||||||
|
docker rm -f `docker ps -a -q`
|
||||||
|
|
||||||
|
#专门创建一个叫minidevops的虚拟网络，并指定了172.15.1.1~255这个地址段。
|
||||||
|
docker network create --ip-range 172.15.1.255/24 --subnet 172.15.1.1/16 minidevops
|
||||||
|
|
||||||
|
#启动grafana程序，并将tdengine插件文件所在路径绑定到容器中
|
||||||
|
docker run -d --net minidevops --ip 172.15.1.11 -v $LP/grafana:/var/lib/grafana/plugins -p 3000:3000 grafana/grafana
|
||||||
|
|
||||||
|
#启动tdengine的docker容器，并指定IP地址为172.15.1.6，绑定需要的端口
|
||||||
|
docker run -d --net minidevops --ip 172.15.1.6 -p 6030:6030 -p 6020:6020 -p 6031:6031 -p 6032:6032 -p 6033:6033 -p 6034:6034 -p 6035:6035 -p 6036:6036 -p 6037:6037 -p 6038:6038 -p 6039:6039 tdengine/tdengine:1.6.4.5
|
||||||
|
|
||||||
|
#启动prometheus的写入代理程序，这个程序可以将prometheus发来的数据直接写入TDengine中，无需提前建立相关超级表和表，实现schemaless写入功能
|
||||||
|
docker run -d --net minidevops --ip 172.15.1.7 -p 10203:10203 tdengine/blm_prometheus 172.15.1.6
|
||||||
|
|
||||||
|
#启动telegraf的写入代理程序，这个程序可以将telegraf发来的数据直接写入TDengine中，无需提前建立相关超级表和表，实现schemaless写入功能
|
||||||
|
docker run -d --net minidevops --ip 172.15.1.8 -p 10202:10202 tdengine/blm_telegraf 172.15.1.6
|
||||||
|
|
||||||
|
#启动prometheus程序，并将配置文件所在路径绑定到容器中
|
||||||
|
docker run -d --net minidevops --ip 172.15.1.9 -v $LP/prometheus:/etc/prometheus -p 9090:9090 prom/prometheus
|
||||||
|
|
||||||
|
#启动telegraf程序，并将配置文件所在路径绑定到容器中
|
||||||
|
docker run -d --net minidevops --ip 172.15.1.10 -v $LP/telegraf:/etc/telegraf -p 8092:8092 -p 8094:8094 -p 8125:8125 telegraf
|
||||||
|
|
||||||
|
#通过Grafana的API，将TDengine配置成Grafana的datasources
|
||||||
|
curl -X POST http://localhost:3000/api/datasources --header "Content-Type:application/json" -u admin:admin -d '{"Name": "TDengine","Type": "tdengine","TypeLogoUrl": "public/plugins/tdengine/img/taosdata_logo.png","Access": "proxy","Url": "http://172.15.1.6:6020","BasicAuth": false,"isDefault": true,"jsonData": {},"readOnly": false}'
|
||||||
|
|
||||||
|
#通过Grafana的API，配置一个示范的监控面板
|
||||||
|
curl -X POST http://localhost:3000/api/dashboards/db --header "Content-Type:application/json" -u admin:admin -d '{"dashboard":{"annotations":{"list":[{"builtIn":1,"datasource":"-- Grafana --","enable":true,"hide":true,"iconColor":"rgba(0, 211, 255, 1)","name":"Annotations & Alerts","type":"dashboard"}]},"editable":true,"gnetId":null,"graphTooltip":0,"id":1,"links":[],"panels":[{"datasource":null,"gridPos":{"h":8,"w":6,"x":0,"y":0},"id":6,"options":{"fieldOptions":{"calcs":["mean"],"defaults":{"color":{"mode":"thresholds"},"links":[{"title":"","url":""}],"mappings":[],"max":100,"min":0,"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null},{"color":"red","value":80}]},"unit":"percent"},"overrides":[],"values":false},"orientation":"auto","showThresholdLabels":false,"showThresholdMarkers":true},"pluginVersion":"6.6.0","targets":[{"refId":"A","sql":"select last_row(value) from telegraf.mem where field=\"used_percent\""}],"timeFrom":null,"timeShift":null,"title":"Memory used percent","type":"gauge"},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":null,"fill":1,"fillGradient":0,"gridPos":{"h":8,"w":12,"x":6,"y":0},"hiddenSeries":false,"id":8,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"MEMUSED-PERCENT","refId":"A","sql":"select avg(value) from telegraf.mem where field=\"used_percent\" interval(1m)"}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"Panel Title","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}},{"datasource":null,"gridPos":{"h":9,"w":6,"x":0,"y":8},"id":10,"options":{"fieldOptions":{"calcs":["mean"],"defaults":{"mappings":[],"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null}]},"unit":"percent"},"overrides":[],"values":false},"orientation":"auto","showThresholdLabels":false,"showThresholdMarkers":true},"pluginVersion":"6.6.0","targets":[{"alias":"CPU-SYS","refId":"A","sql":"select last_row(value) from telegraf.cpu where field=\"usage_system\""},{"alias":"CPU-IDLE","refId":"B","sql":"select last_row(value) from telegraf.cpu where field=\"usage_idle\""},{"alias":"CPU-USER","refId":"C","sql":"select last_row(value) from telegraf.cpu where field=\"usage_user\""}],"timeFrom":null,"timeShift":null,"title":"Panel Title","type":"gauge"},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"TDengine","description":"General CPU monitor","fill":1,"fillGradient":0,"gridPos":{"h":9,"w":12,"x":6,"y":8},"hiddenSeries":false,"id":2,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"CPU-USER","refId":"A","sql":"select avg(value) from telegraf.cpu where field=\"usage_user\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-SYS","refId":"B","sql":"select avg(value) from telegraf.cpu where field=\"usage_system\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-IDLE","refId":"C","sql":"select avg(value) from telegraf.cpu where field=\"usage_idle\" and cpu=\"cpu-total\" interval(1m)"}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"CPU","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}}],"refresh":"10s","schemaVersion":22,"style":"dark","tags":["demo"],"templating":{"list":[]},"time":{"from":"now-3h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"]},"timezone":"","title":"TDengineDashboardDemo","id":null,"uid":null,"version":0}}'
|
||||||
|
```
|
||||||
|
执行以上脚本后，可以通过docker container ls命令来确认容器运行的状态：
|
||||||
|
```sh
|
||||||
|
$docker container ls
|
||||||
|
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
|
||||||
|
f875bd7d90d1 telegraf "/entrypoint.sh tele…" 6 hours ago Up 6 hours 0.0.0.0:8092->8092/tcp, 8092/udp, 0.0.0.0:8094->8094/tcp, 8125/udp, 0.0.0.0:8125->8125/tcp wonderful_antonelli
|
||||||
|
38ee2d5c3cb3 prom/prometheus "/bin/prometheus --c…" 6 hours ago Up 6 hours 0.0.0.0:9090->9090/tcp infallible_mestorf
|
||||||
|
1a1939386c07 tdengine/blm_telegraf "/root/blm_telegraf …" 6 hours ago Up 6 hours 0.0.0.0:10202->10202/tcp stupefied_hypatia
|
||||||
|
7063eb05caa4 tdengine/blm_prometheus "/root/blm_prometheu…" 6 hours ago Up 6 hours 0.0.0.0:10203->10203/tcp jovial_feynman
|
||||||
|
4a7b27931d21 tdengine/tdengine:1.6.4.5 "taosd" 6 hours ago Up 6 hours 0.0.0.0:6020->6020/tcp, 0.0.0.0:6030-6039->6030-6039/tcp, 6040-6050/tcp eager_kowalevski
|
||||||
|
ad2895760bc0 grafana/grafana "/run.sh" 6 hours ago Up 6 hours 0.0.0.0:3000->3000/tcp romantic_mccarthy
|
||||||
|
```
|
||||||
|
当以上几个容器都已正常运行后，则我们的demo小系统已经开始工作了。
|
||||||
|
## Grafana中进行配置
|
||||||
|
打开浏览器，在地址栏输入服务器所在的IP地址
|
||||||
|
`http://localhost:3000`
|
||||||
|
就可以访问到grafana的页面，如果不在本机打开浏览器，则将localhost改成server的ip地址即可。
|
||||||
|
进入登录页面，用户名和密码都是缺省的admin，输入后，即可进入grafana的控制台输入用户名/密码后，会进入修改密码页面，选择skip，跳过这一步。进入Grafana后，可以在页面的左下角看到TDengineDashboardDemo已经创建好了，对于有些浏览器打开时，可能会在home页面中没有TDengineDashboardDemo的选项，可以通过在Dashboard->Manage中选择TDengineDashboardDemo。点击TDengineDashboardDemo进入示例监控面板。刚点进去页面时，监控曲线是空白的，因为监控数据还不够多，需要等待一段时间，让数据采集程序采集更多的数据。
|
||||||
|
|
||||||
|
如上两个监控面板分别监控了CPU和内存占用率。点击面板上的标题可以选择Edit进入编辑界面，新增监控数据。关于Grafana的监控面板设置，可以详细参考Grafana官网文档[Getting Started](https://grafana.com/docs/grafana/latest/guides/getting_started/)。
|
||||||
|
|
||||||
|
## 原理介绍
|
||||||
|
按上面的操作，我们已经将监控系统搭建起来了，目前可以监控系统的CPU占有率了。下面介绍下这个Demo系统的工作原理。
|
||||||
|
如下图所示，这个系统由数据采集功能（prometheus，telegraf），时序数据库功能（TDengine和适配程序），可视化功能(Grafana)组成。下面虚线框里的TDengine，blm_prometheus, blm_telegraf三个容器组成了一个schemaless写入的时序数据库，对于采用telegraf和prometheus作为采集程序的监控对象，可以直接将数据写入TDengine，并通过grafana进行可视化呈现。
|
||||||
|
|
||||||
|
### 数据采集
|
||||||
|
数据采集由Telegraf和Prometheus完成。Telegraf根据配置，从操作系统层面采集系统的相关统计值，并按配置上报给指定的URL，上报的数据json格式为
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"fields":{
|
||||||
|
"usage_guest":0,
|
||||||
|
"usage_guest_nice":0,
|
||||||
|
"usage_idle":87.73726273726274,
|
||||||
|
"usage_iowait":0,
|
||||||
|
"usage_irq":0,
|
||||||
|
"usage_nice":0,
|
||||||
|
"usage_softirq":0,
|
||||||
|
"usage_steal":0,
|
||||||
|
"usage_system":2.6973026973026974,
|
||||||
|
"usage_user":9.565434565434565
|
||||||
|
},
|
||||||
|
"name":"cpu",
|
||||||
|
"tags":{
|
||||||
|
"cpu":"cpu-total",
|
||||||
|
"host":"liutaodeMacBook-Pro.local"
|
||||||
|
},
|
||||||
|
"timestamp":1571665100
|
||||||
|
}
|
||||||
|
```
|
||||||
|
其中name将被作为超级表的表名，tags作为普通表的tags，fields的名称也会作为一个tag用来描述普通表的标签。举个例子，一个普通表的结构如下，这是一个存储usage_softirq数据的普通表。
|
||||||
|
|
||||||
|
|
||||||
|
### Telegraf的配置
|
||||||
|
对于使用telegraf作为数据采集程序的监控对象，可以在telegraf的配置文件telegraf.conf中将outputs.http部分的配置按以下配置修改，就可以直接将数据写入TDengine中了
|
||||||
|
```toml
|
||||||
|
[[outputs.http]]
|
||||||
|
# ## URL is the address to send metrics to
|
||||||
|
url = "http://172.15.1.8:10202/telegraf"
|
||||||
|
#
|
||||||
|
# ## HTTP Basic Auth credentials
|
||||||
|
# # username = "username"
|
||||||
|
# # password = "pa$$word"
|
||||||
|
#
|
||||||
|
|
||||||
|
data_format = "json"
|
||||||
|
json_timestamp_units = "1ms"
|
||||||
|
```
|
||||||
|
可以打开HTTP basic Auth验证机制，本Demo为了简化没有打开验证功能。
|
||||||
|
对于多个被监控对象，只需要在telegraf.conf文件中都写上以上的配置内容，就可以将数据写入TDengine中了。
|
||||||
|
|
||||||
|
### Telegraf数据在TDengine中的存储结构
|
||||||
|
Telegraf的数据在TDengine中的存储，是以数据name为超级表名，以tags值加上监控对象的ip地址，以及field的属性名作为tag值，存入TDengine中的。
|
||||||
|
以name为cpu的数据为例，telegraf产生的数据为:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"fields":{
|
||||||
|
"usage_guest":0,
|
||||||
|
"usage_guest_nice":0,
|
||||||
|
"usage_idle":87.73726273726274,
|
||||||
|
"usage_iowait":0,
|
||||||
|
"usage_irq":0,
|
||||||
|
"usage_nice":0,
|
||||||
|
"usage_softirq":0,
|
||||||
|
"usage_steal":0,
|
||||||
|
"usage_system":2.6973026973026974,
|
||||||
|
"usage_user":9.565434565434565
|
||||||
|
},
|
||||||
|
"name":"cpu",
|
||||||
|
"tags":{
|
||||||
|
"cpu":"cpu-total",
|
||||||
|
"host":"liutaodeMacBook-Pro.local"
|
||||||
|
},
|
||||||
|
"timestamp":1571665100
|
||||||
|
}
|
||||||
|
```
|
||||||
|
则写入TDengine时会自动存入一个名为cpu的超级表中，这个表的结构如下
|
||||||
|
|
||||||
|
这个超级表的tag字段有cpu,host,srcip,field；其中cpu，host是原始数据携带的tag，而srcip是监控对象的IP地址，field是监控对象cpu类型数据中的fields属性，取值空间为[usage_guest,usage_guest_nice,usage_idle,usage_iowait,usage_irq,usage_nice,usage_softirq,usage_steal,usage_system,usage_user]，每个field值对应着一个具体含义的数据。
|
||||||
|
|
||||||
|
因此，在查询的时候，可以用这些tag来过滤数据，也可以用超级表来聚合数据。
|
||||||
|
### Prometheus的配置
|
||||||
|
对于使用Prometheus作为数据采集程序的监控对象，可以在Prometheus的配置文件prometheus.yaml文件中，将remote write部分的配置按以下配置修改，就可以直接将数据写入TDengine中了。
|
||||||
|
```yaml
|
||||||
|
remote_write:
|
||||||
|
- url: "http://172.15.1.7:10203/receive"
|
||||||
|
```
|
||||||
|
对于多个被监控对象，只需要在每个被监控对象的prometheus配置中增加以上配置内容，就可以将数据写入TDengine中了。
|
||||||
|
### Prometheus数据在TDengine中的存储结构
|
||||||
|
Prometheus的数据在TDengine中的存储，与telegraf类似，也是以数据的name字段为超级表名，以数据的label作为tag值，存入TDengine中
|
||||||
|
以prometheus_engine_queries这个数据为例[prom表结构](https://www.taosdata.com/blog/wp-content/uploads/2020/02/image2020-2-2_0-51-4.png)
|
||||||
|
在TDengine中会自动创建一个prometheus_engine_queries的超级表，tag字段为t_instance，t_job，t_monitor。
|
||||||
|
查询时，可以用这些tag来过滤数据，也可以用超级表来聚合数据。
|
||||||
|
|
||||||
|
## 数据查询
|
||||||
|
我们可以登陆到TDengine的客户端命令，通过命令行看看TDengine里面都存储了些什么数据，顺便也能体验一下TDengine的高性能查询。如何才能登陆到TDengine的客户端，我们可以通过以下几步来完成。
|
||||||
|
首先通过下面的命令查询一下tdengine的Docker ID
|
||||||
|
```sh
|
||||||
|
docker container ls
|
||||||
|
```
|
||||||
|
然后再执行
|
||||||
|
```sh
|
||||||
|
docker exec -it tdengine的containerID bash
|
||||||
|
```
|
||||||
|
就可以进入TDengine容器的命令行，执行taos，就进入以下界面
|
||||||
|
Telegraf的数据写入时，自动创建了一个名为telegraf的database，可以通过
|
||||||
|
```
|
||||||
|
use telegraf；
|
||||||
|
```
|
||||||
|
使用telegraf这个数据库。然后执行show tables，describe table等命令详细查询下telegraf这个库里保存了些什么数据。
|
||||||
|
具体TDengine的查询语句可以参考[TDengine官方文档](https://www.taosdata.com/cn/documentation/taos-sql/)
|
||||||
|
## 接入多个监控对象
|
||||||
|
就像前面原理介绍的，这个miniDevops的小系统，已经提供了一个时序数据库和可视化系统，对于多台机器的监控，只需要将每台机器的telegraf或prometheus配置按上面所述修改，就可以完成监控数据采集和可视化呈现了。
|
||||||
|
|
@ -0,0 +1,356 @@
|
||||||
|
{
|
||||||
|
"annotations": {
|
||||||
|
"list": [
|
||||||
|
{
|
||||||
|
"builtIn": 1,
|
||||||
|
"datasource": "-- Grafana --",
|
||||||
|
"enable": true,
|
||||||
|
"hide": true,
|
||||||
|
"iconColor": "rgba(0, 211, 255, 1)",
|
||||||
|
"name": "Annotations & Alerts",
|
||||||
|
"type": "dashboard"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"editable": true,
|
||||||
|
"gnetId": null,
|
||||||
|
"graphTooltip": 0,
|
||||||
|
"id": 1,
|
||||||
|
"links": [],
|
||||||
|
"panels": [
|
||||||
|
{
|
||||||
|
"datasource": null,
|
||||||
|
"gridPos": {
|
||||||
|
"h": 8,
|
||||||
|
"w": 6,
|
||||||
|
"x": 0,
|
||||||
|
"y": 0
|
||||||
|
},
|
||||||
|
"id": 6,
|
||||||
|
"options": {
|
||||||
|
"fieldOptions": {
|
||||||
|
"calcs": [
|
||||||
|
"mean"
|
||||||
|
],
|
||||||
|
"defaults": {
|
||||||
|
"color": {
|
||||||
|
"mode": "thresholds"
|
||||||
|
},
|
||||||
|
"links": [
|
||||||
|
{
|
||||||
|
"title": "",
|
||||||
|
"url": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"mappings": [],
|
||||||
|
"max": 100,
|
||||||
|
"min": 0,
|
||||||
|
"thresholds": {
|
||||||
|
"mode": "absolute",
|
||||||
|
"steps": [
|
||||||
|
{
|
||||||
|
"color": "green",
|
||||||
|
"value": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"color": "red",
|
||||||
|
"value": 80
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"unit": "percent"
|
||||||
|
},
|
||||||
|
"overrides": [],
|
||||||
|
"values": false
|
||||||
|
},
|
||||||
|
"orientation": "auto",
|
||||||
|
"showThresholdLabels": false,
|
||||||
|
"showThresholdMarkers": true
|
||||||
|
},
|
||||||
|
"pluginVersion": "6.6.0",
|
||||||
|
"targets": [
|
||||||
|
{
|
||||||
|
"refId": "A",
|
||||||
|
"sql": "select last_row(value) from telegraf.mem where field=\"used_percent\""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"timeFrom": null,
|
||||||
|
"timeShift": null,
|
||||||
|
"title": "Memory used percent",
|
||||||
|
"type": "gauge"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"aliasColors": {},
|
||||||
|
"bars": false,
|
||||||
|
"dashLength": 10,
|
||||||
|
"dashes": false,
|
||||||
|
"datasource": null,
|
||||||
|
"fill": 1,
|
||||||
|
"fillGradient": 0,
|
||||||
|
"gridPos": {
|
||||||
|
"h": 8,
|
||||||
|
"w": 12,
|
||||||
|
"x": 6,
|
||||||
|
"y": 0
|
||||||
|
},
|
||||||
|
"hiddenSeries": false,
|
||||||
|
"id": 8,
|
||||||
|
"legend": {
|
||||||
|
"avg": false,
|
||||||
|
"current": false,
|
||||||
|
"max": false,
|
||||||
|
"min": false,
|
||||||
|
"show": true,
|
||||||
|
"total": false,
|
||||||
|
"values": false
|
||||||
|
},
|
||||||
|
"lines": true,
|
||||||
|
"linewidth": 1,
|
||||||
|
"nullPointMode": "null",
|
||||||
|
"options": {
|
||||||
|
"dataLinks": []
|
||||||
|
},
|
||||||
|
"percentage": false,
|
||||||
|
"pointradius": 2,
|
||||||
|
"points": false,
|
||||||
|
"renderer": "flot",
|
||||||
|
"seriesOverrides": [],
|
||||||
|
"spaceLength": 10,
|
||||||
|
"stack": false,
|
||||||
|
"steppedLine": false,
|
||||||
|
"targets": [
|
||||||
|
{
|
||||||
|
"alias": "MEMUSED-PERCENT",
|
||||||
|
"refId": "A",
|
||||||
|
"sql": "select avg(value) from telegraf.mem where field=\"used_percent\" interval(1m)"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"thresholds": [],
|
||||||
|
"timeFrom": null,
|
||||||
|
"timeRegions": [],
|
||||||
|
"timeShift": null,
|
||||||
|
"title": "MEM",
|
||||||
|
"tooltip": {
|
||||||
|
"shared": true,
|
||||||
|
"sort": 0,
|
||||||
|
"value_type": "individual"
|
||||||
|
},
|
||||||
|
"type": "graph",
|
||||||
|
"xaxis": {
|
||||||
|
"buckets": null,
|
||||||
|
"mode": "time",
|
||||||
|
"name": null,
|
||||||
|
"show": true,
|
||||||
|
"values": []
|
||||||
|
},
|
||||||
|
"yaxes": [
|
||||||
|
{
|
||||||
|
"format": "short",
|
||||||
|
"label": null,
|
||||||
|
"logBase": 1,
|
||||||
|
"max": null,
|
||||||
|
"min": null,
|
||||||
|
"show": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "short",
|
||||||
|
"label": null,
|
||||||
|
"logBase": 1,
|
||||||
|
"max": null,
|
||||||
|
"min": null,
|
||||||
|
"show": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"yaxis": {
|
||||||
|
"align": false,
|
||||||
|
"alignLevel": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"datasource": null,
|
||||||
|
"gridPos": {
|
||||||
|
"h": 3,
|
||||||
|
"w": 18,
|
||||||
|
"x": 0,
|
||||||
|
"y": 8
|
||||||
|
},
|
||||||
|
"id": 10,
|
||||||
|
"options": {
|
||||||
|
"displayMode": "lcd",
|
||||||
|
"fieldOptions": {
|
||||||
|
"calcs": [
|
||||||
|
"mean"
|
||||||
|
],
|
||||||
|
"defaults": {
|
||||||
|
"mappings": [],
|
||||||
|
"thresholds": {
|
||||||
|
"mode": "absolute",
|
||||||
|
"steps": [
|
||||||
|
{
|
||||||
|
"color": "green",
|
||||||
|
"value": null
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"unit": "percent"
|
||||||
|
},
|
||||||
|
"overrides": [],
|
||||||
|
"values": false
|
||||||
|
},
|
||||||
|
"orientation": "auto",
|
||||||
|
"showUnfilled": true
|
||||||
|
},
|
||||||
|
"pluginVersion": "6.6.0",
|
||||||
|
"targets": [
|
||||||
|
{
|
||||||
|
"alias": "CPU-SYS",
|
||||||
|
"refId": "A",
|
||||||
|
"sql": "select last_row(value) from telegraf.cpu where field=\"usage_system\""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"alias": "CPU-IDLE",
|
||||||
|
"refId": "B",
|
||||||
|
"sql": "select last_row(value) from telegraf.cpu where field=\"usage_idle\""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"alias": "CPU-USER",
|
||||||
|
"refId": "C",
|
||||||
|
"sql": "select last_row(value) from telegraf.cpu where field=\"usage_user\""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"timeFrom": null,
|
||||||
|
"timeShift": null,
|
||||||
|
"title": "CPU-USED",
|
||||||
|
"type": "bargauge"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"aliasColors": {},
|
||||||
|
"bars": false,
|
||||||
|
"dashLength": 10,
|
||||||
|
"dashes": false,
|
||||||
|
"datasource": "TDengine",
|
||||||
|
"description": "General CPU monitor",
|
||||||
|
"fill": 1,
|
||||||
|
"fillGradient": 0,
|
||||||
|
"gridPos": {
|
||||||
|
"h": 9,
|
||||||
|
"w": 18,
|
||||||
|
"x": 0,
|
||||||
|
"y": 11
|
||||||
|
},
|
||||||
|
"hiddenSeries": false,
|
||||||
|
"id": 2,
|
||||||
|
"legend": {
|
||||||
|
"avg": false,
|
||||||
|
"current": false,
|
||||||
|
"max": false,
|
||||||
|
"min": false,
|
||||||
|
"show": true,
|
||||||
|
"total": false,
|
||||||
|
"values": false
|
||||||
|
},
|
||||||
|
"lines": true,
|
||||||
|
"linewidth": 1,
|
||||||
|
"nullPointMode": "null",
|
||||||
|
"options": {
|
||||||
|
"dataLinks": []
|
||||||
|
},
|
||||||
|
"percentage": false,
|
||||||
|
"pointradius": 2,
|
||||||
|
"points": false,
|
||||||
|
"renderer": "flot",
|
||||||
|
"seriesOverrides": [],
|
||||||
|
"spaceLength": 10,
|
||||||
|
"stack": false,
|
||||||
|
"steppedLine": false,
|
||||||
|
"targets": [
|
||||||
|
{
|
||||||
|
"alias": "CPU-USER",
|
||||||
|
"refId": "A",
|
||||||
|
"sql": "select avg(value) from telegraf.cpu where field=\"usage_user\" and cpu=\"cpu-total\" interval(1m)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"alias": "CPU-SYS",
|
||||||
|
"refId": "B",
|
||||||
|
"sql": "select avg(value) from telegraf.cpu where field=\"usage_system\" and cpu=\"cpu-total\" interval(1m)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"alias": "CPU-IDLE",
|
||||||
|
"refId": "C",
|
||||||
|
"sql": "select avg(value) from telegraf.cpu where field=\"usage_idle\" and cpu=\"cpu-total\" interval(1m)"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"thresholds": [],
|
||||||
|
"timeFrom": null,
|
||||||
|
"timeRegions": [],
|
||||||
|
"timeShift": null,
|
||||||
|
"title": "CPU",
|
||||||
|
"tooltip": {
|
||||||
|
"shared": true,
|
||||||
|
"sort": 0,
|
||||||
|
"value_type": "individual"
|
||||||
|
},
|
||||||
|
"type": "graph",
|
||||||
|
"xaxis": {
|
||||||
|
"buckets": null,
|
||||||
|
"mode": "time",
|
||||||
|
"name": null,
|
||||||
|
"show": true,
|
||||||
|
"values": []
|
||||||
|
},
|
||||||
|
"yaxes": [
|
||||||
|
{
|
||||||
|
"format": "short",
|
||||||
|
"label": null,
|
||||||
|
"logBase": 1,
|
||||||
|
"max": null,
|
||||||
|
"min": null,
|
||||||
|
"show": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "short",
|
||||||
|
"label": null,
|
||||||
|
"logBase": 1,
|
||||||
|
"max": null,
|
||||||
|
"min": null,
|
||||||
|
"show": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"yaxis": {
|
||||||
|
"align": false,
|
||||||
|
"alignLevel": null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"refresh": "10s",
|
||||||
|
"schemaVersion": 22,
|
||||||
|
"style": "dark",
|
||||||
|
"tags": [
|
||||||
|
"demo"
|
||||||
|
],
|
||||||
|
"templating": {
|
||||||
|
"list": []
|
||||||
|
},
|
||||||
|
"time": {
|
||||||
|
"from": "now-3h",
|
||||||
|
"to": "now"
|
||||||
|
},
|
||||||
|
"timepicker": {
|
||||||
|
"refresh_intervals": [
|
||||||
|
"5s",
|
||||||
|
"10s",
|
||||||
|
"30s",
|
||||||
|
"1m",
|
||||||
|
"5m",
|
||||||
|
"15m",
|
||||||
|
"30m",
|
||||||
|
"1h",
|
||||||
|
"2h",
|
||||||
|
"1d"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"timezone": "",
|
||||||
|
"title": "TDengineDashboardDemo",
|
||||||
|
"uid": "2lF1wNUWz",
|
||||||
|
"version": 4
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
TDengine Datasource - build by Taosdata Inc. www.taosdata.com
|
||||||
|
|
||||||
|
TDengine backend server implement 2 urls:
|
||||||
|
|
||||||
|
* `/heartbeat` return 200 ok. Used for "Test connection" on the datasource config page.
|
||||||
|
* `/query` return data based on input sqls.
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
To install this plugin:
|
||||||
|
Copy the data source you want to /var/lib/grafana/plugins/. Then restart grafana-server. The new data source should now be available in the data source type dropdown in the Add Data Source View.
|
||||||
|
|
||||||
|
```
|
||||||
|
cp -r <tdengine-extrach-dir>/connector/grafana/tdengine /var/lib/grafana/plugins/
|
||||||
|
sudo service grafana-server restart
|
||||||
|
```
|
||||||
|
|
||||||
|
### Query API
|
||||||
|
|
||||||
|
Example request
|
||||||
|
``` javascript
|
||||||
|
[{
|
||||||
|
"refId": "A",
|
||||||
|
"alias": "taosd-memory",
|
||||||
|
"sql": "select avg(mem_taosd) from sys.dn where ts > now-5m and ts < now interval(500a)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"refId": "B",
|
||||||
|
"alias": "system-memory",
|
||||||
|
"sql": "select avg(mem_system) from sys.dn where ts > now-5m and ts < now interval(500a)"
|
||||||
|
}]
|
||||||
|
```
|
||||||
|
|
||||||
|
Example response
|
||||||
|
``` javascript
|
||||||
|
[{
|
||||||
|
"datapoints": [
|
||||||
|
[206.488281, 1538137825000],
|
||||||
|
[206.488281, 1538137855000],
|
||||||
|
[206.488281, 1538137885500],
|
||||||
|
[210.609375, 1538137915500],
|
||||||
|
[210.867188, 1538137945500]
|
||||||
|
],
|
||||||
|
"refId": "A",
|
||||||
|
"target": "taosd-memory"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"datapoints": [
|
||||||
|
[2910.218750, 1538137825000],
|
||||||
|
[2912.265625, 1538137855000],
|
||||||
|
[2912.437500, 1538137885500],
|
||||||
|
[2916.644531, 1538137915500],
|
||||||
|
[2917.066406, 1538137945500]
|
||||||
|
],
|
||||||
|
"refId": "B",
|
||||||
|
"target": "system-memory"
|
||||||
|
}]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Heartbeat API
|
||||||
|
|
||||||
|
Example request
|
||||||
|
``` javascript
|
||||||
|
<null> get request
|
||||||
|
```
|
||||||
|
|
||||||
|
Example response
|
||||||
|
``` javascript
|
||||||
|
{
|
||||||
|
"message": "Grafana server receive a quest from you!"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
.generic-datasource-query-row .query-keyword {
|
||||||
|
width: 75px;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,170 @@
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
System.register(['lodash'], function (_export, _context) {
|
||||||
|
"use strict";
|
||||||
|
var _, _createClass, GenericDatasource;
|
||||||
|
|
||||||
|
function strTrim(str) {
|
||||||
|
return str.replace(/^\s+|\s+$/gm,'');
|
||||||
|
}
|
||||||
|
|
||||||
|
function _classCallCheck(instance, Constructor) {
|
||||||
|
if (!(instance instanceof Constructor)) {
|
||||||
|
throw new TypeError("Cannot call a class as a function");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
setters: [function (_lodash) {
|
||||||
|
_ = _lodash.default;
|
||||||
|
}],
|
||||||
|
execute: function () {
|
||||||
|
_createClass = function () {
|
||||||
|
function defineProperties(target, props) {
|
||||||
|
for (var i = 0; i < props.length; i++) {
|
||||||
|
var descriptor = props[i];
|
||||||
|
descriptor.enumerable = descriptor.enumerable || false;
|
||||||
|
descriptor.configurable = true;
|
||||||
|
if ("value" in descriptor) descriptor.writable = true;
|
||||||
|
Object.defineProperty(target, descriptor.key, descriptor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return function (Constructor, protoProps, staticProps) {
|
||||||
|
if (protoProps) defineProperties(Constructor.prototype, protoProps);
|
||||||
|
if (staticProps) defineProperties(Constructor, staticProps);
|
||||||
|
return Constructor;
|
||||||
|
};
|
||||||
|
}();
|
||||||
|
|
||||||
|
_export('GenericDatasource', GenericDatasource = function () {
|
||||||
|
function GenericDatasource(instanceSettings, $q, backendSrv, templateSrv) {
|
||||||
|
_classCallCheck(this, GenericDatasource);
|
||||||
|
|
||||||
|
this.type = instanceSettings.type;
|
||||||
|
this.url = instanceSettings.url;
|
||||||
|
this.name = instanceSettings.name;
|
||||||
|
this.q = $q;
|
||||||
|
this.backendSrv = backendSrv;
|
||||||
|
this.templateSrv = templateSrv;
|
||||||
|
//this.withCredentials = instanceSettings.withCredentials;
|
||||||
|
this.headers = { 'Content-Type': 'application/json' };
|
||||||
|
var taosuser = instanceSettings.jsonData.user;
|
||||||
|
var taospwd = instanceSettings.jsonData.password;
|
||||||
|
if (taosuser == null || taosuser == undefined || taosuser == "") {
|
||||||
|
taosuser = "root";
|
||||||
|
}
|
||||||
|
if (taospwd == null || taospwd == undefined || taospwd == "") {
|
||||||
|
taospwd = "taosdata";
|
||||||
|
}
|
||||||
|
|
||||||
|
this.headers.Authorization = "Basic " + this.encode(taosuser + ":" + taospwd);
|
||||||
|
}
|
||||||
|
|
||||||
|
_createClass(GenericDatasource, [{
|
||||||
|
key: 'encode',
|
||||||
|
value: function encode(input) {
|
||||||
|
var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
|
||||||
|
var output = "";
|
||||||
|
var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
|
||||||
|
var i = 0;
|
||||||
|
while (i < input.length) {
|
||||||
|
chr1 = input.charCodeAt(i++);
|
||||||
|
chr2 = input.charCodeAt(i++);
|
||||||
|
chr3 = input.charCodeAt(i++);
|
||||||
|
enc1 = chr1 >> 2;
|
||||||
|
enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
|
||||||
|
enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
|
||||||
|
enc4 = chr3 & 63;
|
||||||
|
if (isNaN(chr2)) {
|
||||||
|
enc3 = enc4 = 64;
|
||||||
|
} else if (isNaN(chr3)) {
|
||||||
|
enc4 = 64;
|
||||||
|
}
|
||||||
|
output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
|
||||||
|
}
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
key: 'generateSql',
|
||||||
|
value: function generateSql(sql, queryStart, queryEnd, intervalMs) {
|
||||||
|
if (queryStart == undefined || queryStart == null) {
|
||||||
|
queryStart = "now-1h";
|
||||||
|
}
|
||||||
|
if (queryEnd == undefined || queryEnd == null) {
|
||||||
|
queryEnd = "now";
|
||||||
|
}
|
||||||
|
if (intervalMs == undefined || intervalMs == null) {
|
||||||
|
intervalMs = "20000";
|
||||||
|
}
|
||||||
|
|
||||||
|
intervalMs += "a";
|
||||||
|
sql = sql.replace(/^\s+|\s+$/gm, '');
|
||||||
|
sql = sql.replace("$from", "'" + queryStart + "'");
|
||||||
|
sql = sql.replace("$begin", "'" + queryStart + "'");
|
||||||
|
sql = sql.replace("$to", "'" + queryEnd + "'");
|
||||||
|
sql = sql.replace("$end", "'" + queryEnd + "'");
|
||||||
|
sql = sql.replace("$interval", intervalMs);
|
||||||
|
|
||||||
|
return sql;
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
key: 'query',
|
||||||
|
value: function query(options) {
|
||||||
|
var querys = new Array;
|
||||||
|
for (var i = 0; i < options.targets.length; ++i) {
|
||||||
|
var query = new Object;
|
||||||
|
|
||||||
|
query.refId = options.targets[i].refId;
|
||||||
|
query.alias = options.targets[i].alias;
|
||||||
|
if (query.alias == null || query.alias == undefined) {
|
||||||
|
query.alias = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
//query.sql = this.generateSql(options.targets[i].sql, options.range.raw.from, options.range.raw.to, options.intervalMs);
|
||||||
|
query.sql = this.generateSql(options.targets[i].sql, options.range.from.toISOString(), options.range.to.toISOString(), options.intervalMs);
|
||||||
|
console.log(query.sql);
|
||||||
|
|
||||||
|
querys.push(query);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (querys.length <= 0) {
|
||||||
|
return this.q.when({ data: [] });
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.doRequest({
|
||||||
|
url: this.url + '/grafana/query',
|
||||||
|
data: querys,
|
||||||
|
method: 'POST'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
key: 'testDatasource',
|
||||||
|
value: function testDatasource() {
|
||||||
|
return this.doRequest({
|
||||||
|
url: this.url + '/grafana/heartbeat',
|
||||||
|
method: 'GET'
|
||||||
|
}).then(function (response) {
|
||||||
|
if (response.status === 200) {
|
||||||
|
return { status: "success", message: "TDengine Data source is working", title: "Success" };
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
key: 'doRequest',
|
||||||
|
value: function doRequest(options) {
|
||||||
|
options.headers = this.headers;
|
||||||
|
//console.log(options);
|
||||||
|
return this.backendSrv.datasourceRequest(options);
|
||||||
|
}
|
||||||
|
}]);
|
||||||
|
|
||||||
|
return GenericDatasource;
|
||||||
|
}());
|
||||||
|
|
||||||
|
_export('GenericDatasource', GenericDatasource);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
//# sourceMappingURL=datasource.js.map
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
|
|
@ -0,0 +1,51 @@
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
System.register(['./datasource', './query_ctrl'], function (_export, _context) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var GenericDatasource, GenericDatasourceQueryCtrl, GenericConfigCtrl, GenericQueryOptionsCtrl, GenericAnnotationsQueryCtrl;
|
||||||
|
|
||||||
|
function _classCallCheck(instance, Constructor) {
|
||||||
|
if (!(instance instanceof Constructor)) {
|
||||||
|
throw new TypeError("Cannot call a class as a function");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
setters: [function (_datasource) {
|
||||||
|
GenericDatasource = _datasource.GenericDatasource;
|
||||||
|
}, function (_query_ctrl) {
|
||||||
|
GenericDatasourceQueryCtrl = _query_ctrl.GenericDatasourceQueryCtrl;
|
||||||
|
}],
|
||||||
|
execute: function () {
|
||||||
|
_export('ConfigCtrl', GenericConfigCtrl = function GenericConfigCtrl() {
|
||||||
|
_classCallCheck(this, GenericConfigCtrl);
|
||||||
|
});
|
||||||
|
|
||||||
|
GenericConfigCtrl.templateUrl = 'partials/config.html';
|
||||||
|
|
||||||
|
_export('QueryOptionsCtrl', GenericQueryOptionsCtrl = function GenericQueryOptionsCtrl() {
|
||||||
|
_classCallCheck(this, GenericQueryOptionsCtrl);
|
||||||
|
});
|
||||||
|
|
||||||
|
GenericQueryOptionsCtrl.templateUrl = 'partials/query.options.html';
|
||||||
|
|
||||||
|
_export('AnnotationsQueryCtrl', GenericAnnotationsQueryCtrl = function GenericAnnotationsQueryCtrl() {
|
||||||
|
_classCallCheck(this, GenericAnnotationsQueryCtrl);
|
||||||
|
});
|
||||||
|
|
||||||
|
GenericAnnotationsQueryCtrl.templateUrl = 'partials/annotations.editor.html';
|
||||||
|
|
||||||
|
_export('Datasource', GenericDatasource);
|
||||||
|
|
||||||
|
_export('QueryCtrl', GenericDatasourceQueryCtrl);
|
||||||
|
|
||||||
|
_export('ConfigCtrl', GenericConfigCtrl);
|
||||||
|
|
||||||
|
_export('QueryOptionsCtrl', GenericQueryOptionsCtrl);
|
||||||
|
|
||||||
|
_export('AnnotationsQueryCtrl', GenericAnnotationsQueryCtrl);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
//# sourceMappingURL=module.js.map
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
<h3 class="page-heading">TDengine Connection</h3>
|
||||||
|
|
||||||
|
<div class="gf-form-group">
|
||||||
|
<div class="gf-form max-width-30">
|
||||||
|
<span class="gf-form-label width-7">Host</span>
|
||||||
|
<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6020" bs-typeahead="{{['http://localhost:6020']}}" required></input>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="gf-form-inline">
|
||||||
|
<div class="gf-form max-width-15">
|
||||||
|
<span class="gf-form-label width-7">User</span>
|
||||||
|
<input type="text" class="gf-form-input" ng-model='ctrl.current.jsonData.user' placeholder="root"></input>
|
||||||
|
</div>
|
||||||
|
<div class="gf-form max-width-15">
|
||||||
|
<span class="gf-form-label width-7">Password</span>
|
||||||
|
<input type="password" class="gf-form-input" ng-model='ctrl.current.jsonData.password' placeholder="taosdata"></input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,58 @@
|
||||||
|
<query-editor-row query-ctrl="ctrl" can-collapse="true" >
|
||||||
|
|
||||||
|
<div class="gf-form-inline">
|
||||||
|
<div class="gf-form gf-form--grow">
|
||||||
|
<label class="gf-form-label query-keyword width-7">INPUT SQL</label>
|
||||||
|
<input type="text" class="gf-form-input" ng-model="ctrl.target.sql" spellcheck='false' placeholder="select count(*) from sys.cpu where ts >= $from and ts < $to interval($interval)" ng-blur="ctrl.panelCtrl.refresh()" data-mode="sql"></input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="gf-form-inline">
|
||||||
|
<div class="gf-form-inline" ng-hide="ctrl.target.resultFormat === 'table'">
|
||||||
|
<div class="gf-form max-width-30">
|
||||||
|
<label class="gf-form-label query-keyword width-7">ALIAS BY</label>
|
||||||
|
<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.panelCtrl.refresh()">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="gf-form">
|
||||||
|
<label class="gf-form-label query-keyword" ng-click="ctrl.generateSQL()">
|
||||||
|
GENERATE SQL
|
||||||
|
<i class="fa fa-caret-down" ng-show="ctrl.showGenerateSQL"></i>
|
||||||
|
<i class="fa fa-caret-right" ng-hide="ctrl.showGenerateSQL"></i>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="gf-form">
|
||||||
|
<label class="gf-form-label query-keyword" ng-click="ctrl.showHelp = !ctrl.showHelp">
|
||||||
|
SHOW HELP
|
||||||
|
<i class="fa fa-caret-down" ng-show="ctrl.showHelp"></i>
|
||||||
|
<i class="fa fa-caret-right" ng-hide="ctrl.showHelp"></i>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="gf-form" ng-show="ctrl.showGenerateSQL">
|
||||||
|
<pre class="gf-form-pre">{{ctrl.lastGenerateSQL}}</pre>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="gf-form" ng-show="ctrl.showHelp">
|
||||||
|
<pre class="gf-form-pre alert alert-info">Use any SQL that can return Resultset such as:
|
||||||
|
- [[timestamp1, value1], [timestamp2, value2], ... ]
|
||||||
|
|
||||||
|
Macros:
|
||||||
|
- $from -> start timestamp of panel
|
||||||
|
- $to -> stop timestamp of panel
|
||||||
|
- $interval -> interval of panel
|
||||||
|
|
||||||
|
Example of SQL:
|
||||||
|
SELECT count(*)
|
||||||
|
FROM db.table
|
||||||
|
WHERE ts > $from and ts < $to
|
||||||
|
INTERVAL ($interval)
|
||||||
|
</pre>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="gf-form" ng-show="ctrl.lastQueryError">
|
||||||
|
<pre class="gf-form-pre alert alert-error">{{ctrl.lastQueryError}}</pre>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</query-editor-row>
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
{
|
||||||
|
"name": "TDengine",
|
||||||
|
"id": "tdengine",
|
||||||
|
"type": "datasource",
|
||||||
|
|
||||||
|
"partials": {
|
||||||
|
"config": "partials/config.html"
|
||||||
|
},
|
||||||
|
|
||||||
|
"metrics": true,
|
||||||
|
"annotations": false,
|
||||||
|
"alerting": true,
|
||||||
|
|
||||||
|
"info": {
|
||||||
|
"description": "TDengine datasource",
|
||||||
|
"author": {
|
||||||
|
"name": "Taosdata Inc.",
|
||||||
|
"url": "https://www.taosdata.com"
|
||||||
|
},
|
||||||
|
"logos": {
|
||||||
|
"small": "img/taosdata_logo.png",
|
||||||
|
"large": "img/taosdata_logo.png"
|
||||||
|
},
|
||||||
|
"version": "1.6.0",
|
||||||
|
"updated": "2019-07-01"
|
||||||
|
},
|
||||||
|
|
||||||
|
"dependencies": {
|
||||||
|
"grafanaVersion": "5.2.4",
|
||||||
|
"plugins": [ ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,91 @@
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
System.register(['app/plugins/sdk'], function (_export, _context) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var QueryCtrl, _createClass, GenericDatasourceQueryCtrl;
|
||||||
|
|
||||||
|
function _classCallCheck(instance, Constructor) {
|
||||||
|
if (!(instance instanceof Constructor)) {
|
||||||
|
throw new TypeError("Cannot call a class as a function");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function _possibleConstructorReturn(self, call) {
|
||||||
|
if (!self) {
|
||||||
|
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
|
||||||
|
}
|
||||||
|
|
||||||
|
return call && (typeof call === "object" || typeof call === "function") ? call : self;
|
||||||
|
}
|
||||||
|
|
||||||
|
function _inherits(subClass, superClass) {
|
||||||
|
if (typeof superClass !== "function" && superClass !== null) {
|
||||||
|
throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
subClass.prototype = Object.create(superClass && superClass.prototype, {
|
||||||
|
constructor: {
|
||||||
|
value: subClass,
|
||||||
|
enumerable: false,
|
||||||
|
writable: true,
|
||||||
|
configurable: true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
setters: [function (_appPluginsSdk) {
|
||||||
|
QueryCtrl = _appPluginsSdk.QueryCtrl;
|
||||||
|
}, function (_cssQueryEditorCss) {}],
|
||||||
|
execute: function () {
|
||||||
|
_createClass = function () {
|
||||||
|
function defineProperties(target, props) {
|
||||||
|
for (var i = 0; i < props.length; i++) {
|
||||||
|
var descriptor = props[i];
|
||||||
|
descriptor.enumerable = descriptor.enumerable || false;
|
||||||
|
descriptor.configurable = true;
|
||||||
|
if ("value" in descriptor) descriptor.writable = true;
|
||||||
|
Object.defineProperty(target, descriptor.key, descriptor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return function (Constructor, protoProps, staticProps) {
|
||||||
|
if (protoProps) defineProperties(Constructor.prototype, protoProps);
|
||||||
|
if (staticProps) defineProperties(Constructor, staticProps);
|
||||||
|
return Constructor;
|
||||||
|
};
|
||||||
|
}();
|
||||||
|
|
||||||
|
_export('GenericDatasourceQueryCtrl', GenericDatasourceQueryCtrl = function (_QueryCtrl) {
|
||||||
|
_inherits(GenericDatasourceQueryCtrl, _QueryCtrl);
|
||||||
|
|
||||||
|
function GenericDatasourceQueryCtrl($scope, $injector) {
|
||||||
|
_classCallCheck(this, GenericDatasourceQueryCtrl);
|
||||||
|
|
||||||
|
var _this = _possibleConstructorReturn(this, (GenericDatasourceQueryCtrl.__proto__ || Object.getPrototypeOf(GenericDatasourceQueryCtrl)).call(this, $scope, $injector));
|
||||||
|
|
||||||
|
_this.scope = $scope;
|
||||||
|
return _this;
|
||||||
|
}
|
||||||
|
|
||||||
|
_createClass(GenericDatasourceQueryCtrl, [{
|
||||||
|
key: 'generateSQL',
|
||||||
|
value: function generateSQL(query) {
|
||||||
|
//this.lastGenerateSQL = this.datasource.generateSql(this.target.sql, this.panelCtrl.range.raw.from, this.panelCtrl.range.raw.to, this.panelCtrl.intervalMs);
|
||||||
|
this.lastGenerateSQL = this.datasource.generateSql(this.target.sql, this.panelCtrl.range.from.toISOString(), this.panelCtrl.range.to.toISOString(), this.panelCtrl.intervalMs);
|
||||||
|
this.showGenerateSQL = !this.showGenerateSQL;
|
||||||
|
}
|
||||||
|
}]);
|
||||||
|
|
||||||
|
return GenericDatasourceQueryCtrl;
|
||||||
|
}(QueryCtrl));
|
||||||
|
|
||||||
|
_export('GenericDatasourceQueryCtrl', GenericDatasourceQueryCtrl);
|
||||||
|
|
||||||
|
GenericDatasourceQueryCtrl.templateUrl = 'partials/query.editor.html';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
//# sourceMappingURL=query_ctrl.js.map
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
global:
|
||||||
|
scrape_interval: 15s # By default, scrape targets every 15 seconds.
|
||||||
|
|
||||||
|
# Attach these labels to any time series or alerts when communicating with
|
||||||
|
# external systems (federation, remote storage, Alertmanager).
|
||||||
|
external_labels:
|
||||||
|
monitor: 'codelab-monitor'
|
||||||
|
|
||||||
|
remote_write:
|
||||||
|
- url: "http://172.15.1.7:10203/receive"
|
||||||
|
|
||||||
|
# A scrape configuration containing exactly one endpoint to scrape:
|
||||||
|
# Here it's Prometheus itself.
|
||||||
|
scrape_configs:
|
||||||
|
# The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
|
||||||
|
- job_name: 'prometheus'
|
||||||
|
|
||||||
|
# Override the global default and scrape targets from this job every 5 seconds.
|
||||||
|
scrape_interval: 5s
|
||||||
|
|
||||||
|
static_configs:
|
||||||
|
- targets: ['localhost:9090']
|
||||||
|
|
||||||
|
# - job_name: 'example-random'
|
||||||
|
|
||||||
|
# # Override the global default and scrape targets from this job every 5 seconds.
|
||||||
|
# scrape_interval: 5s
|
||||||
|
|
||||||
|
# static_configs:
|
||||||
|
# - targets: ['172.17.0.6:8080', '172.17.0.6:8081']
|
||||||
|
# labels:
|
||||||
|
# group: 'production'
|
||||||
|
|
||||||
|
# - targets: ['172.17.0.6:8082']
|
||||||
|
# labels:
|
||||||
|
# group: 'canary'
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
#set -x
|
||||||
|
LP=`pwd`
|
||||||
|
#echo $LP
|
||||||
|
|
||||||
|
docker rm -f `docker ps -a -q`
|
||||||
|
docker network rm minidevops
|
||||||
|
docker network create --ip-range 172.15.1.255/24 --subnet 172.15.1.1/16 minidevops
|
||||||
|
|
||||||
|
#docker run -d --net="host" --pid="host" -v "/:/host:ro" quay.io/prometheus/node-exporter --path.rootfs=/host
|
||||||
|
|
||||||
|
docker run -d --net minidevops --ip 172.15.1.11 -v $LP/grafana:/var/lib/grafana/plugins -p 3000:3000 grafana/grafana
|
||||||
|
#docker run -d --net minidevops --ip 172.15.1.11 -v /Users/tom/Documents/minidevops/grafana:/var/lib/grafana/plugins -p 3000:3000 grafana/grafana
|
||||||
|
|
||||||
|
TDENGINE=`docker run -d --net minidevops --ip 172.15.1.6 -p 6030:6030 -p 6020:6020 -p 6031:6031 -p 6032:6032 -p 6033:6033 -p 6034:6034 -p 6035:6035 -p 6036:6036 -p 6037:6037 -p 6038:6038 -p 6039:6039 tdengine/tdengine:1.6.4.5`
|
||||||
|
docker cp /etc/localtime $TDENGINE:/etc/localtime
|
||||||
|
|
||||||
|
BLMPROMETHEUS=`docker run -d --net minidevops --ip 172.15.1.7 -p 10203:10203 tdengine/blm_prometheus 172.15.1.6`
|
||||||
|
|
||||||
|
|
||||||
|
BLMPTELEGRAF=`docker run -d --net minidevops --ip 172.15.1.8 -p 10202:10202 tdengine/blm_telegraf 172.15.1.6`
|
||||||
|
|
||||||
|
docker run -d --net minidevops --ip 172.15.1.9 -v $LP/prometheus:/etc/prometheus -p 9090:9090 prom/prometheus
|
||||||
|
#docker run -d --net minidevops --ip 172.15.1.9 -v /Users/tom/Documents/minidevops/prometheus:/etc/prometheus -p 9090:9090 prom/prometheus
|
||||||
|
|
||||||
|
docker run -d --net minidevops --ip 172.15.1.10 -v $LP/telegraf:/etc/telegraf -p 8092:8092 -p 8094:8094 -p 8125:8125 telegraf
|
||||||
|
#docker run -d --net minidevops --ip 172.15.1.10 -v /Users/tom/Documents/minidevops/telegraf:/etc/telegraf -p 8092:8092 -p 8094:8094 -p 8125:8125 telegraf
|
||||||
|
|
||||||
|
|
||||||
|
sleep 10
|
||||||
|
curl -X POST http://localhost:3000/api/datasources --header "Content-Type:application/json" -u admin:admin -d '{"Name": "TDengine","Type": "tdengine","TypeLogoUrl": "public/plugins/tdengine/img/taosdata_logo.png","Access": "proxy","Url": "http://172.15.1.6:6020","BasicAuth": false,"isDefault": true,"jsonData": {},"readOnly": false}'
|
||||||
|
|
||||||
|
curl -X POST http://localhost:3000/api/dashboards/db --header "Content-Type:application/json" -u admin:admin -d '{"dashboard":{"annotations":{"list":[{"builtIn":1,"datasource":"-- Grafana --","enable":true,"hide":true,"iconColor":"rgba(0, 211, 255, 1)","name":"Annotations & Alerts","type":"dashboard"}]},"editable":true,"gnetId":null,"graphTooltip":0,"id":1,"links":[],"panels":[{"datasource":null,"gridPos":{"h":8,"w":6,"x":0,"y":0},"id":6,"options":{"fieldOptions":{"calcs":["mean"],"defaults":{"color":{"mode":"thresholds"},"links":[{"title":"","url":""}],"mappings":[],"max":100,"min":0,"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null},{"color":"red","value":80}]},"unit":"percent"},"overrides":[],"values":false},"orientation":"auto","showThresholdLabels":false,"showThresholdMarkers":true},"pluginVersion":"6.6.0","targets":[{"refId":"A","sql":"select last_row(value) from telegraf.mem where field=\"used_percent\""}],"timeFrom":null,"timeShift":null,"title":"Memory used percent","type":"gauge"},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":null,"fill":1,"fillGradient":0,"gridPos":{"h":8,"w":12,"x":6,"y":0},"hiddenSeries":false,"id":8,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"MEMUSED-PERCENT","refId":"A","sql":"select avg(value) from telegraf.mem where field=\"used_percent\" interval(1m)"}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"MEM","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}},{"datasource":null,"gridPos":{"h":3,"w":18,"x":0,"y":8},"id":10,"options":{"displayMode":"lcd","fieldOptions":{"calcs":["mean"],"defaults":{"mappings":[],"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null}]},"unit":"percent"},"overrides":[],"values":false},"orientation":"auto","showUnfilled":true},"pluginVersion":"6.6.0","targets":[{"alias":"CPU-SYS","refId":"A","sql":"select last_row(value) from telegraf.cpu where field=\"usage_system\""},{"alias":"CPU-IDLE","refId":"B","sql":"select last_row(value) from telegraf.cpu where field=\"usage_idle\""},{"alias":"CPU-USER","refId":"C","sql":"select last_row(value) from telegraf.cpu where field=\"usage_user\""}],"timeFrom":null,"timeShift":null,"title":"CPU-USED","type":"bargauge"},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"TDengine","description":"General CPU monitor","fill":1,"fillGradient":0,"gridPos":{"h":9,"w":18,"x":0,"y":11},"hiddenSeries":false,"id":2,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"CPU-USER","refId":"A","sql":"select avg(value) from telegraf.cpu where field=\"usage_user\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-SYS","refId":"B","sql":"select avg(value) from telegraf.cpu where field=\"usage_system\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-IDLE","refId":"C","sql":"select avg(value) from telegraf.cpu where field=\"usage_idle\" and cpu=\"cpu-total\" interval(1m)"}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"CPU","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}}],"refresh":"10s","schemaVersion":22,"style":"dark","tags":["demo"],"templating":{"list":[]},"time":{"from":"now-3h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"]},"timezone":"","title":"TDengineDashboardDemo","id":null,"uid":null,"version":0}}'
|
||||||
|
|
||||||
|
#curl -X POST http://localhost:3000/api/dashboards/db --header "Content-Type:application/json" -u admin:admin -d '{"dashboard":{"annotations":{"list":[{"builtIn":1,"datasource":"-- Grafana --","enable":true,"hide":true,"iconColor":"rgba(0, 211, 255, 1)","name":"Annotations & Alerts","type":"dashboard"}]},"editable":true,"gnetId":null,"graphTooltip":0,"id":3,"links":[],"panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"TDengine","description":"memory used percent","fill":1,"fillGradient":0,"gridPos":{"h":8,"w":12,"x":0,"y":0},"hiddenSeries":false,"id":4,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"memused-percent","refId":"A","sql":"select avg(value) from telegraf.mem where field=\"used_percent\" interval(1m)"},{"refId":"B","sql":""}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"MEM","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"TDengine","description":"General CPU monitor","fill":1,"fillGradient":0,"gridPos":{"h":9,"w":12,"x":0,"y":8},"hiddenSeries":false,"id":2,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"CPU-USER","refId":"A","sql":"select avg(value) from telegraf.cpu where field=\"usage_user\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-SYS","refId":"B","sql":"select avg(value) from telegraf.cpu where field=\"usage_system\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-IDLE","refId":"C","sql":"select avg(value) from telegraf.cpu where field=\"usage_idle\" and cpu=\"cpu-total\" interval(1m)"}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"CPU","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}}],"refresh":"10s","schemaVersion":21,"style":"dark","tags":["demo"],"templating":{"list":[]},"time":{"from":"now-6h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"]},"timezone":"","title":"TDengineDashboardDemo","id":null,"uid":null,"version":0}}'
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -652,7 +652,16 @@ int32_t parseIntervalClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
|
||||||
|
|
||||||
SColumnList ids = getColumnList(1, 0, PRIMARYKEY_TIMESTAMP_COL_INDEX);
|
SColumnList ids = getColumnList(1, 0, PRIMARYKEY_TIMESTAMP_COL_INDEX);
|
||||||
|
|
||||||
return insertResultField(pQueryInfo, 0, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP, aAggs[TSDB_FUNC_TS].aName);
|
int32_t ret = insertResultField(pQueryInfo, 0, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP, aAggs[TSDB_FUNC_TS].aName);
|
||||||
|
if (ret != TSDB_CODE_SUCCESS) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (setSlidingClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
|
||||||
|
return TSDB_CODE_INVALID_SQL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return TSDB_CODE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
|
int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
|
||||||
|
|
@ -675,6 +684,8 @@ int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
|
||||||
if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
|
if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
|
||||||
return invalidSqlErrMsg(pQueryInfo->msg, msg1);
|
return invalidSqlErrMsg(pQueryInfo->msg, msg1);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
pSliding->n = pQueryInfo->nAggTimeInterval;
|
||||||
}
|
}
|
||||||
|
|
||||||
return TSDB_CODE_SUCCESS;
|
return TSDB_CODE_SUCCESS;
|
||||||
|
|
@ -5394,10 +5405,6 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (setSlidingClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
|
|
||||||
return TSDB_CODE_INVALID_SQL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// set the created table[stream] name
|
// set the created table[stream] name
|
||||||
if (setMeterID(pMeterMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
|
if (setMeterID(pMeterMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
|
||||||
return invalidSqlErrMsg(pQueryInfo->msg, msg1);
|
return invalidSqlErrMsg(pQueryInfo->msg, msg1);
|
||||||
|
|
@ -5581,29 +5588,29 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
|
||||||
return invalidSqlErrMsg(pQueryInfo->msg, msg2);
|
return invalidSqlErrMsg(pQueryInfo->msg, msg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
// set sliding value, the query time range needs to be decide in the first place
|
// // set sliding value, the query time range needs to be decide in the first place
|
||||||
SSQLToken* pSliding = &pQuerySql->sliding;
|
// SSQLToken* pSliding = &pQuerySql->sliding;
|
||||||
if (pSliding->n != 0) {
|
// if (pSliding->n != 0) {
|
||||||
if (!tscEmbedded && pCmd->inStream == 0 && hasDefaultQueryTimeRange(pQueryInfo)) { // sliding only allowed in stream
|
// if (!tscEmbedded && pCmd->inStream == 0 && hasDefaultQueryTimeRange(pQueryInfo)) { // sliding only allowed in stream
|
||||||
const char* msg = "time range expected for sliding window query";
|
// const char* msg = "time range expected for sliding window query";
|
||||||
return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
|
// return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
getTimestampInUsFromStr(pSliding->z, pSliding->n, &pQueryInfo->nSlidingTime);
|
// getTimestampInUsFromStr(pSliding->z, pSliding->n, &pQueryInfo->nSlidingTime);
|
||||||
if (pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI) {
|
// if (pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI) {
|
||||||
pQueryInfo->nSlidingTime /= 1000;
|
// pQueryInfo->nSlidingTime /= 1000;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
if (pQueryInfo->nSlidingTime < tsMinSlidingTime) {
|
// if (pQueryInfo->nSlidingTime < tsMinSlidingTime) {
|
||||||
return invalidSqlErrMsg(pQueryInfo->msg, msg3);
|
// return invalidSqlErrMsg(pQueryInfo->msg, msg3);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
|
// if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
|
||||||
return invalidSqlErrMsg(pQueryInfo->msg, msg4);
|
// return invalidSqlErrMsg(pQueryInfo->msg, msg4);
|
||||||
}
|
// }
|
||||||
} else {
|
// } else {
|
||||||
pQueryInfo->nSlidingTime = -1;
|
// pQueryInfo->nSlidingTime = -1;
|
||||||
}
|
// }
|
||||||
|
|
||||||
// in case of join query, time range is required.
|
// in case of join query, time range is required.
|
||||||
if (QUERY_IS_JOIN_QUERY(pQueryInfo->type)) {
|
if (QUERY_IS_JOIN_QUERY(pQueryInfo->type)) {
|
||||||
|
|
|
||||||
|
|
@ -828,9 +828,6 @@ void setCreateAcctSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pName, SSQLToken
|
||||||
|
|
||||||
if (pPwd != NULL) {
|
if (pPwd != NULL) {
|
||||||
pInfo->pDCLInfo->user.passwd = *pPwd;
|
pInfo->pDCLInfo->user.passwd = *pPwd;
|
||||||
// pInfo->pDCLInfo->user.hasPasswd = true;
|
|
||||||
} else {
|
|
||||||
// pInfo->pDCLInfo->user.hasPasswd = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -860,14 +857,12 @@ void setAlterUserSQL(SSqlInfo *pInfo, int16_t type, SSQLToken *pName, SSQLToken*
|
||||||
|
|
||||||
if (pPwd != NULL) {
|
if (pPwd != NULL) {
|
||||||
pUser->passwd = *pPwd;
|
pUser->passwd = *pPwd;
|
||||||
// pUser->hasPasswd = true;
|
|
||||||
} else {
|
} else {
|
||||||
pUser->passwd.type = TSDB_DATA_TYPE_NULL;
|
pUser->passwd.type = TSDB_DATA_TYPE_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pPrivilege != NULL) {
|
if (pPrivilege != NULL) {
|
||||||
pUser->privilege = *pPrivilege;
|
pUser->privilege = *pPrivilege;
|
||||||
// pUser->hasPrivilege = true;
|
|
||||||
} else {
|
} else {
|
||||||
pUser->privilege.type = TSDB_DATA_TYPE_NULL;
|
pUser->privilege.type = TSDB_DATA_TYPE_NULL;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1110,8 +1110,7 @@ static void tscHandleSubRetrievalError(SRetrieveSupport *trsupport, SSqlObj *pSq
|
||||||
}
|
}
|
||||||
|
|
||||||
// all subqueries are failed
|
// all subqueries are failed
|
||||||
tscError("%p retrieve from %d vnode(s) completed,code:%d.FAILED.", pPObj, pState->numOfTotal,
|
tscError("%p retrieve from %d vnode(s) completed,code:%d.FAILED.", pPObj, pState->numOfTotal, pState->code);
|
||||||
pState->code);
|
|
||||||
pPObj->res.code = -(pState->code);
|
pPObj->res.code = -(pState->code);
|
||||||
|
|
||||||
// release allocated resource
|
// release allocated resource
|
||||||
|
|
@ -2000,7 +1999,7 @@ int32_t tscBuildAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
|
int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
|
||||||
SAlterUserMsg *pAlterMsg;
|
SCreateUserMsg *pAlterMsg;
|
||||||
char * pMsg, *pStart;
|
char * pMsg, *pStart;
|
||||||
|
|
||||||
SSqlCmd *pCmd = &pSql->cmd;
|
SSqlCmd *pCmd = &pSql->cmd;
|
||||||
|
|
@ -2010,16 +2009,18 @@ int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
|
||||||
|
|
||||||
SUserInfo *pUser = &pInfo->pDCLInfo->user;
|
SUserInfo *pUser = &pInfo->pDCLInfo->user;
|
||||||
strncpy(pAlterMsg->user, pUser->user.z, pUser->user.n);
|
strncpy(pAlterMsg->user, pUser->user.z, pUser->user.n);
|
||||||
|
|
||||||
pAlterMsg->flag = pUser->type;
|
pAlterMsg->flag = pUser->type;
|
||||||
|
|
||||||
if (pUser->type == TSDB_ALTER_USER_PRIVILEGES) {
|
if (pUser->type == TSDB_ALTER_USER_PRIVILEGES) {
|
||||||
pAlterMsg->privilege = (char)pCmd->count;
|
pAlterMsg->privilege = (char)pCmd->count;
|
||||||
} else if (pUser->type == TSDB_ALTER_USER_PASSWD) {
|
} else if (pUser->type == TSDB_ALTER_USER_PASSWD) {
|
||||||
strncpy(pAlterMsg->pass, pUser->passwd.z, pUser->passwd.n);
|
strncpy(pAlterMsg->pass, pUser->passwd.z, pUser->passwd.n);
|
||||||
|
} else { // create user password info
|
||||||
|
strncpy(pAlterMsg->pass, pUser->passwd.z, pUser->passwd.n);
|
||||||
}
|
}
|
||||||
|
|
||||||
pMsg += sizeof(SAlterUserMsg);
|
pMsg += sizeof(SCreateUserMsg);
|
||||||
|
|
||||||
pCmd->payloadLen = pMsg - pStart;
|
pCmd->payloadLen = pMsg - pStart;
|
||||||
|
|
||||||
if (pUser->type == TSDB_ALTER_USER_PASSWD || pUser->type == TSDB_ALTER_USER_PRIVILEGES) {
|
if (pUser->type == TSDB_ALTER_USER_PASSWD || pUser->type == TSDB_ALTER_USER_PRIVILEGES) {
|
||||||
|
|
|
||||||
|
|
@ -754,6 +754,8 @@ void taos_free_result_imp(TAOS_RES* res, int keepCmd) {
|
||||||
pSql->pStream == NULL && pMeterMetaInfo->pMeterMeta != NULL))) {
|
pSql->pStream == NULL && pMeterMetaInfo->pMeterMeta != NULL))) {
|
||||||
pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
|
pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
|
||||||
|
|
||||||
|
tscTrace("%p code:%d, numOfRows:%d, command:%d", pSql, pRes->code, pRes->numOfRows, pCmd->command);
|
||||||
|
|
||||||
void *fp = pSql->fp;
|
void *fp = pSql->fp;
|
||||||
if (fp != NULL) {
|
if (fp != NULL) {
|
||||||
pSql->freed = 1;
|
pSql->freed = 1;
|
||||||
|
|
|
||||||
|
|
@ -411,7 +411,9 @@ static void tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) {
|
||||||
}
|
}
|
||||||
|
|
||||||
pStream->slidingTime = pQueryInfo->nSlidingTime;
|
pStream->slidingTime = pQueryInfo->nSlidingTime;
|
||||||
|
|
||||||
pQueryInfo->nAggTimeInterval = 0; // clear the interval value to avoid the force time window split by query processor
|
pQueryInfo->nAggTimeInterval = 0; // clear the interval value to avoid the force time window split by query processor
|
||||||
|
pQueryInfo->nSlidingTime = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int64_t tscGetStreamStartTimestamp(SSqlObj *pSql, SSqlStream *pStream, int64_t stime) {
|
static int64_t tscGetStreamStartTimestamp(SSqlObj *pSql, SSqlStream *pStream, int64_t stime) {
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
int32_t step = ((_ord) == TSQL_SO_ASC) ? 1 : -1; \
|
int32_t step = ((_ord) == TSQL_SO_ASC) ? 1 : -1; \
|
||||||
\
|
\
|
||||||
if ((len1) == (len2)) { \
|
if ((len1) == (len2)) { \
|
||||||
for (; i < (len2) && i >= 0; i += step, (out) += step) { \
|
for (; i < (len2) && i >= 0; i += step, (out) += 1) { \
|
||||||
if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)&((right)[i]), _right_type)) { \
|
if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)&((right)[i]), _right_type)) { \
|
||||||
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
||||||
continue; \
|
continue; \
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
*(out) = (double)(left)[i] op(right)[i]; \
|
*(out) = (double)(left)[i] op(right)[i]; \
|
||||||
} \
|
} \
|
||||||
} else if ((len1) == 1) { \
|
} else if ((len1) == 1) { \
|
||||||
for (; i >= 0 && i < (len2); i += step, (out) += step) { \
|
for (; i >= 0 && i < (len2); i += step, (out) += 1) { \
|
||||||
if (isNull((char *)(left), _left_type) || isNull((char *)&(right)[i], _right_type)) { \
|
if (isNull((char *)(left), _left_type) || isNull((char *)&(right)[i], _right_type)) { \
|
||||||
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
||||||
continue; \
|
continue; \
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
*(out) = (double)(left)[0] op(right)[i]; \
|
*(out) = (double)(left)[0] op(right)[i]; \
|
||||||
} \
|
} \
|
||||||
} else if ((len2) == 1) { \
|
} else if ((len2) == 1) { \
|
||||||
for (; i >= 0 && i < (len1); i += step, (out) += step) { \
|
for (; i >= 0 && i < (len1); i += step, (out) += 1) { \
|
||||||
if (isNull((char *)&(left)[i], _left_type) || isNull((char *)(right), _right_type)) { \
|
if (isNull((char *)&(left)[i], _left_type) || isNull((char *)(right), _right_type)) { \
|
||||||
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
||||||
continue; \
|
continue; \
|
||||||
|
|
@ -58,7 +58,7 @@
|
||||||
int32_t step = (_ord == TSQL_SO_ASC) ? 1 : -1; \
|
int32_t step = (_ord == TSQL_SO_ASC) ? 1 : -1; \
|
||||||
\
|
\
|
||||||
if (len1 == (len2)) { \
|
if (len1 == (len2)) { \
|
||||||
for (; i >= 0 && i < (len2); i += step, (out) += step) { \
|
for (; i >= 0 && i < (len2); i += step, (out) += 1) { \
|
||||||
if (isNull((char *)&(left[i]), _left_type) || isNull((char *)&(right[i]), _right_type)) { \
|
if (isNull((char *)&(left[i]), _left_type) || isNull((char *)&(right[i]), _right_type)) { \
|
||||||
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
||||||
continue; \
|
continue; \
|
||||||
|
|
@ -66,7 +66,7 @@
|
||||||
*(out) = (double)(left)[i] - ((int64_t)(((double)(left)[i]) / (right)[i])) * (right)[i]; \
|
*(out) = (double)(left)[i] - ((int64_t)(((double)(left)[i]) / (right)[i])) * (right)[i]; \
|
||||||
} \
|
} \
|
||||||
} else if (len1 == 1) { \
|
} else if (len1 == 1) { \
|
||||||
for (; i >= 0 && i < (len2); i += step, (out) += step) { \
|
for (; i >= 0 && i < (len2); i += step, (out) += 1) { \
|
||||||
if (isNull((char *)(left), _left_type) || isNull((char *)&((right)[i]), _right_type)) { \
|
if (isNull((char *)(left), _left_type) || isNull((char *)&((right)[i]), _right_type)) { \
|
||||||
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
||||||
continue; \
|
continue; \
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
*(out) = (double)(left)[0] - ((int64_t)(((double)(left)[0]) / (right)[i])) * (right)[i]; \
|
*(out) = (double)(left)[0] - ((int64_t)(((double)(left)[0]) / (right)[i])) * (right)[i]; \
|
||||||
} \
|
} \
|
||||||
} else if ((len2) == 1) { \
|
} else if ((len2) == 1) { \
|
||||||
for (; i >= 0 && i < len1; i += step, (out) += step) { \
|
for (; i >= 0 && i < len1; i += step, (out) += 1) { \
|
||||||
if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)(right), _right_type)) { \
|
if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)(right), _right_type)) { \
|
||||||
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize); \
|
||||||
continue; \
|
continue; \
|
||||||
|
|
@ -112,7 +112,7 @@ void calc_fn_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
||||||
|
|
||||||
if (numLeft == numRight) {
|
if (numLeft == numRight) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -121,7 +121,7 @@ void calc_fn_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
*pOutput = (double)pLeft[i] + pRight[i];
|
*pOutput = (double)pLeft[i] + pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numLeft == 1) {
|
} else if (numLeft == 1) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -130,7 +130,7 @@ void calc_fn_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
*pOutput = (double)pLeft[0] + pRight[i];
|
*pOutput = (double)pLeft[0] + pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numRight == 1) {
|
} else if (numRight == 1) {
|
||||||
for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
|
for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -310,7 +310,7 @@ void calc_fn_i32_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
||||||
|
|
||||||
if (numLeft == numRight) {
|
if (numLeft == numRight) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)&(pOutput[i]), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)&(pOutput[i]), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -318,7 +318,7 @@ void calc_fn_i32_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
*pOutput = (double)pLeft[i] - pRight[i];
|
*pOutput = (double)pLeft[i] - pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numLeft == 1) {
|
} else if (numLeft == 1) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -326,7 +326,7 @@ void calc_fn_i32_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
*pOutput = (double)pLeft[0] - pRight[i];
|
*pOutput = (double)pLeft[0] - pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numRight == 1) {
|
} else if (numRight == 1) {
|
||||||
for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
|
for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -521,7 +521,7 @@ void calc_fn_i32_i32_multi(void *left, void *right, int32_t numLeft, int32_t num
|
||||||
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
||||||
|
|
||||||
if (numLeft == numRight) {
|
if (numLeft == numRight) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -530,7 +530,7 @@ void calc_fn_i32_i32_multi(void *left, void *right, int32_t numLeft, int32_t num
|
||||||
*pOutput = (double)pLeft[i] * pRight[i];
|
*pOutput = (double)pLeft[i] * pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numLeft == 1) {
|
} else if (numLeft == 1) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -539,7 +539,7 @@ void calc_fn_i32_i32_multi(void *left, void *right, int32_t numLeft, int32_t num
|
||||||
*pOutput = (double)pLeft[0] * pRight[i];
|
*pOutput = (double)pLeft[0] * pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numRight == 1) {
|
} else if (numRight == 1) {
|
||||||
for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
|
for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -719,7 +719,7 @@ void calc_fn_i32_i32_div(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
||||||
|
|
||||||
if (numLeft == numRight) {
|
if (numLeft == numRight) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -728,7 +728,7 @@ void calc_fn_i32_i32_div(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
*pOutput = (double)pLeft[i] / pRight[i];
|
*pOutput = (double)pLeft[i] / pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numLeft == 1) {
|
} else if (numLeft == 1) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -737,7 +737,7 @@ void calc_fn_i32_i32_div(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
*pOutput = (double)pLeft[0] / pRight[i];
|
*pOutput = (double)pLeft[0] / pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numRight == 1) {
|
} else if (numRight == 1) {
|
||||||
for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
|
for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -933,7 +933,7 @@ void calc_fn_i32_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
||||||
|
|
||||||
if (numLeft == numRight) {
|
if (numLeft == numRight) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -942,7 +942,7 @@ void calc_fn_i32_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
*pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[i])) * pRight[i];
|
*pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[i])) * pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numLeft == 1) {
|
} else if (numLeft == 1) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -951,7 +951,7 @@ void calc_fn_i32_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRi
|
||||||
*pOutput = (double)pLeft[0] - ((int64_t)(((double)pLeft[0]) / pRight[i])) * pRight[i];
|
*pOutput = (double)pLeft[0] - ((int64_t)(((double)pLeft[0]) / pRight[i])) * pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numRight == 1) {
|
} else if (numRight == 1) {
|
||||||
for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
|
for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -991,7 +991,7 @@ void calc_fn_i32_d_rem(void *left, void *right, int32_t numLeft, int32_t numRigh
|
||||||
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
|
||||||
|
|
||||||
if (numLeft == numRight) {
|
if (numLeft == numRight) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -1000,7 +1000,7 @@ void calc_fn_i32_d_rem(void *left, void *right, int32_t numLeft, int32_t numRigh
|
||||||
*pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[i])) * pRight[i];
|
*pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[i])) * pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numLeft == 1) {
|
} else if (numLeft == 1) {
|
||||||
for (; i >= 0 && i < numRight; i += step, pOutput += step) {
|
for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -1009,7 +1009,7 @@ void calc_fn_i32_d_rem(void *left, void *right, int32_t numLeft, int32_t numRigh
|
||||||
*pOutput = (double)pLeft[0] - ((int64_t)(((double)pLeft[0]) / pRight[i])) * pRight[i];
|
*pOutput = (double)pLeft[0] - ((int64_t)(((double)pLeft[0]) / pRight[i])) * pRight[i];
|
||||||
}
|
}
|
||||||
} else if (numRight == 1) {
|
} else if (numRight == 1) {
|
||||||
for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
|
for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
|
||||||
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
|
||||||
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -215,6 +215,10 @@ bool tscIsTwoStageMergeMetricQuery(SQueryInfo* pQueryInfo, int32_t tableIndex) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((pQueryInfo->type & TSDB_QUERY_TYPE_FREE_RESOURCE) == TSDB_QUERY_TYPE_FREE_RESOURCE) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// for ordered projection query, iterate all qualified vnodes sequentially
|
// for ordered projection query, iterate all qualified vnodes sequentially
|
||||||
if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, tableIndex)) {
|
if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, tableIndex)) {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -499,8 +499,7 @@ int mgmtKillConnection(char *qidstr, SConnObj *pConn) {
|
||||||
uint32_t ip = inet_addr(temp);
|
uint32_t ip = inet_addr(temp);
|
||||||
|
|
||||||
temp = chr + 1;
|
temp = chr + 1;
|
||||||
short port = htons(atoi(temp));
|
uint16_t port = htons(atoi(temp));
|
||||||
|
|
||||||
SAcctObj *pAcct = pConn->pAcct;
|
SAcctObj *pAcct = pConn->pAcct;
|
||||||
|
|
||||||
pthread_mutex_lock(&pAcct->mutex);
|
pthread_mutex_lock(&pAcct->mutex);
|
||||||
|
|
|
||||||
|
|
@ -49,8 +49,6 @@ enum {
|
||||||
|
|
||||||
#define IS_DISK_DATA_BLOCK(q) ((q)->fileId >= 0)
|
#define IS_DISK_DATA_BLOCK(q) ((q)->fileId >= 0)
|
||||||
|
|
||||||
// static int32_t copyDataFromMMapBuffer(int fd, SQInfo *pQInfo, SQueryFilesInfo *pQueryFile, char *buf, uint64_t
|
|
||||||
// offset, int32_t size);
|
|
||||||
static int32_t readDataFromDiskFile(int fd, SQInfo *pQInfo, SQueryFilesInfo *pQueryFile, char *buf, uint64_t offset,
|
static int32_t readDataFromDiskFile(int fd, SQInfo *pQInfo, SQueryFilesInfo *pQueryFile, char *buf, uint64_t offset,
|
||||||
int32_t size);
|
int32_t size);
|
||||||
|
|
||||||
|
|
@ -70,12 +68,12 @@ static int32_t getNextDataFileCompInfo(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj
|
||||||
static void setGroupOutputBuffer(SQueryRuntimeEnv *pRuntimeEnv, SOutputRes *pResult);
|
static void setGroupOutputBuffer(SQueryRuntimeEnv *pRuntimeEnv, SOutputRes *pResult);
|
||||||
|
|
||||||
static void getAlignedIntervalQueryRange(SQueryRuntimeEnv *pRuntimeEnv, TSKEY keyInData, TSKEY skey, TSKEY ekey);
|
static void getAlignedIntervalQueryRange(SQueryRuntimeEnv *pRuntimeEnv, TSKEY keyInData, TSKEY skey, TSKEY ekey);
|
||||||
static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pInfo,
|
static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo,
|
||||||
SBlockInfo *pBlockInfo, int64_t *pPrimaryCol, SField *pFields,
|
SBlockInfo *pBlockInfo, int64_t *pPrimaryCol, SField *pFields,
|
||||||
__block_search_fn_t searchFn);
|
__block_search_fn_t searchFn);
|
||||||
|
|
||||||
static int32_t saveResult(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo, int32_t numOfResult);
|
static int32_t saveResult(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo, int32_t numOfResult);
|
||||||
static void applyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterDataInfo *pInfoEx, int64_t *pPrimaryData,
|
static void applyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterDataInfo *pMeterDataInfo,
|
||||||
SBlockInfo *pBlockInfo, int32_t blockStatus, SField *pFields,
|
SBlockInfo *pBlockInfo, int32_t blockStatus, SField *pFields,
|
||||||
__block_search_fn_t searchFn);
|
__block_search_fn_t searchFn);
|
||||||
|
|
||||||
|
|
@ -1728,6 +1726,8 @@ int32_t numOfClosedSlidingWindow(SSlidingWindowInfo *pSlidingWindowInfo) {
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void closeSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo, int32_t slot) {
|
void closeSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo, int32_t slot) {
|
||||||
|
|
@ -2112,7 +2112,7 @@ static int32_t rowwiseApplyAllFunctions(SQueryRuntimeEnv *pRuntimeEnv, int32_t *
|
||||||
SSlidingWindowInfo *pSlidingWindowInfo = &pRuntimeEnv->swindowResInfo;
|
SSlidingWindowInfo *pSlidingWindowInfo = &pRuntimeEnv->swindowResInfo;
|
||||||
|
|
||||||
// query completed
|
// query completed
|
||||||
if (lastKey >= pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery) ||
|
if ((lastKey >= pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
|
||||||
(lastKey <= pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
|
(lastKey <= pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
|
||||||
closeAllSlidingWindow(pSlidingWindowInfo);
|
closeAllSlidingWindow(pSlidingWindowInfo);
|
||||||
|
|
||||||
|
|
@ -5027,7 +5027,7 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
|
||||||
static void updatelastkey(SQuery *pQuery, SMeterQueryInfo *pMeterQInfo) { pMeterQInfo->lastKey = pQuery->lastKey; }
|
static void updatelastkey(SQuery *pQuery, SMeterQueryInfo *pMeterQInfo) { pMeterQInfo->lastKey = pQuery->lastKey; }
|
||||||
|
|
||||||
void queryOnBlock(SMeterQuerySupportObj *pSupporter, int64_t *primaryKeys, int32_t blockStatus,
|
void queryOnBlock(SMeterQuerySupportObj *pSupporter, int64_t *primaryKeys, int32_t blockStatus,
|
||||||
SBlockInfo *pBlockBasicInfo, SMeterDataInfo *pDataHeadInfoEx, SField *pFields,
|
SBlockInfo *pBlockBasicInfo, SMeterDataInfo *pMeterDataInfo, SField *pFields,
|
||||||
__block_search_fn_t searchFn) {
|
__block_search_fn_t searchFn) {
|
||||||
/* cache blocks may be assign to other meter, abort */
|
/* cache blocks may be assign to other meter, abort */
|
||||||
if (pBlockBasicInfo->size <= 0) {
|
if (pBlockBasicInfo->size <= 0) {
|
||||||
|
|
@ -5043,18 +5043,17 @@ void queryOnBlock(SMeterQuerySupportObj *pSupporter, int64_t *primaryKeys, int32
|
||||||
|
|
||||||
// note: only fixed number of output for each group by operation
|
// note: only fixed number of output for each group by operation
|
||||||
if (numOfRes > 0) {
|
if (numOfRes > 0) {
|
||||||
pSupporter->pResult[pDataHeadInfoEx->groupIdx].numOfRows = numOfRes;
|
pSupporter->pResult[pMeterDataInfo->groupIdx].numOfRows = numOfRes;
|
||||||
}
|
}
|
||||||
|
|
||||||
// used to decide the correct start position in cache after check all data in files
|
// used to decide the correct start position in cache after check all data in files
|
||||||
updatelastkey(pQuery, pDataHeadInfoEx->pMeterQInfo);
|
updatelastkey(pQuery, pMeterDataInfo->pMeterQInfo);
|
||||||
if (pRuntimeEnv->pTSBuf != NULL) {
|
if (pRuntimeEnv->pTSBuf != NULL) {
|
||||||
pDataHeadInfoEx->pMeterQInfo->cur = tsBufGetCursor(pRuntimeEnv->pTSBuf);
|
pMeterDataInfo->pMeterQInfo->cur = tsBufGetCursor(pRuntimeEnv->pTSBuf);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
applyIntervalQueryOnBlock(pSupporter, pDataHeadInfoEx, primaryKeys, pBlockBasicInfo, blockStatus, pFields,
|
applyIntervalQueryOnBlock(pSupporter, pMeterDataInfo, pBlockBasicInfo, blockStatus, pFields, searchFn);
|
||||||
searchFn);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -5265,13 +5264,13 @@ static tFilePage *getFilePage(SMeterQuerySupportObj *pSupporter, int32_t pageId)
|
||||||
return (tFilePage *)(pSupporter->meterOutputMMapBuf + DEFAULT_INTERN_BUF_SIZE * pageId);
|
return (tFilePage *)(pSupporter->meterOutputMMapBuf + DEFAULT_INTERN_BUF_SIZE * pageId);
|
||||||
}
|
}
|
||||||
|
|
||||||
static tFilePage *getMeterDataPage(SMeterQuerySupportObj *pSupporter, SMeterDataInfo *pInfoEx, int32_t pageId) {
|
static tFilePage *getMeterDataPage(SMeterQuerySupportObj *pSupporter, SMeterDataInfo *pMeterDataInfo, int32_t pageId) {
|
||||||
SMeterQueryInfo *pInfo = pInfoEx->pMeterQInfo;
|
SMeterQueryInfo *pMeterQueryInfo = pMeterDataInfo->pMeterQInfo;
|
||||||
if (pageId >= pInfo->numOfPages) {
|
if (pageId >= pMeterQueryInfo->numOfPages) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t realId = pInfo->pageList[pageId];
|
int32_t realId = pMeterQueryInfo->pageList[pageId];
|
||||||
return getFilePage(pSupporter, realId);
|
return getFilePage(pSupporter, realId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -5281,14 +5280,14 @@ typedef struct Position {
|
||||||
} Position;
|
} Position;
|
||||||
|
|
||||||
typedef struct SCompSupporter {
|
typedef struct SCompSupporter {
|
||||||
SMeterDataInfo ** pInfoEx;
|
SMeterDataInfo ** pMeterDataInfo;
|
||||||
Position * pPosition;
|
Position * pPosition;
|
||||||
SMeterQuerySupportObj *pSupporter;
|
SMeterQuerySupportObj *pSupporter;
|
||||||
} SCompSupporter;
|
} SCompSupporter;
|
||||||
|
|
||||||
int64_t getCurrentTimestamp(SCompSupporter *pSupportor, int32_t meterIdx) {
|
int64_t getCurrentTimestamp(SCompSupporter *pSupportor, int32_t meterIdx) {
|
||||||
Position * pPos = &pSupportor->pPosition[meterIdx];
|
Position * pPos = &pSupportor->pPosition[meterIdx];
|
||||||
tFilePage *pPage = getMeterDataPage(pSupportor->pSupporter, pSupportor->pInfoEx[meterIdx], pPos->pageIdx);
|
tFilePage *pPage = getMeterDataPage(pSupportor->pSupporter, pSupportor->pMeterDataInfo[meterIdx], pPos->pageIdx);
|
||||||
return *(int64_t *)(pPage->data + TSDB_KEYSIZE * pPos->rowIdx);
|
return *(int64_t *)(pPage->data + TSDB_KEYSIZE * pPos->rowIdx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -5311,10 +5310,10 @@ int32_t meterResultComparator(const void *pLeft, const void *pRight, void *param
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
tFilePage *pPageLeft = getMeterDataPage(supportor->pSupporter, supportor->pInfoEx[left], leftPos.pageIdx);
|
tFilePage *pPageLeft = getMeterDataPage(supportor->pSupporter, supportor->pMeterDataInfo[left], leftPos.pageIdx);
|
||||||
int64_t leftTimestamp = *(int64_t *)(pPageLeft->data + TSDB_KEYSIZE * leftPos.rowIdx);
|
int64_t leftTimestamp = *(int64_t *)(pPageLeft->data + TSDB_KEYSIZE * leftPos.rowIdx);
|
||||||
|
|
||||||
tFilePage *pPageRight = getMeterDataPage(supportor->pSupporter, supportor->pInfoEx[right], rightPos.pageIdx);
|
tFilePage *pPageRight = getMeterDataPage(supportor->pSupporter, supportor->pMeterDataInfo[right], rightPos.pageIdx);
|
||||||
int64_t rightTimestamp = *(int64_t *)(pPageRight->data + TSDB_KEYSIZE * rightPos.rowIdx);
|
int64_t rightTimestamp = *(int64_t *)(pPageRight->data + TSDB_KEYSIZE * rightPos.rowIdx);
|
||||||
|
|
||||||
if (leftTimestamp == rightTimestamp) {
|
if (leftTimestamp == rightTimestamp) {
|
||||||
|
|
@ -5465,17 +5464,17 @@ int32_t doMergeMetersResultsToGroupRes(SMeterQuerySupportObj *pSupporter, SQuery
|
||||||
cs.pPosition[pos].pageIdx += 1; // try next page
|
cs.pPosition[pos].pageIdx += 1; // try next page
|
||||||
|
|
||||||
// check if current page is empty or not. if it is empty, ignore it and try next
|
// check if current page is empty or not. if it is empty, ignore it and try next
|
||||||
if (cs.pPosition[pos].pageIdx <= cs.pInfoEx[pos]->pMeterQInfo->numOfPages - 1) {
|
if (cs.pPosition[pos].pageIdx <= cs.pMeterDataInfo[pos]->pMeterQInfo->numOfPages - 1) {
|
||||||
tFilePage *newPage = getMeterDataPage(cs.pSupporter, pValidMeter[pos], position->pageIdx);
|
tFilePage *newPage = getMeterDataPage(cs.pSupporter, pValidMeter[pos], position->pageIdx);
|
||||||
if (newPage->numOfElems <= 0) {
|
if (newPage->numOfElems <= 0) {
|
||||||
// if current source data page is null, it must be the last page of source output page
|
// if current source data page is null, it must be the last page of source output page
|
||||||
cs.pPosition[pos].pageIdx += 1;
|
cs.pPosition[pos].pageIdx += 1;
|
||||||
assert(cs.pPosition[pos].pageIdx >= cs.pInfoEx[pos]->pMeterQInfo->numOfPages - 1);
|
assert(cs.pPosition[pos].pageIdx >= cs.pMeterDataInfo[pos]->pMeterQInfo->numOfPages - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// the following code must be executed if current source pages are exhausted
|
// the following code must be executed if current source pages are exhausted
|
||||||
if (cs.pPosition[pos].pageIdx >= cs.pInfoEx[pos]->pMeterQInfo->numOfPages) {
|
if (cs.pPosition[pos].pageIdx >= cs.pMeterDataInfo[pos]->pMeterQInfo->numOfPages) {
|
||||||
cs.pPosition[pos].pageIdx = -1;
|
cs.pPosition[pos].pageIdx = -1;
|
||||||
cs.pPosition[pos].rowIdx = -1;
|
cs.pPosition[pos].rowIdx = -1;
|
||||||
|
|
||||||
|
|
@ -5635,7 +5634,7 @@ int32_t doCloseAllOpenedResults(SMeterQuerySupportObj *pSupporter) {
|
||||||
void disableFunctForSuppleScan(SQueryRuntimeEnv *pRuntimeEnv, int32_t order) {
|
void disableFunctForSuppleScan(SQueryRuntimeEnv *pRuntimeEnv, int32_t order) {
|
||||||
SQuery *pQuery = pRuntimeEnv->pQuery;
|
SQuery *pQuery = pRuntimeEnv->pQuery;
|
||||||
|
|
||||||
if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || pQuery->slidingTime > 0 && pQuery->nAggTimeInterval > 0) {
|
if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || (pQuery->slidingTime > 0 && pQuery->nAggTimeInterval > 0)) {
|
||||||
for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
|
for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
|
||||||
pRuntimeEnv->pCtx[i].order = (pRuntimeEnv->pCtx[i].order) ^ 1;
|
pRuntimeEnv->pCtx[i].order = (pRuntimeEnv->pCtx[i].order) ^ 1;
|
||||||
}
|
}
|
||||||
|
|
@ -6693,11 +6692,11 @@ void cleanBlockOrderSupporter(SBlockOrderSupporter *pSupporter, int32_t numOfTab
|
||||||
|
|
||||||
int32_t createDataBlocksInfoEx(SMeterDataInfo **pMeterDataInfo, int32_t numOfMeters,
|
int32_t createDataBlocksInfoEx(SMeterDataInfo **pMeterDataInfo, int32_t numOfMeters,
|
||||||
SMeterDataBlockInfoEx **pDataBlockInfoEx, int32_t numOfCompBlocks,
|
SMeterDataBlockInfoEx **pDataBlockInfoEx, int32_t numOfCompBlocks,
|
||||||
int32_t *nAllocBlocksInfoSize, int64_t addr) {
|
int32_t *numOfAllocBlocks, int64_t addr) {
|
||||||
// release allocated memory first
|
// release allocated memory first
|
||||||
freeDataBlockFieldInfo(*pDataBlockInfoEx, *nAllocBlocksInfoSize);
|
freeDataBlockFieldInfo(*pDataBlockInfoEx, *numOfAllocBlocks);
|
||||||
|
|
||||||
if (*nAllocBlocksInfoSize == 0 || *nAllocBlocksInfoSize < numOfCompBlocks) {
|
if (*numOfAllocBlocks == 0 || *numOfAllocBlocks < numOfCompBlocks) {
|
||||||
char *tmp = realloc((*pDataBlockInfoEx), sizeof(SMeterDataBlockInfoEx) * numOfCompBlocks);
|
char *tmp = realloc((*pDataBlockInfoEx), sizeof(SMeterDataBlockInfoEx) * numOfCompBlocks);
|
||||||
if (tmp == NULL) {
|
if (tmp == NULL) {
|
||||||
tfree(*pDataBlockInfoEx);
|
tfree(*pDataBlockInfoEx);
|
||||||
|
|
@ -6706,7 +6705,7 @@ int32_t createDataBlocksInfoEx(SMeterDataInfo **pMeterDataInfo, int32_t numOfMet
|
||||||
|
|
||||||
*pDataBlockInfoEx = (SMeterDataBlockInfoEx *)tmp;
|
*pDataBlockInfoEx = (SMeterDataBlockInfoEx *)tmp;
|
||||||
memset((*pDataBlockInfoEx), 0, sizeof(SMeterDataBlockInfoEx) * numOfCompBlocks);
|
memset((*pDataBlockInfoEx), 0, sizeof(SMeterDataBlockInfoEx) * numOfCompBlocks);
|
||||||
*nAllocBlocksInfoSize = numOfCompBlocks;
|
*numOfAllocBlocks = numOfCompBlocks;
|
||||||
}
|
}
|
||||||
|
|
||||||
SBlockOrderSupporter supporter = {0};
|
SBlockOrderSupporter supporter = {0};
|
||||||
|
|
@ -6740,14 +6739,14 @@ int32_t createDataBlocksInfoEx(SMeterDataInfo **pMeterDataInfo, int32_t numOfMet
|
||||||
supporter.pDataBlockInfoEx[numOfQualMeters] = (SMeterDataBlockInfoEx *)buf;
|
supporter.pDataBlockInfoEx[numOfQualMeters] = (SMeterDataBlockInfoEx *)buf;
|
||||||
|
|
||||||
for (int32_t k = 0; k < pMeterDataInfo[j]->numOfBlocks; ++k) {
|
for (int32_t k = 0; k < pMeterDataInfo[j]->numOfBlocks; ++k) {
|
||||||
SMeterDataBlockInfoEx *pInfoEx = &supporter.pDataBlockInfoEx[numOfQualMeters][k];
|
SMeterDataBlockInfoEx *pBlockInfoEx = &supporter.pDataBlockInfoEx[numOfQualMeters][k];
|
||||||
|
|
||||||
pInfoEx->pBlock.compBlock = &pBlock[k];
|
pBlockInfoEx->pBlock.compBlock = &pBlock[k];
|
||||||
pInfoEx->pBlock.fields = NULL;
|
pBlockInfoEx->pBlock.fields = NULL;
|
||||||
|
|
||||||
pInfoEx->pMeterDataInfo = pMeterDataInfo[j];
|
pBlockInfoEx->pMeterDataInfo = pMeterDataInfo[j];
|
||||||
pInfoEx->groupIdx = pMeterDataInfo[j]->groupIdx; // set the group index
|
pBlockInfoEx->groupIdx = pMeterDataInfo[j]->groupIdx; // set the group index
|
||||||
pInfoEx->blockIndex = pMeterDataInfo[j]->start + k; // set the block index in original meter
|
pBlockInfoEx->blockIndex = pMeterDataInfo[j]->start + k; // set the block index in original meter
|
||||||
cnt++;
|
cnt++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -7013,7 +7012,7 @@ int32_t setIntervalQueryExecutionContext(SMeterQuerySupportObj *pSupporter, int3
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pInfo,
|
static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo,
|
||||||
SBlockInfo *pBlockInfo, int64_t *pPrimaryCol, SField *pFields,
|
SBlockInfo *pBlockInfo, int64_t *pPrimaryCol, SField *pFields,
|
||||||
__block_search_fn_t searchFn) {
|
__block_search_fn_t searchFn) {
|
||||||
SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
|
SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
|
||||||
|
|
@ -7029,10 +7028,10 @@ static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMete
|
||||||
assert(steps > 0);
|
assert(steps > 0);
|
||||||
|
|
||||||
// NOTE: in case of stable query, only ONE(or ZERO) row of result generated for each query range
|
// NOTE: in case of stable query, only ONE(or ZERO) row of result generated for each query range
|
||||||
if (pInfo->lastResRows == 0) {
|
if (pMeterQueryInfo->lastResRows == 0) {
|
||||||
pInfo->lastResRows = numOfRes;
|
pMeterQueryInfo->lastResRows = numOfRes;
|
||||||
} else {
|
} else {
|
||||||
assert(pInfo->lastResRows == 1);
|
assert(pMeterQueryInfo->lastResRows == 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t pos = pQuery->pos + steps * factor;
|
int32_t pos = pQuery->pos + steps * factor;
|
||||||
|
|
@ -7071,20 +7070,20 @@ static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMete
|
||||||
if (pQuery->lastKey > pSupporter->rawEKey || nextKey > pSupporter->rawEKey) {
|
if (pQuery->lastKey > pSupporter->rawEKey || nextKey > pSupporter->rawEKey) {
|
||||||
/* whole query completed, save result and abort */
|
/* whole query completed, save result and abort */
|
||||||
assert(queryCompleted);
|
assert(queryCompleted);
|
||||||
saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
|
||||||
|
|
||||||
// save the pQuery->lastKey for retrieve data in cache, actually, there will be no qualified data in cache.
|
// save the pQuery->lastKey for retrieve data in cache, actually, there will be no qualified data in cache.
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
} else if (pQuery->ekey == pBlockInfo->keyLast) {
|
} else if (pQuery->ekey == pBlockInfo->keyLast) {
|
||||||
/* current interval query is completed, set the next query range on other data blocks if exist */
|
/* current interval query is completed, set the next query range on other data blocks if exist */
|
||||||
int64_t prevEKey = pQuery->ekey;
|
int64_t prevEKey = pQuery->ekey;
|
||||||
|
|
||||||
getAlignedIntervalQueryRange(pRuntimeEnv, pQuery->lastKey, pSupporter->rawSKey, pSupporter->rawEKey);
|
getAlignedIntervalQueryRange(pRuntimeEnv, pQuery->lastKey, pSupporter->rawSKey, pSupporter->rawEKey);
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
|
|
||||||
assert(queryCompleted && prevEKey < pQuery->skey);
|
assert(queryCompleted && prevEKey < pQuery->skey);
|
||||||
if (pInfo->lastResRows > 0) {
|
if (pMeterQueryInfo->lastResRows > 0) {
|
||||||
saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
|
|
@ -7095,7 +7094,7 @@ static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMete
|
||||||
* With the information of the directly next data block, whether locates in cache or disk,
|
* With the information of the directly next data block, whether locates in cache or disk,
|
||||||
* current interval query being completed or not can be decided.
|
* current interval query being completed or not can be decided.
|
||||||
*/
|
*/
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
assert(pQuery->lastKey > pBlockInfo->keyLast && pQuery->lastKey <= pQuery->ekey);
|
assert(pQuery->lastKey > pBlockInfo->keyLast && pQuery->lastKey <= pQuery->ekey);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -7103,7 +7102,7 @@ static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMete
|
||||||
* merge with other meters in the same group
|
* merge with other meters in the same group
|
||||||
*/
|
*/
|
||||||
if (queryCompleted) {
|
if (queryCompleted) {
|
||||||
saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -7119,23 +7118,23 @@ static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMete
|
||||||
if (pQuery->lastKey < pSupporter->rawEKey || (nextKey < pSupporter->rawEKey && nextKey != -1)) {
|
if (pQuery->lastKey < pSupporter->rawEKey || (nextKey < pSupporter->rawEKey && nextKey != -1)) {
|
||||||
/* whole query completed, save result and abort */
|
/* whole query completed, save result and abort */
|
||||||
assert(queryCompleted);
|
assert(queryCompleted);
|
||||||
saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* save the pQuery->lastKey for retrieve data in cache, actually,
|
* save the pQuery->lastKey for retrieve data in cache, actually,
|
||||||
* there will be no qualified data in cache.
|
* there will be no qualified data in cache.
|
||||||
*/
|
*/
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
} else if (pQuery->ekey == pBlockInfo->keyFirst) {
|
} else if (pQuery->ekey == pBlockInfo->keyFirst) {
|
||||||
// current interval query is completed, set the next query range on other data blocks if exist
|
// current interval query is completed, set the next query range on other data blocks if exist
|
||||||
int64_t prevEKey = pQuery->ekey;
|
int64_t prevEKey = pQuery->ekey;
|
||||||
|
|
||||||
getAlignedIntervalQueryRange(pRuntimeEnv, pQuery->lastKey, pSupporter->rawSKey, pSupporter->rawEKey);
|
getAlignedIntervalQueryRange(pRuntimeEnv, pQuery->lastKey, pSupporter->rawSKey, pSupporter->rawEKey);
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
|
|
||||||
assert(queryCompleted && prevEKey > pQuery->skey);
|
assert(queryCompleted && prevEKey > pQuery->skey);
|
||||||
if (pInfo->lastResRows > 0) {
|
if (pMeterQueryInfo->lastResRows > 0) {
|
||||||
saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
|
|
@ -7146,7 +7145,7 @@ static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMete
|
||||||
* With the information of the directly next data block, whether locates in cache or disk,
|
* With the information of the directly next data block, whether locates in cache or disk,
|
||||||
* current interval query being completed or not can be decided.
|
* current interval query being completed or not can be decided.
|
||||||
*/
|
*/
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
assert(pQuery->lastKey < pBlockInfo->keyFirst && pQuery->lastKey >= pQuery->ekey);
|
assert(pQuery->lastKey < pBlockInfo->keyFirst && pQuery->lastKey >= pQuery->ekey);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -7154,7 +7153,7 @@ static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMete
|
||||||
* flag, and merge with other meters in the same group
|
* flag, and merge with other meters in the same group
|
||||||
*/
|
*/
|
||||||
if (queryCompleted) {
|
if (queryCompleted) {
|
||||||
saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -7163,14 +7162,14 @@ static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMete
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(queryCompleted);
|
assert(queryCompleted);
|
||||||
saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
|
||||||
|
|
||||||
assert((nextKey >= pQuery->lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
|
assert((nextKey >= pQuery->lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
|
||||||
(nextKey <= pQuery->lastKey && !QUERY_IS_ASC_QUERY(pQuery)));
|
(nextKey <= pQuery->lastKey && !QUERY_IS_ASC_QUERY(pQuery)));
|
||||||
|
|
||||||
/* still in the same block to query */
|
/* still in the same block to query */
|
||||||
getAlignedIntervalQueryRange(pRuntimeEnv, nextKey, pSupporter->rawSKey, pSupporter->rawEKey);
|
getAlignedIntervalQueryRange(pRuntimeEnv, nextKey, pSupporter->rawSKey, pSupporter->rawEKey);
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
|
|
||||||
int32_t newPos = searchFn((char *)pPrimaryCol, pBlockInfo->size, pQuery->skey, pQuery->order.order);
|
int32_t newPos = searchFn((char *)pPrimaryCol, pBlockInfo->size, pQuery->skey, pQuery->order.order);
|
||||||
assert(newPos == pQuery->pos + steps * factor);
|
assert(newPos == pQuery->pos + steps * factor);
|
||||||
|
|
@ -7179,26 +7178,25 @@ static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMete
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void doApplyIntervalQueryOnBlock_rv(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pInfo,
|
static void doApplyIntervalQueryOnBlock_rv(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo,
|
||||||
SBlockInfo *pBlockInfo, int64_t *pPrimaryCol, SField *pFields,
|
SBlockInfo *pBlockInfo, int64_t *pPrimaryCol, SField *pFields,
|
||||||
__block_search_fn_t searchFn) {
|
__block_search_fn_t searchFn) {
|
||||||
SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
|
SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
|
||||||
SQuery * pQuery = pRuntimeEnv->pQuery;
|
SQuery * pQuery = pRuntimeEnv->pQuery;
|
||||||
int32_t factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
|
int32_t factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
|
||||||
|
|
||||||
int64_t nextKey = -1;
|
|
||||||
bool completed = false;
|
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
|
int64_t nextKey = -1;
|
||||||
int32_t numOfRes = 0;
|
int32_t numOfRes = 0;
|
||||||
|
|
||||||
int32_t steps = applyFunctionsOnBlock(pRuntimeEnv, pBlockInfo, pPrimaryCol, pFields, searchFn, &numOfRes);
|
int32_t steps = applyFunctionsOnBlock(pRuntimeEnv, pBlockInfo, pPrimaryCol, pFields, searchFn, &numOfRes);
|
||||||
assert(steps > 0);
|
assert(steps > 0);
|
||||||
|
|
||||||
// NOTE: in case of stable query, only ONE(or ZERO) row of result generated for each query range
|
// NOTE: in case of stable query, only ONE(or ZERO) row of result generated for each query range
|
||||||
if (pInfo->lastResRows == 0) {
|
if (pMeterQueryInfo->lastResRows == 0) {
|
||||||
pInfo->lastResRows = numOfRes;
|
pMeterQueryInfo->lastResRows = numOfRes;
|
||||||
} else {
|
} else {
|
||||||
assert(pInfo->lastResRows == 1);
|
assert(pMeterQueryInfo->lastResRows == 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t pos = pQuery->pos + steps * factor;
|
int32_t pos = pQuery->pos + steps * factor;
|
||||||
|
|
@ -7212,6 +7210,7 @@ static void doApplyIntervalQueryOnBlock_rv(SMeterQuerySupportObj *pSupporter, SM
|
||||||
}
|
}
|
||||||
|
|
||||||
// all data satisfy current query are checked, query completed
|
// all data satisfy current query are checked, query completed
|
||||||
|
bool completed = false;
|
||||||
if (QUERY_IS_ASC_QUERY(pQuery)) {
|
if (QUERY_IS_ASC_QUERY(pQuery)) {
|
||||||
completed = (pQuery->lastKey > pQuery->ekey);
|
completed = (pQuery->lastKey > pQuery->ekey);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -7232,7 +7231,7 @@ static void doApplyIntervalQueryOnBlock_rv(SMeterQuerySupportObj *pSupporter, SM
|
||||||
* With the information of the directly next data block, whether locates in cache or disk,
|
* With the information of the directly next data block, whether locates in cache or disk,
|
||||||
* current interval query being completed or not can be decided.
|
* current interval query being completed or not can be decided.
|
||||||
*/
|
*/
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
|
|
||||||
if (QUERY_IS_ASC_QUERY(pQuery)) {
|
if (QUERY_IS_ASC_QUERY(pQuery)) {
|
||||||
assert(pQuery->lastKey > pBlockInfo->keyLast && pQuery->lastKey <= pQuery->ekey);
|
assert(pQuery->lastKey > pBlockInfo->keyLast && pQuery->lastKey <= pQuery->ekey);
|
||||||
|
|
@ -7247,36 +7246,28 @@ static void doApplyIntervalQueryOnBlock_rv(SMeterQuerySupportObj *pSupporter, SM
|
||||||
|
|
||||||
if (pQuery->ekey == pSupporter->rawEKey) {
|
if (pQuery->ekey == pSupporter->rawEKey) {
|
||||||
/* whole query completed, save result and abort */
|
/* whole query completed, save result and abort */
|
||||||
saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
|
||||||
|
|
||||||
// save the pQuery->lastKey for retrieve data in cache, actually, there will be no qualified data in cache.
|
// save the pQuery->lastKey for retrieve data in cache, actually, there will be no qualified data in cache.
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
} else if ((QUERY_IS_ASC_QUERY(pQuery) && pQuery->ekey == pBlockInfo->keyLast) ||
|
} else if ((QUERY_IS_ASC_QUERY(pQuery) && pQuery->ekey == pBlockInfo->keyLast) ||
|
||||||
(QUERY_IS_ASC_QUERY(pQuery) && pQuery->ekey == pBlockInfo->keyFirst)) {
|
(!QUERY_IS_ASC_QUERY(pQuery) && pQuery->ekey == pBlockInfo->keyFirst)) {
|
||||||
// /* current interval query is completed, set the next query range on other data blocks if exist */
|
/* current interval query is completed, set the next query range on other data blocks if exist */
|
||||||
// int64_t prevEKey = pQuery->ekey;
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
//
|
|
||||||
// getAlignedIntervalQueryRange(pRuntimeEnv, pQuery->lastKey, pSupporter->rawSKey, pSupporter->rawEKey);
|
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
|
||||||
//
|
|
||||||
// assert(prevEKey < pQuery->skey);
|
|
||||||
// if (pInfo->lastResRows > 0) {
|
|
||||||
// saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
saveResult(pSupporter, pInfo, pInfo->lastResRows);
|
saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
|
||||||
|
|
||||||
|
assert(pos >= 0 && pos < pBlockInfo->size);
|
||||||
assert((nextKey >= pQuery->lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
|
assert((nextKey >= pQuery->lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
|
||||||
(nextKey <= pQuery->lastKey && !QUERY_IS_ASC_QUERY(pQuery)));
|
(nextKey <= pQuery->lastKey && !QUERY_IS_ASC_QUERY(pQuery)));
|
||||||
|
|
||||||
/* still in the same block to query */
|
/* still in the same block to query */
|
||||||
getAlignedIntervalQueryRange(pRuntimeEnv, nextKey, pSupporter->rawSKey, pSupporter->rawEKey);
|
getAlignedIntervalQueryRange(pRuntimeEnv, nextKey, pSupporter->rawSKey, pSupporter->rawEKey);
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
|
|
||||||
int32_t newPos = searchFn((char *)pPrimaryCol, pBlockInfo->size, pQuery->skey, pQuery->order.order);
|
int32_t newPos = searchFn((char *)pPrimaryCol, pBlockInfo->size, pQuery->skey, pQuery->order.order);
|
||||||
assert(newPos == pQuery->pos + steps * factor);
|
assert(newPos == pQuery->pos + steps * factor);
|
||||||
|
|
@ -7691,19 +7682,20 @@ void copyFromGroupBuf(SQInfo *pQInfo, SOutputRes *result) {
|
||||||
assert(pQuery->pointsRead <= pQuery->pointsToRead);
|
assert(pQuery->pointsRead <= pQuery->pointsToRead);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void applyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterDataInfo *pInfoEx, int64_t *pPrimaryData,
|
static void applyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterDataInfo *pMeterDataInfo,
|
||||||
SBlockInfo *pBlockInfo, int32_t blockStatus, SField *pFields,
|
SBlockInfo *pBlockInfo, int32_t blockStatus, SField *pFields,
|
||||||
__block_search_fn_t searchFn) {
|
__block_search_fn_t searchFn) {
|
||||||
SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
|
SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
|
||||||
SQuery * pQuery = pRuntimeEnv->pQuery;
|
SQuery * pQuery = pRuntimeEnv->pQuery;
|
||||||
SMeterQueryInfo * pInfo = pInfoEx->pMeterQInfo;
|
SMeterQueryInfo * pMeterQueryInfo = pMeterDataInfo->pMeterQInfo;
|
||||||
|
|
||||||
|
int64_t* pPrimaryKey = (int64_t*) pRuntimeEnv->primaryColBuffer->data;
|
||||||
/*
|
/*
|
||||||
* for each block, we need to handle the previous query, since the determination of previous query being completed
|
* for each block, we need to handle the previous query, since the determination of previous query being completed
|
||||||
* or not is based on the start key of current block.
|
* or not is based on the start key of current block.
|
||||||
*/
|
*/
|
||||||
TSKEY key = getNextAccessedKeyInData(pQuery, pPrimaryData, pBlockInfo, blockStatus);
|
TSKEY key = getNextAccessedKeyInData(pQuery, pPrimaryKey, pBlockInfo, blockStatus);
|
||||||
setIntervalQueryRange(pInfoEx->pMeterQInfo, pSupporter, key);
|
setIntervalQueryRange(pMeterDataInfo->pMeterQInfo, pSupporter, key);
|
||||||
|
|
||||||
if (((pQuery->skey > pQuery->ekey) && QUERY_IS_ASC_QUERY(pQuery)) ||
|
if (((pQuery->skey > pQuery->ekey) && QUERY_IS_ASC_QUERY(pQuery)) ||
|
||||||
((pQuery->skey < pQuery->ekey) && !QUERY_IS_ASC_QUERY(pQuery))) {
|
((pQuery->skey < pQuery->ekey) && !QUERY_IS_ASC_QUERY(pQuery))) {
|
||||||
|
|
@ -7714,18 +7706,18 @@ static void applyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterD
|
||||||
((pBlockInfo->keyFirst > pQuery->ekey) && !QUERY_IS_ASC_QUERY(pQuery))) {
|
((pBlockInfo->keyFirst > pQuery->ekey) && !QUERY_IS_ASC_QUERY(pQuery))) {
|
||||||
int32_t numOfRes = 0;
|
int32_t numOfRes = 0;
|
||||||
/* current block is included in this interval */
|
/* current block is included in this interval */
|
||||||
int32_t steps = applyFunctionsOnBlock(pRuntimeEnv, pBlockInfo, pPrimaryData, pFields, searchFn, &numOfRes);
|
int32_t steps = applyFunctionsOnBlock(pRuntimeEnv, pBlockInfo, pPrimaryKey, pFields, searchFn, &numOfRes);
|
||||||
assert(numOfRes <= 1 && numOfRes >= 0 && steps > 0);
|
assert(numOfRes <= 1 && numOfRes >= 0 && steps > 0);
|
||||||
|
|
||||||
if (pInfo->lastResRows == 0) {
|
if (pMeterQueryInfo->lastResRows == 0) {
|
||||||
pInfo->lastResRows = numOfRes;
|
pMeterQueryInfo->lastResRows = numOfRes;
|
||||||
} else {
|
} else {
|
||||||
assert(pInfo->lastResRows == 1);
|
assert(pMeterQueryInfo->lastResRows == 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
saveIntervalQueryRange(pRuntimeEnv, pInfo);
|
saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
|
||||||
} else {
|
} else {
|
||||||
doApplyIntervalQueryOnBlock(pSupporter, pInfo, pBlockInfo, pPrimaryData, pFields, searchFn);
|
doApplyIntervalQueryOnBlock(pSupporter, pMeterQueryInfo, pBlockInfo, pPrimaryKey, pFields, searchFn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -98,6 +98,7 @@ ELSEIF(TD_DARWIN_64)
|
||||||
LIST(APPEND SRC ./src/ttypes.c)
|
LIST(APPEND SRC ./src/ttypes.c)
|
||||||
LIST(APPEND SRC ./src/tutil.c)
|
LIST(APPEND SRC ./src/tutil.c)
|
||||||
LIST(APPEND SRC ./src/version.c)
|
LIST(APPEND SRC ./src/version.c)
|
||||||
|
LIST(APPEND SRC ./src/hash.c)
|
||||||
ADD_LIBRARY(tutil ${SRC})
|
ADD_LIBRARY(tutil ${SRC})
|
||||||
TARGET_LINK_LIBRARIES(tutil iconv pthread os)
|
TARGET_LINK_LIBRARIES(tutil iconv pthread os)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue