Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

other: merge main. #22215

Merged
merged 164 commits into from Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
af94992
docs: use english website for english docs
danielclow Jun 16, 2023
9785874
docs: align get started page changes
danielclow Jun 16, 2023
8fb4334
test:temp commite
tomchon Jul 7, 2023
6de705a
Merge branch 'main' of https://github.com/taosdata/TDengine into main
tomchon Jul 7, 2023
f5e3e57
test:add testcase of rolling upgdade
tomchon Jul 7, 2023
4794570
docs(driver): java seek desc
huolibo Jul 11, 2023
cb62d4c
fix:set firset version to reqOffset of response
wangmm0220 Jul 11, 2023
7bc19df
fix:set firset version to reqOffset of response
wangmm0220 Jul 11, 2023
574010e
fix:set firset version to reqOffset of response
wangmm0220 Jul 11, 2023
8dd7f36
fix:set firset version to reqOffset of response
wangmm0220 Jul 11, 2023
6298df7
docs: refine get-started windows section
sangshuduo Jul 12, 2023
cf64d4c
fix:set get_assignment offset to first version of response block
wangmm0220 Jul 12, 2023
2d1200e
docs(driver): kafka connector add tmq
huolibo Jul 13, 2023
a34ac17
Merge pull request #22054 from taosdata/docs/TD-24970
gccgdb1234 Jul 13, 2023
6ee7145
test: modify 7-tmq/tmqParamsTest.py
jiajingbin Jul 13, 2023
66d577d
fix(stream): abort exec when task is dropped.
hjxilinx Jul 13, 2023
5afc576
Merge pull request #22056 from taosdata/fix/task_drop
hjxilinx Jul 13, 2023
e2ae868
Merge pull request #22032 from taosdata/mark/tmq
hjxilinx Jul 13, 2023
a39bf1f
fix:windows compile error
wangmm0220 Jul 13, 2023
d297123
Merge branch 'mark/tmq' of https://github.com/taosdata/TDengine into …
wangmm0220 Jul 13, 2023
494aa07
Merge pull request #22038 from taosdata/docs/sangshuduo/refine-get-st…
gccgdb1234 Jul 13, 2023
4800498
Merge pull request #22029 from taosdata/docs/TS-3557
gccgdb1234 Jul 13, 2023
eb8554d
Merge pull request #22058 from taosdata/mark/tmq
hjxilinx Jul 13, 2023
52f749f
sma not support multiple replicas
54liuyao Jul 14, 2023
22f873e
test:add testcase of rolling upgdade
tomchon Jul 14, 2023
9617f69
docs: update connector feature matrix
sangshuduo Jul 14, 2023
55ee9d6
Correct some typos in string literals (#22062)
sunsided Jul 14, 2023
a48d359
fix: ttlMgrDeleteTtl should ignore ttl 0 tables
LiShunGang Jul 13, 2023
e16a393
fix coverity scan problem
Jul 14, 2023
2279706
fix coverity scan problem
Jul 14, 2023
49b21b3
fix coverity scan problem
Jul 14, 2023
572d9d2
Merge pull request #22063 from taosdata/fix/TD-25201
hjxilinx Jul 14, 2023
3d5a05e
test:add testcase of rolling upgdade
tomchon Jul 14, 2023
d969033
test: increase timout to 180s of replica from 1 to 3
tomchon Jul 14, 2023
ef494fd
Merge branch 'main' of https://github.com/taosdata/TDengine into test…
tomchon Jul 14, 2023
b850c1a
fix: state/session/event window with order by _wstart/_wend has no ef…
wangjiaming0909 Jul 14, 2023
9085dac
add create sma index case
DuanKuanJun Jul 14, 2023
bbdcbcb
fix:modify commit version to next validate version
wangmm0220 Jul 14, 2023
6762a01
Merge branch 'main' of https://github.com/taosdata/TDengine into mark…
wangmm0220 Jul 14, 2023
da0bd2a
Merge pull request #22067 from taosdata/fix/coverity_scan
hjxilinx Jul 14, 2023
7b17168
test:add testcase of rolling upgdade
tomchon Jul 14, 2023
c5ac704
test:add testcase of rolling upgdade
tomchon Jul 14, 2023
ea6e79f
test: modify loop = 60
DuanKuanJun Jul 14, 2023
faf6a11
test:add to ci
DuanKuanJun Jul 14, 2023
c2b3c2d
Merge pull request #22066 from taosdata/fix/TD-25215-main
gccgdb1234 Jul 14, 2023
fc47fa6
Update index.md
wangmm0220 Jul 14, 2023
54ad70e
Update index.md
wangmm0220 Jul 14, 2023
d88946d
main: release 3.0.7.1 docs
xiaopingcs Jul 14, 2023
4fdf9ae
test: add performance test , sma need quick no sma four multiple
DuanKuanJun Jul 15, 2023
ee7c828
fix: create sma index for us/ns database failed
wangjiaming0909 Jul 17, 2023
c146ba5
Merge pull request #22079 from taosdata/main_docs_release
plum-lihui Jul 17, 2023
f2ee992
docs: update readme-cn.md (#22086)
sangshuduo Jul 17, 2023
bcadc8d
Merge pull request #22070 from wangjiaming0909/fix/m/TS-3671
dapan1121 Jul 17, 2023
0a270bf
Merge pull request #22074 from taosdata/test/TD-25021-MAIN
plum-lihui Jul 17, 2023
1bc8c75
Merge pull request #22064 from taosdata/test/TD-24996
plum-lihui Jul 17, 2023
d58ec17
Merge pull request #22065 from taosdata/docs/sangshuduo/TD-23899-pyth…
gccgdb1234 Jul 17, 2023
2822245
Merge pull request #22076 from wangjiaming0909/fix/m/TD-25199
dapan1121 Jul 17, 2023
872222e
fix:[TD-25222] error in drop topic if topic num is too long
wangmm0220 Jul 17, 2023
8d8e12e
fix:add sdbFetchCancel to release hash node
wangmm0220 Jul 17, 2023
da9e304
fix:add sdbFetchCancel to release hash node
wangmm0220 Jul 17, 2023
9667e5d
remove fulltext
yihaoDeng Jul 18, 2023
6c35081
fix:add sdbFetchCancel to release hash node
wangmm0220 Jul 18, 2023
6e80b2b
fix packaging issue
xiaopingcs Jul 18, 2023
1f7e5c0
Merge pull request #22099 from taosdata/fix_packaging_issue
plum-lihui Jul 18, 2023
94b13df
fix: fix interval in nested query filter not applied
glzhao89 Jul 18, 2023
c033592
fix Windows packaging issue
xiaopingcs Jul 18, 2023
5139bc5
Merge pull request #22094 from taosdata/fix/TD-25222
hjxilinx Jul 18, 2023
20918fe
Merge pull request #22078 from taosdata/wangmm0220-patch-1
gccgdb1234 Jul 18, 2023
72457eb
Merge pull request #22077 from taosdata/wangmm0220-patch-2
gccgdb1234 Jul 18, 2023
97a81bd
fix/TD-25179
cadem Jul 18, 2023
c2245a3
Merge pull request #22100 from taosdata/fix/TD-25241
dapan1121 Jul 18, 2023
447eb81
test:add testcase of rolling upgdade
tomchon Jul 18, 2023
745ab09
test: add tmq seek case
plum-lihui Jul 18, 2023
d1835c8
Merge pull request #22101 from taosdata/fix/TD-25179
gccgdb1234 Jul 18, 2023
2c80d7e
Merge branch 'main' of https://github.com/taosdata/TDengine into fix/…
wangmm0220 Jul 18, 2023
08c50df
fix:add sdbFetchCancel to release hash node
wangmm0220 Jul 18, 2023
d3441b9
Merge pull request #22103 from taosdata/test_main/lihui
plum-lihui Jul 18, 2023
7a0fa59
test: check topic name len case
plum-lihui Jul 18, 2023
2495a56
Merge pull request #22102 from taosdata/fix_windows_packaging_issue
plum-lihui Jul 18, 2023
0d0dc6b
Merge pull request #22104 from taosdata/test/TD-24996
plum-lihui Jul 18, 2023
0d922c0
Merge pull request #22095 from taosdata/fix/TS-3672
hjxilinx Jul 18, 2023
3c12033
Merge pull request #22108 from taosdata/test_main/lihui
plum-lihui Jul 18, 2023
e812a65
fix:add tmq_position() interface & optimize commit logic
wangmm0220 Jul 18, 2023
de4efca
update ip
yihaoDeng Jul 18, 2023
79620c9
test: del db and max topics invalid
plum-lihui Jul 18, 2023
fbecd29
Merge pull request #22115 from taosdata/test_main/lihui
plum-lihui Jul 19, 2023
5c344b0
fix:conflicts from main
wangmm0220 Jul 19, 2023
8f464bd
docs: correct the description of auto.offset.reset
gccgdb1234 Jul 19, 2023
4cdfd0e
conflict
Jul 19, 2023
8f709ea
fix test case
Jul 19, 2023
8261410
Merge pull request #22114 from taosdata/fix/TD-25245
gccgdb1234 Jul 19, 2023
69fae62
error message
Jul 19, 2023
0c0acd9
Merge pull request #22117 from taosdata/fix/TS-3589
gccgdb1234 Jul 19, 2023
5cb35f2
feat:add committed & position & commite_offset interface
wangmm0220 Jul 19, 2023
d7d81d8
feat:add committed & position & commite_offset interface
wangmm0220 Jul 19, 2023
49c87a7
feat:add committed & position & commite_offset interface
wangmm0220 Jul 19, 2023
9378a0e
Merge branch 'main' of https://github.com/taosdata/TDengine into mark…
wangmm0220 Jul 19, 2023
e1c4cca
feat:add committed & position & commite_offset interface
wangmm0220 Jul 19, 2023
9a1b5da
Merge pull request #22072 from taosdata/mark/tmq
hjxilinx Jul 20, 2023
d031a77
fix:[TD-25300]dead loop if getchar return EOF in arm64
wangmm0220 Jul 20, 2023
99c3ebc
fix:optimize log & change return value for async interface
wangmm0220 Jul 20, 2023
c464f2f
Merge pull request #22098 from taosdata/doc/remveFullText
gccgdb1234 Jul 21, 2023
10ebf1f
fix:subscribeStb.py maybe failed
wangmm0220 Jul 21, 2023
bb86f5c
fix:commit offset should not plus 1
wangmm0220 Jul 21, 2023
ca34650
docs: update readme to claim does not support cross-compile
sangshuduo Jul 21, 2023
fad8ee0
Merge pull request #22139 from taosdata/docs/sangshuduo/TS-3448-no-cr…
gccgdb1234 Jul 21, 2023
282bbfc
remote web from installation package
xiaopingcs Jul 21, 2023
d4b29b9
update installation instruction
xiaopingcs Jul 21, 2023
f2a969c
Merge pull request #22129 from taosdata/fix/TD-25300
hjxilinx Jul 21, 2023
0952717
docs: refine platform support matrix
sangshuduo Jul 21, 2023
401bf5e
docs: refine platform support matrix (#22144)
sangshuduo Jul 21, 2023
8f15795
fix:judge if pTopic is NULL
wangmm0220 Jul 21, 2023
8b7b9f8
fix: use latest version of jdbc connector (#22148)
sangshuduo Jul 22, 2023
0558ee0
Update 05-taosbenchmark.md
DuanKuanJun Jul 23, 2023
8639e1f
Update 05-taosbenchmark.md
DuanKuanJun Jul 23, 2023
3cedb0b
Merge pull request #22153 from taosdata/DuanKuanJun-patch-2
gccgdb1234 Jul 24, 2023
94c4a93
Merge pull request #22152 from taosdata/DuanKuanJun-patch-1
gccgdb1234 Jul 24, 2023
1a91617
Update 03-table.md
gccgdb1234 Jul 24, 2023
e41653e
Update 19-limit.md
gccgdb1234 Jul 24, 2023
2edb925
Update 03-table.md
gccgdb1234 Jul 24, 2023
3ab7a74
Update 19-limit.md
gccgdb1234 Jul 24, 2023
8798954
Update 19-limit.md
gccgdb1234 Jul 24, 2023
42f3340
Update 02-database.md
plum-lihui Jul 24, 2023
807935e
Merge pull request #22156 from taosdata/plum-lihui-patch-2
plum-lihui Jul 24, 2023
7255d32
Update 05-taosbenchmark.md
DuanKuanJun Jul 24, 2023
f1d79f0
Update 05-taosbenchmark.md
DuanKuanJun Jul 24, 2023
aba0b4c
Merge pull request #22160 from taosdata/DuanKuanJun-patch-3
gccgdb1234 Jul 24, 2023
8b422a1
Merge pull request #22161 from taosdata/DuanKuanJun-patch-4
gccgdb1234 Jul 24, 2023
90f4684
docs: optimization k8s deploy
liuyuan199303 Jul 24, 2023
943d06d
Merge pull request #22145 from taosdata/mark/xinjiang
gccgdb1234 Jul 24, 2023
95a1db6
fix err while connect invalid fqdn
yihaoDeng Jul 24, 2023
dc77e78
fix: monitor no longer reports logs
LiShunGang Jul 24, 2023
548334d
Merge pull request #21755 from taosdata/docs/dclow
gccgdb1234 Jul 24, 2023
9628a9f
fix:open info log in tmq & ignore wal apply ver when read wal
wangmm0220 Jul 24, 2023
d1de8fe
docs: optimization k8s deploy
liuyuan199303 Jul 24, 2023
72aceb3
Update 03-k8s.md
wingwing2005 Jul 24, 2023
d0fd6e8
Update 03-k8s.md
wingwing2005 Jul 24, 2023
d7bb7e1
Merge pull request #22164 from taosdata/docs/yuanliu/deploy-k8s-TD-25202
wingwing2005 Jul 24, 2023
9e3421e
docs: fix python connector docs
sunpe Jul 24, 2023
b3a55e2
Merge pull request #22170 from taosdata/docs/sunpeng/TD-25325-fix-pyt…
gccgdb1234 Jul 24, 2023
101a3c2
docs: fix links in rust connector doc (#22168)
danielclow Jul 24, 2023
0b707a1
fix err while connect invalid fqdn
yihaoDeng Jul 24, 2023
842a0bc
fix err while connect invalid fqdn
Jul 24, 2023
2aacee0
Merge branch 'fix/TD-25308' of https://github.com/taosdata/TDengine i…
Jul 24, 2023
6532afa
fix err while connect invalid fqdn
Jul 24, 2023
6a0e994
fix:avoid request offset type is 0
wangmm0220 Jul 24, 2023
c0e35df
Merge pull request #22131 from taosdata/mark/tmq
hjxilinx Jul 24, 2023
29460db
docs: change to new product names (#22175)
danielclow Jul 24, 2023
b0dfae0
Merge pull request #22167 from taosdata/fix/TD-25308
hjxilinx Jul 25, 2023
7579144
Merge pull request #22133 from taosdata/fix/TS-3691-main
gccgdb1234 Jul 25, 2023
4e43b99
docs: delete logs in monitor doc
sunpe Jul 25, 2023
fb4b728
Merge pull request #22181 from taosdata/docs/sunpeng/TS-3730-delete-l…
gccgdb1234 Jul 25, 2023
c2588d7
Merge pull request #22173 from taosdata/fix/TS-3728
hjxilinx Jul 25, 2023
d766adc
Merge branch 'main' into docs/sangshuduo/refine-get-started
sangshuduo Jul 26, 2023
3098030
docs: refine zh/21-tdinternal/01-arch.md
sangshuduo Jul 26, 2023
a346518
Merge pull request #22142 from taosdata/fix/TD-25206
gccgdb1234 Jul 26, 2023
2382791
docs: refine python version udf requires
sangshuduo Jul 27, 2023
0438229
Merge pull request #22211 from taosdata/docs/sangshuduo/refine-get-st…
gccgdb1234 Jul 27, 2023
3d403dc
other: merge main.
hjxilinx Jul 27, 2023
b145771
other: merge 3.0
hjxilinx Jul 27, 2023
6319cb8
fix: fix syntax error.
hjxilinx Jul 27, 2023
77d43ef
fix:tmq ci error
wangmm0220 Jul 27, 2023
6459587
other: fix merge error.
hjxilinx Jul 28, 2023
0a7e4c7
Merge remote-tracking branch 'origin/fix/liaohj' into fix/liaohj
hjxilinx Jul 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions README-CN.md
Expand Up @@ -39,7 +39,7 @@ TDengine 是一款开源、高性能、云原生的时序数据库 (Time-Series

# 构建

TDengine 目前可以在 Linux、 Windows、macOS 等平台上安装和运行。任何 OS 的应用也可以选择 taosAdapter 的 RESTful 接口连接服务端 taosd。CPU 支持 X64/ARM64,后续会支持 MIPS64、Alpha64、ARM32、RISC-V 等 CPU 架构。
TDengine 目前可以在 Linux、 Windows、macOS 等平台上安装和运行。任何 OS 的应用也可以选择 taosAdapter 的 RESTful 接口连接服务端 taosd。CPU 支持 X64/ARM64,后续会支持 MIPS64、Alpha64、ARM32、RISC-V 等 CPU 架构。目前不支持使用交叉编译器构建。

用户可根据需求选择通过源码、[容器](https://docs.taosdata.com/get-started/docker/)、[安装包](https://docs.taosdata.com/get-started/package/)或[Kubernetes](https://docs.taosdata.com/deployment/k8s/)来安装。本快速指南仅适用于通过源码安装。

Expand Down Expand Up @@ -352,4 +352,4 @@ TDengine 提供了丰富的应用程序开发接口,其中包括 C/C++、Java

# 加入技术交流群

TDengine 官方社群「物联网大数据群」对外开放,欢迎您加入讨论。搜索微信号 "tdengine1",加小 T 为好友,即可入群。
TDengine 官方社群「物联网大数据群」对外开放,欢迎您加入讨论。搜索微信号 "tdengine",加小 T 为好友,即可入群。
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -47,7 +47,7 @@ For user manual, system design and architecture, please refer to [TDengine Docum

# Building

At the moment, TDengine server supports running on Linux/Windows/macOS systems. Any application can also choose the RESTful interface provided by taosAdapter to connect the taosd service . TDengine supports X64/ARM64 CPU, and it will support MIPS64, Alpha64, ARM32, RISC-V and other CPU architectures in the future.
At the moment, TDengine server supports running on Linux/Windows/macOS systems. Any application can also choose the RESTful interface provided by taosAdapter to connect the taosd service . TDengine supports X64/ARM64 CPU, and it will support MIPS64, Alpha64, ARM32, RISC-V and other CPU architectures in the future. Right now we don't support build with cross-compiling environment.

You can choose to install through source code, [container](https://docs.tdengine.com/get-started/docker/), [installation package](https://docs.tdengine.com/get-started/package/) or [Kubernetes](https://docs.tdengine.com/deployment/k8s/). This quick guide only applies to installing from source.

Expand Down
4 changes: 2 additions & 2 deletions docs/en/05-get-started/03-package.md
Expand Up @@ -18,7 +18,7 @@ The full package of TDengine includes the TDengine Server (`taosd`), TDengine Cl

The standard server installation package includes `taos`, `taosd`, `taosAdapter`, `taosBenchmark`, and sample code. You can also download the Lite package that includes only `taosd` and the C/C++ connector.

The TDengine Community Edition is released as Deb and RPM packages. The Deb package can be installed on Debian, Ubuntu, and derivative systems. The RPM package can be installed on CentOS, RHEL, SUSE, and derivative systems. A .tar.gz package is also provided for enterprise customers, and you can install TDengine over `apt-get` as well. The .tar.tz package includes `taosdump` and the TDinsight installation script. If you want to use these utilities with the Deb or RPM package, download and install taosTools separately. TDengine can also be installed on x64 Windows and x64/m1 macOS.
TDengine OSS is released as Deb and RPM packages. The Deb package can be installed on Debian, Ubuntu, and derivative systems. The RPM package can be installed on CentOS, RHEL, SUSE, and derivative systems. A .tar.gz package is also provided for enterprise customers, and you can install TDengine over `apt-get` as well. The .tar.tz package includes `taosdump` and the TDinsight installation script. If you want to use these utilities with the Deb or RPM package, download and install taosTools separately. TDengine can also be installed on x64 Windows and x64/m1 macOS.

## Operating environment requirements
In the Linux system, the minimum requirements for the operating environment are as follows:
Expand Down Expand Up @@ -201,7 +201,7 @@ You can use the TDengine CLI to monitor your TDengine deployment and execute ad

<TabItem label="Windows" value="windows">

After the installation is complete, please run `sc start taosd` or run `C:\TDengine\taosd.exe` with administrator privilege to start TDengine Server.
After the installation is complete, please run `sc start taosd` or run `C:\TDengine\taosd.exe` with administrator privilege to start TDengine Server. Please run `sc start taosadapter` or run `C:\TDengine\taosadapter.exe` with administrator privilege to start taosAdapter to provide http/REST service.

## Command Line Interface (CLI)

Expand Down
11 changes: 0 additions & 11 deletions docs/en/05-get-started/index.md
Expand Up @@ -21,17 +21,6 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
<DocCardList items={useCurrentSidebarCategory().items}/>
```

## Study TDengine Knowledge Map

The TDengine Knowledge Map covers the various knowledge points of TDengine, revealing the invocation relationships and data flow between various conceptual entities. Learning and understanding the TDengine Knowledge Map will help you quickly master the TDengine knowledge system.

<figure>
<center>
<a href="pathname:///img/tdengine-map.svg" target="_blank"><img src="/img/tdengine-map.svg" width="80%" /></a>
<figcaption>Diagram 1. TDengine Knowledge Map</figcaption>
</center>
</figure>

## Join TDengine Community

<table width="100%">
Expand Down
2 changes: 1 addition & 1 deletion docs/en/07-develop/07-tmq.mdx
Expand Up @@ -298,7 +298,7 @@ You configure the following parameters when creating a consumer:
| `td.connect.port` | string | Port of the server side | |
| `group.id` | string | Consumer group ID; consumers with the same ID are in the same group | **Required**. Maximum length: 192. Each topic can create up to 100 consumer groups. |
| `client.id` | string | Client ID | Maximum length: 192. |
| `auto.offset.reset` | enum | Initial offset for the consumer group | Specify `earliest`, `latest`, or `none`(default) |
| `auto.offset.reset` | enum | Initial offset for the consumer group | `earliest`: subscribe from the earliest data, this is the default behavior; `latest`: subscribe from the latest data; or `none`: can't subscribe without committed offset|
| `enable.auto.commit` | boolean | Commit automatically; true: user application doesn't need to explicitly commit; false: user application need to handle commit by itself | Default value is true |
| `auto.commit.interval.ms` | integer | Interval for automatic commits, in milliseconds |
| `msg.with.table.name` | boolean | Specify whether to deserialize table names from messages | default value: false
Expand Down
2 changes: 1 addition & 1 deletion docs/en/07-develop/09-udf.md
Expand Up @@ -403,7 +403,7 @@ In this section we will demonstrate 5 examples of developing UDF in Python langu

In the guide, some debugging skills of using Python UDF will be explained too.

We assume you are using Linux system and already have TDengine 3.0.4.0+ and Python 3.x.
We assume you are using Linux system and already have TDengine 3.0.4.0+ and Python 3.7+.

Note:**You can't use print() function to output log inside a UDF, you have to write the log to a specific file or use logging module of Python.**

Expand Down