From af018a391f3c0c4f348b586f37fc512f68347a41 Mon Sep 17 00:00:00 2001 From: Sean Ely <105326513+sean-tdengine@users.noreply.github.com> Date: Tue, 11 Oct 2022 08:26:53 -0700 Subject: [PATCH 1/2] docs: updated functions to add context for interp Added two sentences to help explain how to use the EVERY parameter for INTERP. --- docs/en/12-taos-sql/10-function.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/12-taos-sql/10-function.md b/docs/en/12-taos-sql/10-function.md index 243ede5fcb..2b39c4b9e5 100644 --- a/docs/en/12-taos-sql/10-function.md +++ b/docs/en/12-taos-sql/10-function.md @@ -864,7 +864,7 @@ INTERP(expr) - `INTERP` is used to get the value that matches the specified time slice from a column. If no such value exists an interpolation value will be returned based on `FILL` parameter. - The input data of `INTERP` is the value of the specified column and a `where` clause can be used to filter the original data. If no `where` condition is specified then all original data is the input. - The output time range of `INTERP` is specified by `RANGE(timestamp1,timestamp2)` parameter, with timestamp1<=timestamp2. timestamp1 is the starting point of the output time range and must be specified. timestamp2 is the ending point of the output time range and must be specified. -- The number of rows in the result set of `INTERP` is determined by the parameter `EVERY`. Starting from timestamp1, one interpolation is performed for every time interval specified `EVERY` parameter. +- The number of rows in the result set of `INTERP` is determined by the parameter `EVERY`. Starting from timestamp1, one interpolation is performed for every time interval specified `EVERY` parameter. The parameter `EVERY` must be an integer, with no quotes, with a time unit of: b(nanosecond), u(microsecond), a(millisecond)), s(second), m(minute), h(hour), d(day), or w(week). For example, `EVERY(500a)` will interpolate every 500 milliseconds. - Interpolation is performed based on `FILL` parameter. - `INTERP` can only be used to interpolate in single timeline. So it must be used with `partition by tbname` when it's used on a STable. - Pseudo column `_irowts` can be used along with `INTERP` to return the timestamps associated with interpolation points(support after version 3.0.1.4). From 139d04aa3055e3e5733300529738feb2c9b62ee8 Mon Sep 17 00:00:00 2001 From: Pan YANG Date: Wed, 12 Oct 2022 09:45:08 +0800 Subject: [PATCH 2/2] docs: add docker pull tips (#17307) * docs: add docker pull tips * docs: add docker pull tips --- docs/en/05-get-started/01-docker.md | 16 ++++++++++++++-- docs/zh/05-get-started/01-docker.md | 14 +++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/docs/en/05-get-started/01-docker.md b/docs/en/05-get-started/01-docker.md index 39fdfeeb06..ac273daba4 100644 --- a/docs/en/05-get-started/01-docker.md +++ b/docs/en/05-get-started/01-docker.md @@ -5,13 +5,25 @@ title: Quick Install on Docker This document describes how to install TDengine in a Docker container and perform queries and inserts. -- The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com). +- The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com). - To get started with TDengine in a non-containerized environment, see [Quick Install from Package](../../get-started/package). - If you want to view the source code, build TDengine yourself, or contribute to the project, see the [TDengine GitHub repository](https://github.com/taosdata/TDengine). ## Run TDengine -If Docker is already installed on your computer, run the following command: +If Docker is already installed on your computer, pull the latest TDengine Docker container image: + +```shell +docker pull tdengine/tdengine:latest +``` + +Or the container image of specific version: + +```shell +docker pull tdengine/tdengine:3.0.1.4 +``` + +And then run the following command: ```shell docker run -d -p 6030:6030 -p 6041:6041 -p 6043-6049:6043-6049 -p 6043-6049:6043-6049/udp tdengine/tdengine diff --git a/docs/zh/05-get-started/01-docker.md b/docs/zh/05-get-started/01-docker.md index c65e00384d..e772447db0 100644 --- a/docs/zh/05-get-started/01-docker.md +++ b/docs/zh/05-get-started/01-docker.md @@ -8,7 +8,19 @@ description: 使用 Docker 快速体验 TDengine 的高效写入和查询 ## 启动 TDengine -如果已经安装了 Docker，只需执行下面的命令： +如果已经安装了 Docker，首先拉取最新的 TDengine 容器镜像： + +```shell +docker pull tdengine/tdengine:latest +``` + +或者指定版本的容器镜像： + +```shell +docker pull tdengine/tdengine:3.0.1.4 +``` + +然后只需执行下面的命令： ```shell docker run -d -p 6030:6030 -p 6041:6041 -p 6043-6049:6043-6049 -p 6043-6049:6043-6049/udp tdengine/tdengine