Merge branch '3.0' of github.com:taosdata/TDengine into szhou/fix/join
This commit is contained in:
shenglian zhou
commit
799f7d0f87
|
|
@ -163,18 +163,6 @@ option(
|
||||||
ON
|
ON
|
||||||
)
|
)
|
||||||
|
|
||||||
option(
|
|
||||||
BUILD_WITH_CRAFT
|
|
||||||
"If build with canonical-raft"
|
|
||||||
OFF
|
|
||||||
)
|
|
||||||
|
|
||||||
option(
|
|
||||||
BUILD_WITH_TRAFT
|
|
||||||
"If build with traft"
|
|
||||||
OFF
|
|
||||||
)
|
|
||||||
|
|
||||||
IF(${TD_LINUX} MATCHES TRUE)
|
IF(${TD_LINUX} MATCHES TRUE)
|
||||||
|
|
||||||
option(
|
option(
|
||||||
|
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
|
|
||||||
# canonical-raft
|
|
||||||
ExternalProject_Add(craft
|
|
||||||
GIT_REPOSITORY https://github.com/canonical/raft.git
|
|
||||||
GIT_TAG v0.11.2
|
|
||||||
SOURCE_DIR "${TD_CONTRIB_DIR}/craft"
|
|
||||||
BINARY_DIR "${TD_CONTRIB_DIR}/craft"
|
|
||||||
#BUILD_IN_SOURCE TRUE
|
|
||||||
# https://answers.ros.org/question/333125/how-to-include-external-automakeautoconf-projects-into-ament_cmake/
|
|
||||||
CONFIGURE_COMMAND COMMAND autoreconf -i COMMAND ./configure --enable-example
|
|
||||||
BUILD_COMMAND "$(MAKE)"
|
|
||||||
INSTALL_COMMAND ""
|
|
||||||
TEST_COMMAND ""
|
|
||||||
)
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
|
|
||||||
# traft
|
|
||||||
ExternalProject_Add(traft
|
|
||||||
GIT_REPOSITORY https://github.com/taosdata/traft.git
|
|
||||||
GIT_TAG for_3.0
|
|
||||||
SOURCE_DIR "${TD_CONTRIB_DIR}/traft"
|
|
||||||
BINARY_DIR "${TD_CONTRIB_DIR}/traft"
|
|
||||||
#BUILD_IN_SOURCE TRUE
|
|
||||||
# https://answers.ros.org/question/333125/how-to-include-external-automakeautoconf-projects-into-ament_cmake/
|
|
||||||
CONFIGURE_COMMAND COMMAND autoreconf -i COMMAND ./configure
|
|
||||||
BUILD_COMMAND "$(MAKE)"
|
|
||||||
INSTALL_COMMAND ""
|
|
||||||
TEST_COMMAND ""
|
|
||||||
)
|
|
||||||
|
|
@ -3,7 +3,7 @@ package main
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/taosdata/driver-go/v2/af"
|
"github.com/taosdata/driver-go/v3/af"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
_ "github.com/taosdata/driver-go/v2/taosSql"
|
_ "github.com/taosdata/driver-go/v3/taosSql"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
_ "github.com/taosdata/driver-go/v2/taosRestful"
|
_ "github.com/taosdata/driver-go/v3/taosRestful"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ package main
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/taosdata/driver-go/v2/wrapper"
|
"github.com/taosdata/driver-go/v3/wrapper"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
|
||||||
|
|
@ -2,5 +2,5 @@ module goexample
|
||||||
|
|
||||||
go 1.17
|
go 1.17
|
||||||
|
|
||||||
require github.com/taosdata/driver-go/v2 develop
|
require github.com/taosdata/driver-go/v3 3.0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ package main
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/taosdata/driver-go/v2/af"
|
"github.com/taosdata/driver-go/v3/af"
|
||||||
)
|
)
|
||||||
|
|
||||||
func prepareDatabase(conn *af.Connector) {
|
func prepareDatabase(conn *af.Connector) {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ package main
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/taosdata/driver-go/v2/af"
|
"github.com/taosdata/driver-go/v3/af"
|
||||||
)
|
)
|
||||||
|
|
||||||
func prepareDatabase(conn *af.Connector) {
|
func prepareDatabase(conn *af.Connector) {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
_ "github.com/taosdata/driver-go/v2/taosRestful"
|
_ "github.com/taosdata/driver-go/v3/taosRestful"
|
||||||
)
|
)
|
||||||
|
|
||||||
func createStable(taos *sql.DB) {
|
func createStable(taos *sql.DB) {
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,9 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/taosdata/driver-go/v2/af"
|
"github.com/taosdata/driver-go/v3/af"
|
||||||
"github.com/taosdata/driver-go/v2/af/param"
|
"github.com/taosdata/driver-go/v3/af/param"
|
||||||
"github.com/taosdata/driver-go/v2/common"
|
"github.com/taosdata/driver-go/v3/common"
|
||||||
)
|
)
|
||||||
|
|
||||||
func checkErr(err error, prompt string) {
|
func checkErr(err error, prompt string) {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ package main
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/taosdata/driver-go/v2/af"
|
"github.com/taosdata/driver-go/v3/af"
|
||||||
)
|
)
|
||||||
|
|
||||||
func prepareDatabase(conn *af.Connector) {
|
func prepareDatabase(conn *af.Connector) {
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
_ "github.com/taosdata/driver-go/v2/taosRestful"
|
_ "github.com/taosdata/driver-go/v3/taosRestful"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
|
||||||
|
|
@ -1,53 +1,120 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql/driver"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"strconv"
|
||||||
"os"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
taos "github.com/taosdata/driver-go/v2/af"
|
"github.com/taosdata/driver-go/v3/af"
|
||||||
|
"github.com/taosdata/driver-go/v3/af/tmq"
|
||||||
|
"github.com/taosdata/driver-go/v3/common"
|
||||||
|
"github.com/taosdata/driver-go/v3/errors"
|
||||||
|
"github.com/taosdata/driver-go/v3/wrapper"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
db, err := taos.Open("", "", "", "log", 0)
|
db, err := af.Open("", "root", "taosdata", "", 0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintln(os.Stderr, err)
|
panic(err)
|
||||||
os.Exit(1)
|
|
||||||
}
|
}
|
||||||
defer db.Close()
|
defer db.Close()
|
||||||
topic, err := db.Subscribe(false, "taoslogtail", "select ts, level, ipaddr, content from log", time.Second)
|
_, err = db.Exec("create database if not exists example_tmq")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintln(os.Stderr, err)
|
panic(err)
|
||||||
os.Exit(2)
|
|
||||||
}
|
}
|
||||||
defer topic.Unsubscribe(true)
|
_, err = db.Exec("create topic if not exists example_tmq_topic with meta as DATABASE example_tmq")
|
||||||
for {
|
|
||||||
func() {
|
|
||||||
rows, err := topic.Consume()
|
|
||||||
defer func() { rows.Close(); time.Sleep(time.Second) }()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err)
|
panic(err)
|
||||||
os.Exit(3)
|
}
|
||||||
|
config := tmq.NewConfig()
|
||||||
|
defer config.Destroy()
|
||||||
|
err = config.SetGroupID("test")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
err = config.SetAutoOffsetReset("earliest")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
err = config.SetConnectIP("127.0.0.1")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
err = config.SetConnectUser("root")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
err = config.SetConnectPass("taosdata")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
err = config.SetConnectPort("6030")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
err = config.SetMsgWithTableName(true)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
err = config.EnableHeartBeat()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
err = config.EnableAutoCommit(func(result *wrapper.TMQCommitCallbackResult) {
|
||||||
|
if result.ErrCode != 0 {
|
||||||
|
errStr := wrapper.TMQErr2Str(result.ErrCode)
|
||||||
|
err := errors.NewError(int(result.ErrCode), errStr)
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
consumer, err := tmq.NewConsumer(config)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
err = consumer.Subscribe([]string{"example_tmq_topic"})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
_, err = db.Exec("create table example_tmq.t1 (ts timestamp,v int)")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
}
|
}
|
||||||
for {
|
for {
|
||||||
values := make([]driver.Value, 4)
|
result, err := consumer.Poll(time.Second)
|
||||||
err := rows.Next(values)
|
if err != nil {
|
||||||
if err == io.EOF {
|
panic(err)
|
||||||
|
}
|
||||||
|
if result.Type != common.TMQ_RES_TABLE_META {
|
||||||
|
panic("want message type 2 got " + strconv.Itoa(int(result.Type)))
|
||||||
|
}
|
||||||
|
data, _ := json.Marshal(result.Meta)
|
||||||
|
fmt.Println(string(data))
|
||||||
|
consumer.Commit(context.Background(), result.Message)
|
||||||
|
consumer.FreeMessage(result.Message)
|
||||||
break
|
break
|
||||||
} else if err != nil {
|
|
||||||
fmt.Fprintln(os.Stderr, err)
|
|
||||||
os.Exit(4)
|
|
||||||
}
|
}
|
||||||
ts := values[0].(time.Time)
|
_, err = db.Exec("insert into example_tmq.t1 values(now,1)")
|
||||||
level := values[1].(int8)
|
if err != nil {
|
||||||
ipaddr := values[2].(string)
|
panic(err)
|
||||||
content := values[3].(string)
|
|
||||||
fmt.Printf("%s %d %s %s\n", ts.Format(time.StampMilli), level, ipaddr, content)
|
|
||||||
}
|
}
|
||||||
}()
|
for {
|
||||||
|
result, err := consumer.Poll(time.Second)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
}
|
}
|
||||||
|
if result.Type != common.TMQ_RES_DATA {
|
||||||
|
panic("want message type 1 got " + strconv.Itoa(int(result.Type)))
|
||||||
|
}
|
||||||
|
data, _ := json.Marshal(result.Data)
|
||||||
|
fmt.Println(string(data))
|
||||||
|
consumer.Commit(context.Background(), result.Message)
|
||||||
|
consumer.FreeMessage(result.Message)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
consumer.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
// 未完成
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ title: REST API
|
||||||
为支持各种不同类型平台的开发，TDengine 提供符合 REST 设计标准的 API，即 REST API。为最大程度降低学习成本，不同于其他数据库 REST API 的设计方法，TDengine 直接通过 HTTP POST 请求 BODY 中包含的 SQL 语句来操作数据库，仅需要一个 URL。REST 连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。
|
为支持各种不同类型平台的开发，TDengine 提供符合 REST 设计标准的 API，即 REST API。为最大程度降低学习成本，不同于其他数据库 REST API 的设计方法，TDengine 直接通过 HTTP POST 请求 BODY 中包含的 SQL 语句来操作数据库，仅需要一个 URL。REST 连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。
|
||||||
|
|
||||||
:::note
|
:::note
|
||||||
与原生连接器的一个区别是，RESTful 接口是无状态的，因此 `USE db_name` 指令没有效果，所有对表名、超级表名的引用都需要指定数据库名前缀。从 2.2.0.0 版本开始，支持在 RESTful URL 中指定 db_name，这时如果 SQL 语句中没有指定数据库名前缀的话，会使用 URL 中指定的这个 db_name。从 2.4.0.0 版本开始，RESTful 默认由 taosAdapter 提供，要求必须在 URL 中指定 db_name。
|
与原生连接器的一个区别是，RESTful 接口是无状态的，因此 `USE db_name` 指令没有效果，所有对表名、超级表名的引用都需要指定数据库名前缀。支持在 RESTful URL 中指定 db_name，这时如果 SQL 语句中没有指定数据库名前缀的话，会使用 URL 中指定的这个 db_name。
|
||||||
:::
|
:::
|
||||||
|
|
||||||
## 安装
|
## 安装
|
||||||
|
|
@ -28,54 +28,204 @@ curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" -d "show databases;" h1.t
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"status": "succ",
|
"code": 0,
|
||||||
"head": [
|
"column_meta": [
|
||||||
|
[
|
||||||
"name",
|
"name",
|
||||||
"created_time",
|
"VARCHAR",
|
||||||
"ntables",
|
64
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"create_time",
|
||||||
|
"TIMESTAMP",
|
||||||
|
8
|
||||||
|
],
|
||||||
|
[
|
||||||
"vgroups",
|
"vgroups",
|
||||||
|
"SMALLINT",
|
||||||
|
2
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"ntables",
|
||||||
|
"BIGINT",
|
||||||
|
8
|
||||||
|
],
|
||||||
|
[
|
||||||
"replica",
|
"replica",
|
||||||
"quorum",
|
"TINYINT",
|
||||||
"days",
|
1
|
||||||
"keep1,keep2,keep(D)",
|
],
|
||||||
"cache(MB)",
|
[
|
||||||
"blocks",
|
"strict",
|
||||||
|
"VARCHAR",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"duration",
|
||||||
|
"VARCHAR",
|
||||||
|
10
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"keep",
|
||||||
|
"VARCHAR",
|
||||||
|
32
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"buffer",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"pagesize",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"pages",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
"minrows",
|
"minrows",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
"maxrows",
|
"maxrows",
|
||||||
"wallevel",
|
"INT",
|
||||||
"fsync",
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
"comp",
|
"comp",
|
||||||
|
"TINYINT",
|
||||||
|
1
|
||||||
|
],
|
||||||
|
[
|
||||||
"precision",
|
"precision",
|
||||||
"status"
|
"VARCHAR",
|
||||||
|
2
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"status",
|
||||||
|
"VARCHAR",
|
||||||
|
10
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"retention",
|
||||||
|
"VARCHAR",
|
||||||
|
60
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"single_stable",
|
||||||
|
"BOOL",
|
||||||
|
1
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"cachemodel",
|
||||||
|
"VARCHAR",
|
||||||
|
11
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"cachesize",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"wal_level",
|
||||||
|
"TINYINT",
|
||||||
|
1
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"wal_fsync_period",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"wal_retention_period",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"wal_retention_size",
|
||||||
|
"BIGINT",
|
||||||
|
8
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"wal_roll_period",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"wal_seg_size",
|
||||||
|
"BIGINT",
|
||||||
|
8
|
||||||
|
]
|
||||||
],
|
],
|
||||||
"data": [
|
"data": [
|
||||||
[
|
[
|
||||||
"log",
|
"information_schema",
|
||||||
"2020-09-02 17:23:00.039",
|
null,
|
||||||
4,
|
null,
|
||||||
1,
|
14,
|
||||||
1,
|
null,
|
||||||
1,
|
null,
|
||||||
10,
|
null,
|
||||||
"30,30,30",
|
null,
|
||||||
1,
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
"ready",
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"performance_schema",
|
||||||
|
null,
|
||||||
|
null,
|
||||||
3,
|
3,
|
||||||
100,
|
null,
|
||||||
4096,
|
null,
|
||||||
1,
|
null,
|
||||||
3000,
|
null,
|
||||||
2,
|
null,
|
||||||
"us",
|
null,
|
||||||
"ready"
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
"ready",
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
"rows": 1
|
"rows": 2
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## HTTP 请求格式
|
## HTTP 请求格式
|
||||||
|
|
||||||
```
|
```text
|
||||||
http://<fqdn>:<port>/rest/sql/[db_name]
|
http://<fqdn>:<port>/rest/sql/[db_name]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
@ -83,21 +233,21 @@ http://<fqdn>:<port>/rest/sql/[db_name]
|
||||||
|
|
||||||
- fqnd: 集群中的任一台主机 FQDN 或 IP 地址
|
- fqnd: 集群中的任一台主机 FQDN 或 IP 地址
|
||||||
- port: 配置文件中 httpPort 配置项，缺省为 6041
|
- port: 配置文件中 httpPort 配置项，缺省为 6041
|
||||||
- db_name: 可选参数，指定本次所执行的 SQL 语句的默认数据库库名。（从 2.2.0.0 版本开始支持）
|
- db_name: 可选参数，指定本次所执行的 SQL 语句的默认数据库库名。
|
||||||
|
|
||||||
例如：`http://h1.taos.com:6041/rest/sql/test` 是指向地址为 `h1.taos.com:6041` 的 URL，并将默认使用的数据库库名设置为 `test`。
|
例如：`http://h1.taos.com:6041/rest/sql/test` 是指向地址为 `h1.taos.com:6041` 的 URL，并将默认使用的数据库库名设置为 `test`。
|
||||||
|
|
||||||
HTTP 请求的 Header 里需带有身份认证信息，TDengine 支持 Basic 认证与自定义认证两种机制，后续版本将提供标准安全的数字签名机制来做身份验证。
|
HTTP 请求的 Header 里需带有身份认证信息，TDengine 支持 Basic 认证与自定义认证两种机制，后续版本将提供标准安全的数字签名机制来做身份验证。
|
||||||
|
|
||||||
- 自定义身份认证信息如下所示（token 稍后介绍）
|
- [自定义身份认证信息](#自定义授权码)如下所示
|
||||||
|
|
||||||
```
|
```text
|
||||||
Authorization: Taosd <TOKEN>
|
Authorization: Taosd <TOKEN>
|
||||||
```
|
```
|
||||||
|
|
||||||
- Basic 身份认证信息如下所示
|
- Basic 身份认证信息如下所示
|
||||||
|
|
||||||
```
|
```text
|
||||||
Authorization: Basic <TOKEN>
|
Authorization: Basic <TOKEN>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
@ -119,41 +269,165 @@ curl -L -u username:password -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]
|
||||||
|
|
||||||
## HTTP 返回格式
|
## HTTP 返回格式
|
||||||
|
|
||||||
返回值为 JSON 格式，如下:
|
### HTTP 响应码
|
||||||
|
|
||||||
|
| **response code** | **说明** |
|
||||||
|
|-------------------|----------------|
|
||||||
|
| 200 | 正确返回和 C 接口错误返回 |
|
||||||
|
| 400 | 参数错误返回 |
|
||||||
|
| 401 | 鉴权失败 |
|
||||||
|
| 404 | 接口不存在 |
|
||||||
|
| 500 | 内部错误 |
|
||||||
|
| 503 | 系统资源不足 |
|
||||||
|
|
||||||
|
### HTTP body 结构
|
||||||
|
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<th>执行结果</th>
|
||||||
|
<th>说明</th>
|
||||||
|
<th>样例</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>正确执行</td>
|
||||||
|
<td>
|
||||||
|
code：（int）0 代表成功
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
column_meta：（[][3]any）列信息，每个列会用三个值来说明，分别为：列名(string)、列类型(string)、类型长度(int)
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
rows：（int）数据返回行数
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
data：（[][]any）具体数据内容
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"status": "succ",
|
"code": 0,
|
||||||
"head": ["ts","current", …],
|
"column_meta": [["affected_rows", "INT", 4]],
|
||||||
"column_meta": [["ts",9,8],["current",6,4], …],
|
"data": [[0]],
|
||||||
"data": [
|
"rows": 1
|
||||||
["2018-10-03 14:38:05.000", 10.3, …],
|
|
||||||
["2018-10-03 14:38:15.000", 12.6, …]
|
|
||||||
],
|
|
||||||
"rows": 2
|
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
说明：
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>正确查询</td>
|
||||||
|
<td>
|
||||||
|
code：（int）0 代表成功
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
column_meta：（[][3]any） 列信息，每个列会用三个值来说明，分别为：列名（string）、列类型（string）、类型长度（int）
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
rows：（int）数据返回行数
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
data：（[][]any）具体数据内容
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
|
||||||
- status: 告知操作结果是成功还是失败。
|
```json
|
||||||
- head: 表的定义，如果不返回结果集，则仅有一列 “affected_rows”。（从 2.0.17.0 版本开始，建议不要依赖 head 返回值来判断数据列类型，而推荐使用 column_meta。在后续版本中，有可能会从返回值中去掉 head 这一项。）
|
{
|
||||||
- column_meta: 从 2.0.17.0 版本开始，返回值中增加这一项来说明 data 里每一列的数据类型。具体每个列会用三个值来说明，分别为：列名、列类型、类型长度。例如`["current",6,4]`表示列名为“current”；列类型为 6，也即 float 类型；类型长度为 4，也即对应 4 个字节表示的 float。如果列类型为 binary 或 nchar，则类型长度表示该列最多可以保存的内容长度，而不是本次返回值中的具体数据长度。当列类型是 nchar 的时候，其类型长度表示可以保存的 unicode 字符数量，而不是 bytes。
|
"code": 0,
|
||||||
- data: 具体返回的数据，一行一行的呈现，如果不返回结果集，那么就仅有 [[affected_rows]]。data 中每一行的数据列顺序，与 column_meta 中描述数据列的顺序完全一致。
|
"column_meta": [
|
||||||
- rows: 表明总共多少行数据。
|
["ts", "TIMESTAMP", 8],
|
||||||
|
["count", "BIGINT", 8],
|
||||||
|
["endpoint", "VARCHAR", 45],
|
||||||
|
["status_code", "INT", 4],
|
||||||
|
["client_ip", "VARCHAR", 40],
|
||||||
|
["request_method", "VARCHAR", 15],
|
||||||
|
["request_uri", "VARCHAR", 128]
|
||||||
|
],
|
||||||
|
"data": [
|
||||||
|
[
|
||||||
|
"2022-06-29T05:50:55.401Z",
|
||||||
|
2,
|
||||||
|
"LAPTOP-NNKFTLTG:6041",
|
||||||
|
200,
|
||||||
|
"172.23.208.1",
|
||||||
|
"POST",
|
||||||
|
"/rest/sql"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"2022-06-29T05:52:16.603Z",
|
||||||
|
1,
|
||||||
|
"LAPTOP-NNKFTLTG:6041",
|
||||||
|
200,
|
||||||
|
"172.23.208.1",
|
||||||
|
"POST",
|
||||||
|
"/rest/sql"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"2022-06-29T06:28:14.118Z",
|
||||||
|
1,
|
||||||
|
"LAPTOP-NNKFTLTG:6041",
|
||||||
|
200,
|
||||||
|
"172.23.208.1",
|
||||||
|
"POST",
|
||||||
|
"/rest/sql"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"2022-06-29T05:52:16.603Z",
|
||||||
|
2,
|
||||||
|
"LAPTOP-NNKFTLTG:6041",
|
||||||
|
401,
|
||||||
|
"172.23.208.1",
|
||||||
|
"POST",
|
||||||
|
"/rest/sql"
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"rows": 4
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
column_meta 中的列类型说明：
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>错误</td>
|
||||||
|
<td>
|
||||||
|
code：（int）错误码
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
desc：（string）错误描述
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
|
||||||
- 1：BOOL
|
```json
|
||||||
- 2：TINYINT
|
{
|
||||||
- 3：SMALLINT
|
"code": 9728,
|
||||||
- 4：INT
|
"desc": "syntax error near \"1\""
|
||||||
- 5：BIGINT
|
}
|
||||||
- 6：FLOAT
|
```
|
||||||
- 7：DOUBLE
|
|
||||||
- 8：BINARY
|
</td>
|
||||||
- 9：TIMESTAMP
|
</tr>
|
||||||
- 10：NCHAR
|
</table>
|
||||||
|
|
||||||
|
### 说明
|
||||||
|
|
||||||
|
- 时间格式仅支持 RFC3339，结果集为 0 时区
|
||||||
|
- 列类型使用如下字符串:
|
||||||
|
> "NULL"
|
||||||
|
> "BOOL"
|
||||||
|
> "TINYINT"
|
||||||
|
> "SMALLINT"
|
||||||
|
> "INT"
|
||||||
|
> "BIGINT"
|
||||||
|
> "FLOAT"
|
||||||
|
> "DOUBLE"
|
||||||
|
> "VARCHAR"
|
||||||
|
> "TIMESTAMP"
|
||||||
|
> "NCHAR"
|
||||||
|
> "TINYINT UNSIGNED"
|
||||||
|
> "SMALLINT UNSIGNED"
|
||||||
|
> "INT UNSIGNED"
|
||||||
|
> "BIGINT UNSIGNED"
|
||||||
|
> "JSON"
|
||||||
|
|
||||||
## 自定义授权码
|
## 自定义授权码
|
||||||
|
|
||||||
|
|
@ -199,17 +473,42 @@ curl http://192.168.0.1:6041/rest/login/root/taosdata
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"status": "succ",
|
"code": 0,
|
||||||
"head": ["ts", "current", "voltage", "phase"],
|
|
||||||
"column_meta": [
|
"column_meta": [
|
||||||
["ts", 9, 8],
|
[
|
||||||
["current", 6, 4],
|
"ts",
|
||||||
["voltage", 4, 4],
|
"TIMESTAMP",
|
||||||
["phase", 6, 4]
|
8
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"current",
|
||||||
|
"FLOAT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"voltage",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"phase",
|
||||||
|
"FLOAT",
|
||||||
|
4
|
||||||
|
]
|
||||||
],
|
],
|
||||||
"data": [
|
"data": [
|
||||||
["2018-10-03 14:38:05.000", 10.3, 219, 0.31],
|
[
|
||||||
["2018-10-03 14:38:15.000", 12.6, 218, 0.33]
|
"2022-07-30T06:44:40.32Z",
|
||||||
|
10.3,
|
||||||
|
219,
|
||||||
|
0.31
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"2022-07-30T06:44:41.32Z",
|
||||||
|
12.6,
|
||||||
|
218,
|
||||||
|
0.33
|
||||||
|
]
|
||||||
],
|
],
|
||||||
"rows": 2
|
"rows": 2
|
||||||
}
|
}
|
||||||
|
|
@ -225,83 +524,23 @@ curl http://192.168.0.1:6041/rest/login/root/taosdata
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"status": "succ",
|
"code": 0,
|
||||||
"head": ["affected_rows"],
|
"column_meta": [
|
||||||
"column_meta": [["affected_rows", 4, 4]],
|
[
|
||||||
"data": [[1]],
|
"affected_rows",
|
||||||
|
"INT",
|
||||||
|
4
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"data": [
|
||||||
|
[
|
||||||
|
0
|
||||||
|
]
|
||||||
|
],
|
||||||
"rows": 1
|
"rows": 1
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## 其他用法
|
## 参考
|
||||||
|
|
||||||
### 结果集采用 Unix 时间戳
|
[taosAdapter](/reference/taosadapter/)
|
||||||
|
|
||||||
HTTP 请求 URL 采用 `/rest/sqlt` 时，返回结果集的时间戳将采用 Unix 时间戳格式表示，例如
|
|
||||||
|
|
||||||
```bash
|
|
||||||
curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" -d "select * from demo.d1001" 192.168.0.1:6041/rest/sqlt
|
|
||||||
```
|
|
||||||
|
|
||||||
返回结果：
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"status": "succ",
|
|
||||||
"head": ["ts", "current", "voltage", "phase"],
|
|
||||||
"column_meta": [
|
|
||||||
["ts", 9, 8],
|
|
||||||
["current", 6, 4],
|
|
||||||
["voltage", 4, 4],
|
|
||||||
["phase", 6, 4]
|
|
||||||
],
|
|
||||||
"data": [
|
|
||||||
[1538548685000, 10.3, 219, 0.31],
|
|
||||||
[1538548695000, 12.6, 218, 0.33]
|
|
||||||
],
|
|
||||||
"rows": 2
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 结果集采用 UTC 时间字符串
|
|
||||||
|
|
||||||
HTTP 请求 URL 采用 `/rest/sqlutc` 时，返回结果集的时间戳将采用 UTC 时间字符串表示，例如
|
|
||||||
|
|
||||||
```bash
|
|
||||||
curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" -d "select * from demo.t1" 192.168.0.1:6041/rest/sqlutc
|
|
||||||
```
|
|
||||||
|
|
||||||
返回值：
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"status": "succ",
|
|
||||||
"head": ["ts", "current", "voltage", "phase"],
|
|
||||||
"column_meta": [
|
|
||||||
["ts", 9, 8],
|
|
||||||
["current", 6, 4],
|
|
||||||
["voltage", 4, 4],
|
|
||||||
["phase", 6, 4]
|
|
||||||
],
|
|
||||||
"data": [
|
|
||||||
["2018-10-03T14:38:05.000+0800", 10.3, 219, 0.31],
|
|
||||||
["2018-10-03T14:38:15.000+0800", 12.6, 218, 0.33]
|
|
||||||
],
|
|
||||||
"rows": 2
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## 重要配置项
|
|
||||||
|
|
||||||
下面仅列出一些与 RESTful 接口有关的配置参数，其他系统参数请看配置文件里的说明。
|
|
||||||
|
|
||||||
- 对外提供 RESTful 服务的端口号，默认绑定到 6041（实际取值是 serverPort + 11，因此可以通过修改 serverPort 参数的设置来修改）。
|
|
||||||
- httpMaxThreads: 启动的线程数量，默认为 2（2.0.17.0 版本开始，默认值改为 CPU 核数的一半向下取整）。
|
|
||||||
- restfulRowLimit: 返回结果集（JSON 格式）的最大条数，默认值为 10240。
|
|
||||||
- httpEnableCompress: 是否支持压缩，默认不支持，目前 TDengine 仅支持 gzip 压缩格式。
|
|
||||||
- httpDebugFlag: 日志开关，默认 131。131：仅错误和报警信息，135：调试信息，143：非常详细的调试信息。
|
|
||||||
- httpDbNameMandatory: 是否必须在 RESTful URL 中指定默认的数据库名。默认为 0，即关闭此检查。如果设置为 1，那么每个 RESTful URL 中都必须设置一个默认数据库名，否则无论此时执行的 SQL 语句是否需要指定数据库，都会返回一个执行错误，拒绝执行此 SQL 语句。
|
|
||||||
|
|
||||||
:::note
|
|
||||||
如果使用 taosd 提供的 REST API, 那么以上配置需要写在 taosd 的配置文件 taos.cfg 中。如果使用 taosAdapter 提供的 REST API, 那么需要参考 taosAdapter [对应的配置方法](/reference/taosadapter/)。
|
|
||||||
:::
|
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ REST 连接支持所有能运行 Go 的平台。
|
||||||
|
|
||||||
### 使用 go get 安装
|
### 使用 go get 安装
|
||||||
|
|
||||||
`go get -u github.com/taosdata/driver-go/v2@develop`
|
`go get -u github.com/taosdata/driver-go/v3@latest`
|
||||||
|
|
||||||
### 使用 go mod 管理
|
### 使用 go mod 管理
|
||||||
|
|
||||||
|
|
@ -80,7 +80,7 @@ REST 连接支持所有能运行 Go 的平台。
|
||||||
```go
|
```go
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
_ "github.com/taosdata/driver-go/v2/taosSql"
|
_ "github.com/taosdata/driver-go/v3/taosSql"
|
||||||
)
|
)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
@ -132,7 +132,7 @@ import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
_ "github.com/taosdata/driver-go/v2/taosSql"
|
_ "github.com/taosdata/driver-go/v3/taosSql"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
@ -164,7 +164,7 @@ import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
_ "github.com/taosdata/driver-go/v2/taosRestful"
|
_ "github.com/taosdata/driver-go/v3/taosRestful"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
@ -205,14 +205,14 @@ func main() {
|
||||||
|
|
||||||
### 更多示例程序
|
### 更多示例程序
|
||||||
|
|
||||||
* [示例程序](https://github.com/taosdata/TDengine/tree/develop/examples/go)
|
* [示例程序](https://github.com/taosdata/driver-go/tree/3.0/examples)
|
||||||
* [视频教程](https://www.taosdata.com/blog/2020/11/11/1951.html)。
|
* [视频教程](https://www.taosdata.com/blog/2020/11/11/1951.html)。
|
||||||
|
|
||||||
## 使用限制
|
## 使用限制
|
||||||
|
|
||||||
由于 REST 接口无状态所以 `use db` 语法不会生效，需要将 db 名称放到 SQL 语句中，如：`create table if not exists tb1 (ts timestamp, a int)`改为`create table if not exists test.tb1 (ts timestamp, a int)`否则将报错`[0x217] Database not specified or available`。
|
由于 REST 接口无状态所以 `use db` 语法不会生效，需要将 db 名称放到 SQL 语句中，如：`create table if not exists tb1 (ts timestamp, a int)`改为`create table if not exists test.tb1 (ts timestamp, a int)`否则将报错`[0x217] Database not specified or available`。
|
||||||
|
|
||||||
也可以将 db 名称放到 DSN 中，将 `root:taosdata@http(localhost:6041)/` 改为 `root:taosdata@http(localhost:6041)/test`，此方法在 TDengine 2.4.0.5 版本的 taosAdapter 开始支持。当指定的 db 不存在时执行 `create database` 语句不会报错，而执行针对该 db 的其他查询或写入操作会报错。
|
也可以将 db 名称放到 DSN 中，将 `root:taosdata@http(localhost:6041)/` 改为 `root:taosdata@http(localhost:6041)/test`。当指定的 db 不存在时执行 `create database` 语句不会报错，而执行针对该 db 的其他查询或写入操作会报错。
|
||||||
|
|
||||||
完整示例如下：
|
完整示例如下：
|
||||||
|
|
||||||
|
|
@ -224,7 +224,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
_ "github.com/taosdata/driver-go/v2/taosRestful"
|
_ "github.com/taosdata/driver-go/v3/taosRestful"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
@ -266,35 +266,27 @@ func main() {
|
||||||
|
|
||||||
## 常见问题
|
## 常见问题
|
||||||
|
|
||||||
1. 无法找到包 `github.com/taosdata/driver-go/v2/taosRestful`
|
1. database/sql 中 stmt（参数绑定）相关接口崩溃
|
||||||
|
|
||||||
将 `go.mod` 中 require 块对`github.com/taosdata/driver-go/v2`的引用改为`github.com/taosdata/driver-go/v2 develop`，之后执行 `go mod tidy`。
|
|
||||||
|
|
||||||
2. database/sql 中 stmt（参数绑定）相关接口崩溃
|
|
||||||
|
|
||||||
REST 不支持参数绑定相关接口，建议使用`db.Exec`和`db.Query`。
|
REST 不支持参数绑定相关接口，建议使用`db.Exec`和`db.Query`。
|
||||||
|
|
||||||
3. 使用 `use db` 语句后执行其他语句报错 `[0x217] Database not specified or available`
|
2. 使用 `use db` 语句后执行其他语句报错 `[0x217] Database not specified or available`
|
||||||
|
|
||||||
在 REST 接口中 SQL 语句的执行无上下文关联，使用 `use db` 语句不会生效，解决办法见上方使用限制章节。
|
在 REST 接口中 SQL 语句的执行无上下文关联，使用 `use db` 语句不会生效，解决办法见上方使用限制章节。
|
||||||
|
|
||||||
4. 使用 taosSql 不报错使用 taosRestful 报错 `[0x217] Database not specified or available`
|
3. 使用 taosSql 不报错使用 taosRestful 报错 `[0x217] Database not specified or available`
|
||||||
|
|
||||||
因为 REST 接口无状态，使用 `use db` 语句不会生效，解决办法见上方使用限制章节。
|
因为 REST 接口无状态，使用 `use db` 语句不会生效，解决办法见上方使用限制章节。
|
||||||
|
|
||||||
5. 升级 `github.com/taosdata/driver-go/v2/taosRestful`
|
4. `readBufferSize` 参数调大后无明显效果
|
||||||
|
|
||||||
将 `go.mod` 文件中对 `github.com/taosdata/driver-go/v2` 的引用改为 `github.com/taosdata/driver-go/v2 develop`，之后执行 `go mod tidy`。
|
|
||||||
|
|
||||||
6. `readBufferSize` 参数调大后无明显效果
|
|
||||||
|
|
||||||
`readBufferSize` 调大后会减少获取结果时 `syscall` 的调用。如果查询结果的数据量不大，修改该参数不会带来明显提升，如果该参数修改过大，瓶颈会在解析 JSON 数据。如果需要优化查询速度，需要根据实际情况调整该值来达到查询效果最优。
|
`readBufferSize` 调大后会减少获取结果时 `syscall` 的调用。如果查询结果的数据量不大，修改该参数不会带来明显提升，如果该参数修改过大，瓶颈会在解析 JSON 数据。如果需要优化查询速度，需要根据实际情况调整该值来达到查询效果最优。
|
||||||
|
|
||||||
7. `disableCompression` 参数设置为 `false` 时查询效率降低
|
5. `disableCompression` 参数设置为 `false` 时查询效率降低
|
||||||
|
|
||||||
当 `disableCompression` 参数设置为 `false` 时查询结果会使用 `gzip` 压缩后传输，拿到数据后要先进行 `gzip` 解压。
|
当 `disableCompression` 参数设置为 `false` 时查询结果会使用 `gzip` 压缩后传输，拿到数据后要先进行 `gzip` 解压。
|
||||||
|
|
||||||
8. `go get` 命令无法获取包，或者获取包超时
|
6. `go get` 命令无法获取包，或者获取包超时
|
||||||
|
|
||||||
设置 Go 代理 `go env -w GOPROXY=https://goproxy.cn,direct`。
|
设置 Go 代理 `go env -w GOPROXY=https://goproxy.cn,direct`。
|
||||||
|
|
||||||
|
|
@ -334,17 +326,33 @@ func main() {
|
||||||
|
|
||||||
#### 订阅
|
#### 订阅
|
||||||
|
|
||||||
* `func (conn *Connector) Subscribe(restart bool, topic string, sql string, interval time.Duration) (Subscriber, error)`
|
* `func NewConsumer(conf *Config) (*Consumer, error)`
|
||||||
|
|
||||||
订阅数据。
|
创建消费者。
|
||||||
|
|
||||||
* `func (s *taosSubscriber) Consume() (driver.Rows, error)`
|
* `func (c *Consumer) Subscribe(topics []string) error`
|
||||||
|
|
||||||
消费订阅数据，返回 `database/sql/driver` 包的 `Rows` 结构。
|
订阅主题。
|
||||||
|
|
||||||
* `func (s *taosSubscriber) Unsubscribe(keepProgress bool)`
|
* `func (c *Consumer) Poll(timeout time.Duration) (*Result, error)`
|
||||||
|
|
||||||
取消订阅数据。
|
轮询消息。
|
||||||
|
|
||||||
|
* `func (c *Consumer) Commit(ctx context.Context, message unsafe.Pointer) error`
|
||||||
|
|
||||||
|
提交消息。
|
||||||
|
|
||||||
|
* `func (c *Consumer) FreeMessage(message unsafe.Pointer)`
|
||||||
|
|
||||||
|
释放消息。
|
||||||
|
|
||||||
|
* `func (c *Consumer) Unsubscribe() error`
|
||||||
|
|
||||||
|
取消订阅。
|
||||||
|
|
||||||
|
* `func (c *Consumer) Close() error`
|
||||||
|
|
||||||
|
关闭消费者。
|
||||||
|
|
||||||
#### schemaless
|
#### schemaless
|
||||||
|
|
||||||
|
|
@ -366,10 +374,6 @@ func main() {
|
||||||
|
|
||||||
参数绑定单行插入。
|
参数绑定单行插入。
|
||||||
|
|
||||||
* `func (conn *Connector) StmtQuery(sql string, params *param.Param) (rows driver.Rows, err error)`
|
|
||||||
|
|
||||||
参数绑定查询，返回 `database/sql/driver` 包的 `Rows` 结构。
|
|
||||||
|
|
||||||
* `func (conn *Connector) InsertStmt() *insertstmt.InsertStmt`
|
* `func (conn *Connector) InsertStmt() *insertstmt.InsertStmt`
|
||||||
|
|
||||||
初始化参数。
|
初始化参数。
|
||||||
|
|
@ -408,4 +412,4 @@ func main() {
|
||||||
|
|
||||||
## API 参考
|
## API 参考
|
||||||
|
|
||||||
全部 API 见 [driver-go 文档](https://pkg.go.dev/github.com/taosdata/driver-go/v2)
|
全部 API 见 [driver-go 文档](https://pkg.go.dev/github.com/taosdata/driver-go/v3)
|
||||||
|
|
|
||||||
|
|
@ -202,6 +202,7 @@ bool fmIsForbidStreamFunc(int32_t funcId);
|
||||||
bool fmIsIntervalInterpoFunc(int32_t funcId);
|
bool fmIsIntervalInterpoFunc(int32_t funcId);
|
||||||
bool fmIsInterpFunc(int32_t funcId);
|
bool fmIsInterpFunc(int32_t funcId);
|
||||||
bool fmIsLastRowFunc(int32_t funcId);
|
bool fmIsLastRowFunc(int32_t funcId);
|
||||||
|
bool fmIsSelectValueFunc(int32_t funcId);
|
||||||
bool fmIsSystemInfoFunc(int32_t funcId);
|
bool fmIsSystemInfoFunc(int32_t funcId);
|
||||||
bool fmIsImplicitTsFunc(int32_t funcId);
|
bool fmIsImplicitTsFunc(int32_t funcId);
|
||||||
bool fmIsClientPseudoColumnFunc(int32_t funcId);
|
bool fmIsClientPseudoColumnFunc(int32_t funcId);
|
||||||
|
|
|
||||||
|
|
@ -687,6 +687,7 @@ static int32_t mndRetrieveConns(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
|
||||||
int32_t numOfRows = 0;
|
int32_t numOfRows = 0;
|
||||||
int32_t cols = 0;
|
int32_t cols = 0;
|
||||||
SConnObj *pConn = NULL;
|
SConnObj *pConn = NULL;
|
||||||
|
int32_t keepTime = tsShellActivityTimer * 3;
|
||||||
|
|
||||||
if (pShow->pIter == NULL) {
|
if (pShow->pIter == NULL) {
|
||||||
SProfileMgmt *pMgmt = &pMnode->profileMgmt;
|
SProfileMgmt *pMgmt = &pMnode->profileMgmt;
|
||||||
|
|
@ -700,6 +701,10 @@ static int32_t mndRetrieveConns(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((taosGetTimestampMs() - pConn->lastAccessTimeMs) > (keepTime * 1000)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
cols = 0;
|
cols = 0;
|
||||||
|
|
||||||
SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
|
SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
|
||||||
|
|
|
||||||
|
|
@ -672,6 +672,10 @@ int32_t projectApplyFunctions(SExprInfo* pExpr, SSDataBlock* pResult, SSDataBloc
|
||||||
|
|
||||||
numOfRows = pfCtx->fpSet.process(pfCtx);
|
numOfRows = pfCtx->fpSet.process(pfCtx);
|
||||||
} else if (fmIsAggFunc(pfCtx->functionId)) {
|
} else if (fmIsAggFunc(pfCtx->functionId)) {
|
||||||
|
// diff/derivative selective value should be set during function execution
|
||||||
|
if (fmIsSelectValueFunc(pfCtx->functionId)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
// _group_key function for "partition by tbname" + csum(col_name) query
|
// _group_key function for "partition by tbname" + csum(col_name) query
|
||||||
SColumnInfoData* pOutput = taosArrayGet(pResult->pDataBlock, outputSlotId);
|
SColumnInfoData* pOutput = taosArrayGet(pResult->pDataBlock, outputSlotId);
|
||||||
int32_t slotId = pfCtx->param[0].pCol->slotId;
|
int32_t slotId = pfCtx->param[0].pCol->slotId;
|
||||||
|
|
|
||||||
|
|
@ -221,6 +221,13 @@ bool fmIsLastRowFunc(int32_t funcId) {
|
||||||
return FUNCTION_TYPE_LAST_ROW == funcMgtBuiltins[funcId].type;
|
return FUNCTION_TYPE_LAST_ROW == funcMgtBuiltins[funcId].type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool fmIsSelectValueFunc(int32_t funcId) {
|
||||||
|
if (funcId < 0 || funcId >= funcMgtBuiltinsNum) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return FUNCTION_TYPE_SELECT_VALUE == funcMgtBuiltins[funcId].type;
|
||||||
|
}
|
||||||
|
|
||||||
void fmFuncMgtDestroy() {
|
void fmFuncMgtDestroy() {
|
||||||
void* m = gFunMgtService.pFuncNameHashTable;
|
void* m = gFunMgtService.pFuncNameHashTable;
|
||||||
if (m != NULL && atomic_val_compare_exchange_ptr((void**)&gFunMgtService.pFuncNameHashTable, m, 0) == m) {
|
if (m != NULL && atomic_val_compare_exchange_ptr((void**)&gFunMgtService.pFuncNameHashTable, m, 0) == m) {
|
||||||
|
|
|
||||||
|
|
@ -140,13 +140,23 @@ int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type) {
|
||||||
SCL_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY);
|
SCL_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
colDataDestroy(out.columnData);
|
||||||
|
taosMemoryFreeClear(out.columnData);
|
||||||
|
out.columnData = taosMemoryCalloc(1, sizeof(SColumnInfoData));
|
||||||
|
|
||||||
cell = cell->pNext;
|
cell = cell->pNext;
|
||||||
}
|
}
|
||||||
|
|
||||||
*data = pObj;
|
*data = pObj;
|
||||||
|
|
||||||
|
colDataDestroy(out.columnData);
|
||||||
|
taosMemoryFreeClear(out.columnData);
|
||||||
return TSDB_CODE_SUCCESS;
|
return TSDB_CODE_SUCCESS;
|
||||||
|
|
||||||
_return:
|
_return:
|
||||||
|
|
||||||
|
colDataDestroy(out.columnData);
|
||||||
|
taosMemoryFreeClear(out.columnData);
|
||||||
taosHashCleanup(pObj);
|
taosHashCleanup(pObj);
|
||||||
SCL_RET(code);
|
SCL_RET(code);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [ $# != 5 ] ; then
|
if [ $# != 7 ] ; then
|
||||||
echo "Uasge: $0 instances vgroups replica ctables rows"
|
echo "Uasge: $0 instances vgroups replica ctables rows weak drop(yes/no)"
|
||||||
echo ""
|
echo ""
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
@ -11,11 +11,14 @@ vgroups=$2
|
||||||
replica=$3
|
replica=$3
|
||||||
ctables=$4
|
ctables=$4
|
||||||
rows=$5
|
rows=$5
|
||||||
|
weak=$6
|
||||||
|
drop=$7
|
||||||
|
|
||||||
echo "params: instances:${instances}, vgroups:${vgroups}, replica:${replica}, ctables:${ctables}, rows:${rows}"
|
|
||||||
|
echo "params: instances:${instances}, vgroups:${vgroups}, replica:${replica}, ctables:${ctables}, rows:${rows}, weak:${weak}, drop:${drop}"
|
||||||
|
|
||||||
dt=`date "+%Y-%m-%d-%H-%M-%S"`
|
dt=`date "+%Y-%m-%d-%H-%M-%S"`
|
||||||
casedir=instances_${instances}_vgroups_${vgroups}_replica_${replica}_ctables_${ctables}_rows_${rows}_${dt}
|
casedir=instances_${instances}_vgroups_${vgroups}_replica_${replica}_ctables_${ctables}_rows_${rows}_weak_${weak}_drop_${drop}_${dt}
|
||||||
mkdir ${casedir}
|
mkdir ${casedir}
|
||||||
cp ./insert.tpl.json ${casedir}
|
cp ./insert.tpl.json ${casedir}
|
||||||
cd ${casedir}
|
cd ${casedir}
|
||||||
|
|
@ -25,6 +28,7 @@ for i in `seq 1 ${instances}`;do
|
||||||
cfg_file=bench_${i}.json
|
cfg_file=bench_${i}.json
|
||||||
cp ./insert.tpl.json ${cfg_file}
|
cp ./insert.tpl.json ${cfg_file}
|
||||||
rstfile=result_${i}
|
rstfile=result_${i}
|
||||||
|
sed -i 's/tpl_drop_tpl/'${drop}'/g' ${cfg_file}
|
||||||
sed -i 's/tpl_vgroups_tpl/'${vgroups}'/g' ${cfg_file}
|
sed -i 's/tpl_vgroups_tpl/'${vgroups}'/g' ${cfg_file}
|
||||||
sed -i 's/tpl_replica_tpl/'${replica}'/g' ${cfg_file}
|
sed -i 's/tpl_replica_tpl/'${replica}'/g' ${cfg_file}
|
||||||
sed -i 's/tpl_ctables_tpl/'${ctables}'/g' ${cfg_file}
|
sed -i 's/tpl_ctables_tpl/'${ctables}'/g' ${cfg_file}
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,11 @@
|
||||||
"databases": [
|
"databases": [
|
||||||
{
|
{
|
||||||
"dbinfo": {
|
"dbinfo": {
|
||||||
"name": "db1",
|
"name": "db_auto",
|
||||||
"drop": "yes",
|
"drop": "tpl_drop_tpl",
|
||||||
|
"wal_retention_period": -1,
|
||||||
|
"wal_retention_size": -1,
|
||||||
|
"drop": "no",
|
||||||
"vgroups": tpl_vgroups_tpl,
|
"vgroups": tpl_vgroups_tpl,
|
||||||
"replica": tpl_replica_tpl
|
"replica": tpl_replica_tpl
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,6 @@
|
||||||
./test.sh -f tsim/query/scalarFunction.sim
|
./test.sh -f tsim/query/scalarFunction.sim
|
||||||
./test.sh -f tsim/query/scalarNull.sim
|
./test.sh -f tsim/query/scalarNull.sim
|
||||||
./test.sh -f tsim/query/session.sim
|
./test.sh -f tsim/query/session.sim
|
||||||
./test.sh -f tsim/query/udf.sim
|
|
||||||
|
|
||||||
# ---- qnode
|
# ---- qnode
|
||||||
./test.sh -f tsim/qnode/basic1.sim
|
./test.sh -f tsim/qnode/basic1.sim
|
||||||
|
|
@ -316,6 +315,7 @@
|
||||||
./test.sh -f tsim/valgrind/checkError5.sim
|
./test.sh -f tsim/valgrind/checkError5.sim
|
||||||
./test.sh -f tsim/valgrind/checkError6.sim
|
./test.sh -f tsim/valgrind/checkError6.sim
|
||||||
./test.sh -f tsim/valgrind/checkError7.sim
|
./test.sh -f tsim/valgrind/checkError7.sim
|
||||||
|
./test.sh -f tsim/valgrind/checkUdf.sim
|
||||||
|
|
||||||
# --- vnode
|
# --- vnode
|
||||||
# unsupport ./test.sh -f tsim/vnode/replica3_basic.sim
|
# unsupport ./test.sh -f tsim/vnode/replica3_basic.sim
|
||||||
|
|
@ -339,7 +339,7 @@
|
||||||
# --- catalog ----
|
# --- catalog ----
|
||||||
./test.sh -f tsim/catalog/alterInCurrent.sim
|
./test.sh -f tsim/catalog/alterInCurrent.sim
|
||||||
|
|
||||||
# --- scalar
|
# --- scalar ----
|
||||||
./test.sh -f tsim/scalar/in.sim
|
./test.sh -f tsim/scalar/in.sim
|
||||||
./test.sh -f tsim/scalar/scalar.sim
|
./test.sh -f tsim/scalar/scalar.sim
|
||||||
|
|
||||||
|
|
@ -384,7 +384,7 @@
|
||||||
./test.sh -f tsim/compute/sum.sim
|
./test.sh -f tsim/compute/sum.sim
|
||||||
./test.sh -f tsim/compute/top.sim
|
./test.sh -f tsim/compute/top.sim
|
||||||
|
|
||||||
# ---- field
|
# ---- field ----
|
||||||
./test.sh -f tsim/field/2.sim
|
./test.sh -f tsim/field/2.sim
|
||||||
./test.sh -f tsim/field/3.sim
|
./test.sh -f tsim/field/3.sim
|
||||||
./test.sh -f tsim/field/4.sim
|
./test.sh -f tsim/field/4.sim
|
||||||
|
|
@ -401,7 +401,7 @@
|
||||||
./test.sh -f tsim/field/tinyint.sim
|
./test.sh -f tsim/field/tinyint.sim
|
||||||
./test.sh -f tsim/field/unsigined_bigint.sim
|
./test.sh -f tsim/field/unsigined_bigint.sim
|
||||||
|
|
||||||
# ---- vector
|
# ---- vector ----
|
||||||
./test.sh -f tsim/vector/metrics_field.sim
|
./test.sh -f tsim/vector/metrics_field.sim
|
||||||
./test.sh -f tsim/vector/metrics_mix.sim
|
./test.sh -f tsim/vector/metrics_mix.sim
|
||||||
./test.sh -f tsim/vector/metrics_query.sim
|
./test.sh -f tsim/vector/metrics_query.sim
|
||||||
|
|
@ -414,10 +414,10 @@
|
||||||
./test.sh -f tsim/vector/table_query.sim
|
./test.sh -f tsim/vector/table_query.sim
|
||||||
./test.sh -f tsim/vector/table_time.sim
|
./test.sh -f tsim/vector/table_time.sim
|
||||||
|
|
||||||
# ---- wal
|
# ---- wal ----
|
||||||
./test.sh -f tsim/wal/kill.sim
|
./test.sh -f tsim/wal/kill.sim
|
||||||
|
|
||||||
# ---- tag
|
# ---- tag ----
|
||||||
./test.sh -f tsim/tag/3.sim
|
./test.sh -f tsim/tag/3.sim
|
||||||
./test.sh -f tsim/tag/4.sim
|
./test.sh -f tsim/tag/4.sim
|
||||||
./test.sh -f tsim/tag/5.sim
|
./test.sh -f tsim/tag/5.sim
|
||||||
|
|
|
||||||
|
|
@ -831,16 +831,10 @@ sql alter table $mt add tag tgcol4 int
|
||||||
sql alter table $mt add tag tgcol5 bigint
|
sql alter table $mt add tag tgcol5 bigint
|
||||||
sql alter table $mt add tag tgcol6 bigint
|
sql alter table $mt add tag tgcol6 bigint
|
||||||
|
|
||||||
return
|
sql reset query cache
|
||||||
sql alter table $mt add tag tgcol7 bigint -x step141
|
|
||||||
return -1
|
|
||||||
step141:
|
|
||||||
sql reset query cache
|
|
||||||
sql alter table $mt drop tag tgcol6
|
sql alter table $mt drop tag tgcol6
|
||||||
sql alter table $mt add tag tgcol7 bigint
|
sql alter table $mt add tag tgcol7 bigint
|
||||||
sql alter table $mt add tag tgcol8 bigint -x step142
|
sql alter table $mt add tag tgcol8 bigint
|
||||||
return -1
|
|
||||||
step142:
|
|
||||||
|
|
||||||
print =============== clear
|
print =============== clear
|
||||||
sql drop database $db
|
sql drop database $db
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,9 @@ sql insert into db.ctb2 values(now, 1, 2, 3)
|
||||||
|
|
||||||
print =============== step6: query data
|
print =============== step6: query data
|
||||||
sql select * from db.stb where tbname = 'ctb2';
|
sql select * from db.stb where tbname = 'ctb2';
|
||||||
|
sql alter table ctb2 set tag t1=1;
|
||||||
|
sql alter table ctb2 set tag t3='3';
|
||||||
|
sql select * from db.stb where t1 = 1;
|
||||||
|
|
||||||
print =============== step7: normal table
|
print =============== step7: normal table
|
||||||
sql create database d1 replica 1 duration 7 keep 50
|
sql create database d1 replica 1 duration 7 keep 50
|
||||||
|
|
|
||||||
|
|
@ -104,6 +104,7 @@ sql select length("abcd1234"), char_length("abcd1234=-+*") from stb
|
||||||
sql select tbcol4, length(tbcol4), lower(tbcol4), upper(tbcol4), ltrim(tbcol4), rtrim(tbcol4), concat(tbcol4, tbcol5), concat_ws('_', tbcol4, tbcol5), substr(tbcol4, 1, 4) from stb
|
sql select tbcol4, length(tbcol4), lower(tbcol4), upper(tbcol4), ltrim(tbcol4), rtrim(tbcol4), concat(tbcol4, tbcol5), concat_ws('_', tbcol4, tbcol5), substr(tbcol4, 1, 4) from stb
|
||||||
sql select * from stb where tbcol not in (1,2,3,null);
|
sql select * from stb where tbcol not in (1,2,3,null);
|
||||||
sql select * from stb where tbcol + 3 <> null;
|
sql select * from stb where tbcol + 3 <> null;
|
||||||
|
sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from stb where tbcol = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol interval(1d)
|
||||||
|
|
||||||
print =============== step5: explain
|
print =============== step5: explain
|
||||||
sql explain analyze select ts from stb where -2;
|
sql explain analyze select ts from stb where -2;
|
||||||
|
|
@ -118,6 +119,17 @@ sql explain analyze verbose true select * from information_schema.user_stables w
|
||||||
sql explain analyze verbose true select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from stb where ts <= 1601481840000 and ts >= 1601481800000 partition by tgcol interval(1m) fill(value, 0)
|
sql explain analyze verbose true select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from stb where ts <= 1601481840000 and ts >= 1601481800000 partition by tgcol interval(1m) fill(value, 0)
|
||||||
sql explain select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from stb where ts <= 1601481840000 and ts >= 1601481800000 partition by tgcol interval(1m) fill(value, 0)
|
sql explain select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from stb where ts <= 1601481840000 and ts >= 1601481800000 partition by tgcol interval(1m) fill(value, 0)
|
||||||
|
|
||||||
|
print =============== step6: in cast
|
||||||
|
sql select 1+1n;
|
||||||
|
sql select cast(1 as timestamp)+1n;
|
||||||
|
sql select cast(1 as timestamp)+1y;
|
||||||
|
sql select * from tb1 where ts in ('2018-07-10 16:31:01', '2022-07-10 16:31:03', 1657441865000);
|
||||||
|
sql select * from tb1 where tbcol2 in (257);
|
||||||
|
sql select * from tb1 where tbcol3 in (2, 257);
|
||||||
|
sql select * from stb where ts in ('2018-07-10 16:31:01', '2022-07-10 16:31:03', 1657441865000);
|
||||||
|
sql select * from stb where tbcol2 in (257);
|
||||||
|
sql select * from stb where tbcol3 in (2, 257);
|
||||||
|
|
||||||
print =============== check
|
print =============== check
|
||||||
$null=
|
$null=
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
system sh/stop_dnodes.sh
|
system sh/stop_dnodes.sh
|
||||||
system sh/deploy.sh -n dnode1 -i 1
|
system sh/deploy.sh -n dnode1 -i 1
|
||||||
system sh/cfg.sh -n dnode1 -c udf -v 1
|
system sh/cfg.sh -n dnode1 -c udf -v 1
|
||||||
|
|
||||||
print ========= start dnode1 as leader
|
|
||||||
system sh/exec.sh -n dnode1 -s start
|
system sh/exec.sh -n dnode1 -s start
|
||||||
sql connect
|
sql connect
|
||||||
|
|
||||||
|
|
@ -149,4 +147,18 @@ if $rows != 0 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
system sh/exec.sh -n dnode1 -s stop -x SIGTERM
|
_OVER:
|
||||||
|
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||||
|
print =============== check
|
||||||
|
$null=
|
||||||
|
|
||||||
|
system_content sh/checkValgrind.sh -n dnode1
|
||||||
|
print cmd return result ----> [ $system_content ]
|
||||||
|
if $system_content > 0 then
|
||||||
|
return -1
|
||||||
|
endi
|
||||||
|
|
||||||
|
if $system_content == $null then
|
||||||
|
return -1
|
||||||
|
endi
|
||||||
|
|
||||||
Loading…
Reference in New Issue