diff --git a/README.md b/README.md index e30f4d9869..3821d9065c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@

-[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/taosdata/tdengine/tdengine-test.yml)](https://github.com/taosdata/TDengine/actions/workflows/tdengine-test.yml) +[![TDengine Release Build](https://github.com/taosdata/TDengine/actions/workflows/tdengine-release-build.yml/badge.svg)](https://github.com/taosdata/TDengine/actions/workflows/tdengine-release-build.yml) [![Coverage Status](https://coveralls.io/repos/github/taosdata/TDengine/badge.svg?branch=3.0)](https://coveralls.io/github/taosdata/TDengine?branch=3.0) [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/taosdata/tdengine)](https://github.com/feici02/TDengine/commits/main/)
@@ -82,7 +82,9 @@ For contributing/building/testing TDengine Connectors, please check the followin # 3. Prerequisites -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. +At the moment, TDengine server supports running on Linux/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. + +Starting from version 3.1.0.0, TDengine supports the Windows system exclusively in its Enterprise edition. If you want to compile taosAdapter or taosKeeper, you need to install Go 1.18 or above. @@ -127,13 +129,7 @@ brew install argp-standalone gflags pkgconfig ## 3.3 Prerequisites on Windows -
- -Install required tools on Windows - -Work in Progress. - -
+Not available for community edition. ## 3.4 Clone the repo @@ -212,40 +208,7 @@ If you want to compile taosKeeper, you need to add the `-DBUILD_KEEPER=true` opt ## 4.3 Build on Windows -
- -Detailed steps to build on Windows - -If you use the Visual Studio 2013, please open a command window by executing "cmd.exe". -Please specify "amd64" for 64 bits Windows or specify "x86" for 32 bits Windows when you execute vcvarsall.bat. - -```cmd -mkdir debug && cd debug -"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" < amd64 | x86 > -cmake .. -G "NMake Makefiles" -nmake -``` - -If you use the Visual Studio 2019 or 2017: - -please open a command window by executing "cmd.exe". -Please specify "x64" for 64 bits Windows or specify "x86" for 32 bits Windows when you execute vcvarsall.bat. - -```cmd -mkdir debug && cd debug -"c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" < x64 | x86 > -cmake .. -G "NMake Makefiles" -nmake -``` - -Or, you can simply open a command window by clicking Windows Start -> "Visual Studio < 2019 | 2017 >" folder -> "x64 Native Tools Command Prompt for VS < 2019 | 2017 >" or "x86 Native Tools Command Prompt for VS < 2019 | 2017 >" depends what architecture your Windows is, then execute commands as follows: - -```cmd -mkdir debug && cd debug -cmake .. -G "NMake Makefiles" -nmake -``` -
+Not available for community edition. # 5. Packaging @@ -285,17 +248,7 @@ sudo make install ## 6.3 Install on Windows -
- -Detailed steps to install on windows - -After building successfully, TDengine can be installed by: - -```cmd -nmake install -``` - -
+Not available for community edition. # 7. Running @@ -360,25 +313,7 @@ If TDengine CLI connects the server successfully, welcome messages and version i ## 7.3 Run TDengine on Windows -
- -Detailed steps to run on windows - -You can start TDengine server on Windows platform with below commands: - -```cmd -.\build\bin\taosd.exe -c test\cfg -``` - -In another terminal, use the TDengine CLI to connect the server: - -```cmd -.\build\bin\taos.exe -c test\cfg -``` - -option "-c test/cfg" specifies the system configuration file directory. - -
+Not available for community edition. # 8. Testing diff --git a/docs/en/10-third-party/03-visual/01-grafana.md b/docs/en/10-third-party/03-visual/01-grafana.md index 8a503b4195..1c4d0e36d0 100644 --- a/docs/en/10-third-party/03-visual/01-grafana.md +++ b/docs/en/10-third-party/03-visual/01-grafana.md @@ -151,15 +151,22 @@ Using docker-compose, configure Grafana Provisioning for automated setup, and ex services: tdengine: - image: tdengine/tdengine:3.3.0.0 + image: tdengine/tdengine:latest + container_name: tdengine + hostname: tdengine environment: TAOS_FQDN: tdengine + MONITOR_FQDN: tdengine + EXPLORER_CLUSTER: http://tdengine:6041 + TAOS_KEEPER_TDENGINE_HOST: tdengine volumes: - tdengine-data:/var/lib/taos/ + ports: + - 6060:6060 grafana: - image: grafana/grafana:9.3.6 + image: grafana/grafana:latest volumes: - - ./tdengine.yml/:/etc/grafana/provisioning/tdengine.yml + - ./tdengine.yml:/etc/grafana/provisioning/tdengine.yml - grafana-data:/var/lib/grafana environment: # install tdengine plugin at start @@ -169,6 +176,7 @@ Using docker-compose, configure Grafana Provisioning for automated setup, and ex TDENGINE_BASIC_AUTH: "cm9vdDp0YmFzZTEyNQ==" ports: - 3000:3000 + volumes: grafana-data: tdengine-data: diff --git a/docs/zh/10-third-party/03-visual/01-grafana.mdx b/docs/zh/10-third-party/03-visual/01-grafana.mdx index 38c47672b8..ac80103abe 100644 --- a/docs/zh/10-third-party/03-visual/01-grafana.mdx +++ b/docs/zh/10-third-party/03-visual/01-grafana.mdx @@ -138,15 +138,22 @@ docker run -d \ services: tdengine: - image: tdengine/tdengine:3.3.0.0 + image: tdengine/tdengine:latest + container_name: tdengine + hostname: tdengine environment: TAOS_FQDN: tdengine + MONITOR_FQDN: tdengine + EXPLORER_CLUSTER: http://tdengine:6041 + TAOS_KEEPER_TDENGINE_HOST: tdengine volumes: - tdengine-data:/var/lib/taos/ + ports: + - 6060:6060 grafana: - image: grafana/grafana:9.3.6 + image: grafana/grafana:latest volumes: - - ./tdengine.yml/:/etc/grafana/provisioning/tdengine.yml + - ./tdengine.yml:/etc/grafana/provisioning/tdengine.yml - grafana-data:/var/lib/grafana environment: # install tdengine plugin at start @@ -156,6 +163,7 @@ docker run -d \ TDENGINE_BASIC_AUTH: "cm9vdDp0YmFzZTEyNQ==" ports: - 3000:3000 + volumes: grafana-data: tdengine-data: diff --git a/source/dnode/vnode/src/tsdb/tsdbRetention.c b/source/dnode/vnode/src/tsdb/tsdbRetention.c index ccd3e55899..8cff4242b7 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRetention.c +++ b/source/dnode/vnode/src/tsdb/tsdbRetention.c @@ -692,13 +692,13 @@ static int32_t tsdbDoS3Migrate(SRTNer *rtner) { int32_t r = taosStatFile(fobj->fname, &size, &mtime, NULL); if (size > chunksize && mtime < rtner->now - tsS3UploadDelaySec) { if (pCfg->s3Compact && lcn < 0) { - extern int32_t tsdbAsyncCompact(STsdb * tsdb, const STimeWindow *tw, bool sync); + extern int32_t tsdbAsyncCompact(STsdb * tsdb, const STimeWindow *tw, bool sync,bool s3Migrate); STimeWindow win = {0}; tsdbFidKeyRange(fset->fid, rtner->tsdb->keepCfg.days, rtner->tsdb->keepCfg.precision, &win.skey, &win.ekey); tsdbInfo("vgId:%d, async compact begin lcn: %d.", TD_VID(rtner->tsdb->pVnode), lcn); - code = tsdbAsyncCompact(rtner->tsdb, &win, pCfg->sttTrigger == 1); + code = tsdbAsyncCompact(rtner->tsdb, &win, pCfg->sttTrigger == 1, true); tsdbInfo("vgId:%d, async compact end lcn: %d.", TD_VID(rtner->tsdb->pVnode), lcn); goto _exit; return code; diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c index aaa38efe31..de66144737 100644 --- a/source/libs/stream/src/streamBackendRocksdb.c +++ b/source/libs/stream/src/streamBackendRocksdb.c @@ -3134,7 +3134,7 @@ rocksdb_iterator_t* streamStateIterCreate(SStreamState* pState, const char* cfKe taosMemoryFree(err); \ code = TSDB_CODE_THIRDPARTY_ERROR; \ } else { \ - stInfo("[InternalERR] write streamState str:%s succ to write to %s, rowValLen:%d, ttlValLen:%d, %p", toString, \ + stDebug("[InternalERR] write streamState str:%s succ to write to %s, rowValLen:%d, ttlValLen:%d, %p", toString, \ funcname, vLen, ttlVLen, wrapper); \ } \ taosMemoryFree(ttlV); \ @@ -4593,7 +4593,7 @@ int32_t streamStatePutBatchOptimize(SStreamState* pState, int32_t cfIdx, rocksdb int32_t klen = ginitDict[cfIdx].enFunc((void*)key, buf); ginitDict[cfIdx].toStrFunc((void*)key, toString); - qInfo("[InternalERR] write cfIdx:%d key:%s vlen:%d", cfIdx, toString, vlen); + stDebug("[InternalERR] write cfIdx:%d key:%s vlen:%d", cfIdx, toString, vlen); char* ttlV = tmpBuf; int32_t ttlVLen = ginitDict[cfIdx].enValueFunc(dst, size, ttl, &ttlV); diff --git a/tests/README.md b/tests/README.md index df8fbfc655..7c5e37e796 100644 --- a/tests/README.md +++ b/tests/README.md @@ -19,6 +19,9 @@ This manual is intended to give developers a comprehensive guidance to test TDen > - The commands and scripts below are verified on Linux (Ubuntu 18.04/20.04/22.04). > - [taos-connector-python](https://github.com/taosdata/taos-connector-python) is used by tests written in Python, which requires Python 3.7+. > - The commands and steps described below are to run the tests on a single host. +> - The testing framework is currently compatible with Python versions 3.8 through 3.10. +> - Vitural Environment is advised when setting up the environment, pease refer to [venv](https://docs.python.org/3/library/venv.html) for details. + # 2. Prerequisites