Skip to content

Commit c378c55

Browse files
guanshengliangguanshengliang
authored
merge: from main to 3.0 branch #34156 
2 parents 11fb428 + 10e8de8 commit c378c55

File tree

155 files changed

+17443
-757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+17443
-757
lines changed

‎.github/workflows/taoskeeper-test-enterprise.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: taosKeeper Test Enterprise
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "main"
7+
- "3.0"
8+
- "3.3.6"
9+
paths:
10+
- "tools/keeper/**"
11+
- ".github/workflows/taoskeeper*.yml"
12+
push:
13+
branches:
14+
- "main"
15+
- "3.0"
16+
- "3.3.6"
17+
paths:
18+
- "tools/keeper/**"
19+
- ".github/workflows/taoskeeper*.yml"
20+
21+
jobs:
22+
build:
23+
runs-on: ubuntu-latest
24+
name: Build and test enterprise on ubuntu-latest
25+
26+
steps:
27+
- name: Checkout the repository
28+
uses: actions/checkout@v4
29+
30+
- name: Set up Go
31+
uses: actions/setup-go@v5
32+
with:
33+
go-version: 1.23
34+
35+
- name: Install system dependencies
36+
run: |
37+
sudo apt update -y
38+
sudo apt install -y build-essential cmake libgeos-dev
39+
40+
- name: Get TDengine
41+
run: wget "${{ secrets.NIGHTLY_TDENGINE_ENTERPRISE_BASE_URL }}/tsdb-nightly-3.0.tar.gz?v=$(date +%s)" -O tsdb-nightly-3.0.tar.gz
42+
43+
- name: Install TDengine
44+
run: |
45+
tar -zxf tsdb-nightly-3.0.tar.gz
46+
rm -rf tsdb-nightly-3.0.tar.gz
47+
cd tsdb-nightly-3.0
48+
sudo ./install.sh
49+
50+
- name: Create taos.cfg
51+
run: |
52+
sudo mkdir -p /etc/taos
53+
sudo tee /etc/taos/taos.cfg > /dev/null <<EOF
54+
fqdn localhost
55+
firstEp localhost:6030
56+
supportVnodes 256
57+
dataDir /tmp/taos/v3/data
58+
logDir /tmp/taos/v3/log
59+
debugFlag 135
60+
EOF
61+
62+
- name: Start TDengine
63+
run: |
64+
sudo mkdir -p /var/log/taos
65+
taosd &
66+
taosadapter &
67+
68+
- name: Run tests with coverage
69+
working-directory: tools/keeper
70+
run: |
71+
go mod tidy
72+
sudo TEST_ENTERPRISE=true go test -v -ldflags="-X 'github.com/taosdata/taoskeeper/version.IsEnterprise=true'" -coverpkg=./... -coverprofile=coverage.out ./...
73+
74+
- name: Upload coverage to Codecov
75+
uses: codecov/codecov-action@v5
76+
with:
77+
token: ${{ secrets.KEEPER_CODECOV_TOKEN }}
78+
files: coverage.out
79+
fail_ci_if_error: true
80+
verbose: true
81+
slug: taosdata/taoskeeper

.github/workflows/taoskeeper-build.yml renamed to .github/workflows/taoskeeper-test.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: taosKeeper Build
1+
name: taosKeeper Test
22

33
on:
44
pull_request:
@@ -8,12 +8,15 @@ on:
88
- "3.3.6"
99
paths:
1010
- "tools/keeper/**"
11+
- ".github/workflows/taoskeeper*.yml"
1112
push:
1213
branches:
1314
- "main"
1415
- "3.0"
16+
- "3.3.6"
1517
paths:
1618
- "tools/keeper/**"
19+
- ".github/workflows/taoskeeper*.yml"
1720

1821
jobs:
1922
build:
@@ -75,9 +78,3 @@ jobs:
7578
fail_ci_if_error: true
7679
verbose: true
7780
slug: taosdata/taoskeeper
78-
79-
- name: Clean up
80-
if: always()
81-
run: |
82-
if pgrep taosd; then sudo pkill taosd; fi
83-
if pgrep taosadapter; then sudo pkill taosadapter; fi

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v2.3.0
3+
rev: v6.0.0
44
hooks:
55
- id: check-yaml
66
- id: check-json
77
- id: end-of-file-fixer
88
- id: trailing-whitespace
99

10-
repos:
1110
- repo: https://github.com/psf/black
12-
rev: stable
11+
rev: 25.1.0
1312
hooks:
1413
- id: black
1514

16-
repos:
1715
- repo: https://github.com/pocc/pre-commit-hooks
18-
rev: master
16+
rev: v1.3.5
1917
hooks:
2018
- id: cppcheck
2119
args: ["--error-exitcode=0"]
2220

23-
repos:
2421
- repo: https://github.com/crate-ci/typos
25-
rev: v1.15.7
22+
rev: v1
2623
hooks:
2724
- id: typos
28-

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cmake_minimum_required(VERSION 3.16)
2+
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
23

34
project(
45
TDengine

‎docs/en/04-get-started/03-package.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ You can install TDengine TSDB Enterprise on Linux and Windows. To install TDengi
2222
<TabItem label="Linux" value="linux">
2323

2424
1. Download the tar.gz installation package from the list below:
25-
<PkgListV37 productName="TDengine TSDB-Enterprise" version="3.3.8.8" platform="Linux-Generic" pkgType="Server" />
25+
<PkgListV37 productName="TDengine TSDB-Enterprise" version="3.4.0.0" platform="Linux-Generic" pkgType="Server" />
2626
2. Navigate to the directory where the package is located and extract it using `tar`. For example, on an x64 architecture:
2727

2828
```bash
29-
tar -zxvf tdengine-tsdb-enterprise-3.3.8.8-linux-x64.tar.gz
29+
tar -zxvf tdengine-tsdb-enterprise-3.4.0.0-linux-x64.tar.gz
3030
```
3131

3232
3. After extracting the files, go into the subdirectory and run the `install.sh` script:
@@ -40,7 +40,7 @@ You can install TDengine TSDB Enterprise on Linux and Windows. To install TDengi
4040
<TabItem label="Windows" value="windows">
4141

4242
1. Download the Windows installation package from the list below:
43-
<PkgListV37 productName="TDengine TSDB-Enterprise" version="3.3.8.8" platform="Windows" pkgType="Server" />
43+
<PkgListV37 productName="TDengine TSDB-Enterprise" version="3.4.0.0" platform="Windows" pkgType="Server" />
4444
2. Run the installation package and follow the on-screen instructions to complete the installation of TDengine TSDB.
4545

4646
</TabItem>

‎docs/en/07-develop/01-connect.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,13 +358,16 @@ REST connection:
358358
- `token` the token used when connecting to cloud services.
359359
- `skipVerify` whether to skip certificate verification, default is false which means not skipping certificate verification, set to true if connecting to an insecure service.
360360
- `timezone` specifies the timezone used for the connection. Both SQL parsing and query results will be converted according to this timezone. Only IANA timezone formats are supported, and special characters need to be encoded. Taking the Shanghai timezone (`Asia/Shanghai`) as an example: `timezone=Asia%2FShanghai`.
361+
- `bearerToken` the token used for authentication.
361362
362363
WebSocket connection:
363364
364365
- `enableCompression` whether to send compressed data, default is false which means not sending compressed data, set to true if data transmission uses compression.
365366
- `readTimeout` the timeout for reading data, default is 5m.
366367
- `writeTimeout` the timeout for writing data, default is 10s.
367368
- `timezone` specifies the timezone used for the connection. Both SQL parsing and query results will be converted according to this timezone. Only IANA timezone formats are supported, and special characters need to be encoded. Taking the Shanghai timezone (`Asia/Shanghai`) as an example: `timezone=Asia%2FShanghai`.
369+
- `bearerToken` the token used for authentication.
370+
- `totpCode` the TOTP code used for two-factor authentication.
368371
369372
</TabItem>
370373

0 commit comments

Comments
 (0)