From 2e9068806e48d4b7a5b429841071951cdf31e41a Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Thu, 11 Aug 2022 16:31:26 +0800 Subject: [PATCH 1/6] doc: change readme doc --- README-CN.md | 43 ++++--------------------------------------- README.md | 38 -------------------------------------- 2 files changed, 4 insertions(+), 77 deletions(-) diff --git a/README-CN.md b/README-CN.md index d3f9b47a0f..6df6685d03 100644 --- a/README-CN.md +++ b/README-CN.md @@ -56,20 +56,6 @@ TDengine 目前 2.0 版服务器仅能在 Linux 系统上安装和运行，后 sudo apt-get install -y gcc cmake build-essential git libssl-dev ``` -编译或打包 JDBC 驱动源码，需安装 Java JDK 8 或以上版本和 Apache Maven 2.7 或以上版本。 - -安装 OpenJDK 8： - -```bash -sudo apt-get install -y openjdk-8-jdk -``` - -安装 Apache Maven： - -```bash -sudo apt-get install -y maven -``` - #### 为 taos-tools 安装编译需要的软件 taosTools 是用于 TDengine 的辅助工具软件集合。目前它包含 taosBenchmark（曾命名为 taosdemo）和 taosdump 两个软件。 @@ -85,19 +71,10 @@ sudo apt install build-essential libjansson-dev libsnappy-dev liblzma-dev libz-d ### CentOS 7.9： ```bash -sudo yum install -y gcc gcc-c++ make cmake git openssl-devel -``` - -安装 OpenJDK 8： - -```bash -sudo yum install -y java-1.8.0-openjdk -``` - -安装 Apache Maven： - -```bash -sudo yum install -y maven +sudo yum install epel-release +sudo yum update +sudo yum install -y gcc gcc-c++ make cmake3 git openssl-devel +sudo ln -sf /usr/bin/cmake3 /usr/bin/cmake ``` ### CentOS 8 & Fedora @@ -106,18 +83,6 @@ sudo yum install -y maven sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel ``` -安装 OpenJDK 8： - -```bash -sudo dnf install -y java-1.8.0-openjdk -``` - -安装 Apache Maven： - -```bash -sudo dnf install -y maven -``` - #### 在 CentOS 上构建 taosTools 安装依赖软件 为了在 CentOS 上构建 [taosTools](https://github.com/taosdata/taos-tools) 需要安装如下依赖软件 diff --git a/README.md b/README.md index 3ea8a571ef..bba0984912 100644 --- a/README.md +++ b/README.md @@ -59,20 +59,6 @@ To build TDengine, use [CMake](https://cmake.org/) 3.0.2 or higher versions in t sudo apt-get install -y gcc cmake build-essential git libssl-dev ``` -To compile and package the JDBC driver source code, you should have a Java jdk-8 or higher and Apache Maven 2.7 or higher installed. - -To install openjdk-8: - -```bash -sudo apt-get install -y openjdk-8-jdk -``` - -To install Apache Maven: - -```bash -sudo apt-get install -y maven -``` - #### Install build dependencies for taosTools We provide a few useful tools such as taosBenchmark (was named taosdemo) and taosdump. They were part of TDengine. From TDengine 2.4.0.0, taosBenchmark and taosdump were not released together with TDengine. @@ -93,36 +79,12 @@ sudo yum install -y gcc gcc-c++ make cmake3 git openssl-devel sudo ln -sf /usr/bin/cmake3 /usr/bin/cmake ``` -To install openjdk-8: - -```bash -sudo yum install -y java-1.8.0-openjdk -``` - -To install Apache Maven: - -```bash -sudo yum install -y maven -``` - ### CentOS 8 & Fedora ```bash sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel ``` -To install openjdk-8: - -```bash -sudo dnf install -y java-1.8.0-openjdk -``` - -To install Apache Maven: - -```bash -sudo dnf install -y maven -``` - #### Install build dependencies for taosTools on CentOS To build the [taosTools](https://github.com/taosdata/taos-tools) on CentOS, the following packages need to be installed. From e8d63b170c574f7c6ead366cf214215e6b09f283 Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Thu, 11 Aug 2022 20:03:46 +0800 Subject: [PATCH 2/6] doc: change readme doc --- README-CN.md | 18 ------------------ README.md | 18 ------------------ 2 files changed, 36 deletions(-) diff --git a/README-CN.md b/README-CN.md index 6df6685d03..95387433da 100644 --- a/README-CN.md +++ b/README-CN.md @@ -246,24 +246,6 @@ nmake install sudo make install ``` -安装成功后，如果想以服务形式启动，先配置 `.plist` 文件，在终端中执行： - -```bash -sudo cp ../packaging/macOS/com.taosdata.tdengine.plist /Library/LaunchDaemons -``` - -在终端中启动 TDengine 服务： - -```bash -sudo launchctl load /Library/LaunchDaemons/com.taosdata.tdengine.plist -``` - -在终端中停止 TDengine 服务： - -```bash -sudo launchctl unload /Library/LaunchDaemons/com.taosdata.tdengine.plist -``` - ## 快速运行 如果不希望以服务方式运行 TDengine，也可以在终端中直接运行它。也即在生成完成后，执行以下命令（在 Windows 下，生成的可执行文件会带有 .exe 后缀，例如会名为 taosd.exe ）： diff --git a/README.md b/README.md index bba0984912..72e441f92a 100644 --- a/README.md +++ b/README.md @@ -273,24 +273,6 @@ After building successfully, TDengine can be installed by: sudo make install ``` -To start the service after installation, config `.plist` file first, in a terminal, use: - -```bash -sudo cp ../packaging/macOS/com.taosdata.tdengine.plist /Library/LaunchDaemons -``` - -To start the service, in a terminal, use: - -```bash -sudo launchctl load /Library/LaunchDaemons/com.taosdata.tdengine.plist -``` - -To stop the service, in a terminal, use: - -```bash -sudo launchctl unload /Library/LaunchDaemons/com.taosdata.tdengine.plist -``` - ## Quick Run If you don't want to run TDengine as a service, you can run it in current shell. For example, to quickly start a TDengine server after building, run the command below in terminal: (We take Linux as an example, command on Windows will be `taosd.exe`) From 103776b4d0f7bf486840be0f1657ad60cf423bac Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Thu, 11 Aug 2022 20:40:43 +0800 Subject: [PATCH 3/6] doc: change readme doc --- README-CN.md | 8 -------- README.md | 8 -------- 2 files changed, 16 deletions(-) diff --git a/README-CN.md b/README-CN.md index 95387433da..8ad0173b05 100644 --- a/README-CN.md +++ b/README-CN.md @@ -300,14 +300,6 @@ TDengine 提供了丰富的应用程序开发接口，其中包括 C/C++、Java - [Rust](https://www.taosdata.com/cn/documentation/connector/rust) -## 第三方连接器 - -TDengine 社区生态中也有一些非常友好的第三方连接器，可以通过以下链接访问它们的源码。 - -- [Rust Bindings](https://github.com/songtianyi/tdengine-rust-bindings/tree/master/examples) -- [.Net Core Connector](https://github.com/maikebing/Maikebing.EntityFrameworkCore.Taos) -- [Lua Connector](https://github.com/taosdata/TDengine/tree/develop/examples/lua) - # 运行和添加测试例 TDengine 的测试框架和所有测试例全部开源。 diff --git a/README.md b/README.md index 72e441f92a..5e306fc07e 100644 --- a/README.md +++ b/README.md @@ -321,14 +321,6 @@ TDengine provides abundant developing tools for users to develop on TDengine. Fo - [Node.js](https://www.taosdata.com/en/documentation/connector#nodejs) - [Rust](https://www.taosdata.com/en/documentation/connector/rust) -## Third Party Connectors - -The TDengine community has also kindly built some of their own connectors! Follow the links below to find the source code for them. - -- [Rust Bindings](https://github.com/songtianyi/tdengine-rust-bindings/tree/master/examples) -- [.Net Core Connector](https://github.com/maikebing/Maikebing.EntityFrameworkCore.Taos) -- [Lua Connector](https://github.com/taosdata/TDengine/tree/develop/tests/examples/lua) - # How to run the test cases and how to add a new test case TDengine's test framework and all test cases are fully open source. From 76e4b18c3d0130f7c6a650a89608de86b9820d65 Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Thu, 11 Aug 2022 21:05:42 +0800 Subject: [PATCH 4/6] doc: change readme doc --- README-CN.md | 23 ++++++++++------------- examples/rust | 1 + tools/taos-tools | 1 + 3 files changed, 12 insertions(+), 13 deletions(-) create mode 160000 examples/rust create mode 160000 tools/taos-tools diff --git a/README-CN.md b/README-CN.md index 8ad0173b05..21c337793c 100644 --- a/README-CN.md +++ b/README-CN.md @@ -14,7 +14,6 @@ [![Build status](https://ci.appveyor.com/api/projects/status/kf3pwh2or5afsgl9/branch/master?svg=true)](https://ci.appveyor.com/project/sangshuduo/tdengine-2n8ge/branch/master) [![Coverage Status](https://coveralls.io/repos/github/taosdata/TDengine/badge.svg?branch=develop)](https://coveralls.io/github/taosdata/TDengine?branch=develop) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4201/badge)](https://bestpractices.coreinfrastructure.org/projects/4201) -[![tdengine](https://snapcraft.io//tdengine/badge.svg)](https://snapcraft.io/tdengine) 简体中文 | [English](README.md) | 很多职位正在热招中，请看[这里](https://www.taosdata.com/cn/careers/) @@ -42,11 +41,13 @@ TDengine 可以广泛应用于物联网、工业互联网、车联网、IT 运 # 文档 -TDengine 采用传统的关系数据库模型，您可以像使用关系型数据库 MySQL 一样来使用它。但由于引入了超级表，一个采集点一张表的概念，建议您在使用前仔细阅读一遍下面的文档，特别是 [数据模型](https://www.taosdata.com/cn/documentation/architecture) 与 [数据建模](https://www.taosdata.com/cn/documentation/model)。除本文档之外，欢迎 [下载产品白皮书](https://www.taosdata.com/downloads/TDengine%20White%20Paper.pdf)。 +TDengine 采用传统的关系数据库模型，您可以像使用关系型数据库 MySQL 一样来使用它。但由于引入了超级表，一个采集点一张表的概念，建议您在使用前仔细阅读一遍下面的文档，特别是 [数据模型](https://www.taosdata.com/cn/documentation/architecture) 与 [数据建模](https://www.taosdata.com/cn/documentation/model)。 # 构建 -TDengine 目前 2.0 版服务器仅能在 Linux 系统上安装和运行，后续会支持 Windows、macOS 等系统。客户端可以在 Windows 或 Linux 上安装和运行。任何 OS 的应用也可以选择 RESTful 接口连接服务器 taosd。CPU 支持 X64/ARM64/MIPS64/Alpha64，后续会支持 ARM32、RISC-V 等 CPU 架构。用户可根据需求选择通过[源码](https://www.taosdata.com/cn/getting-started/#通过源码安装)或者[安装包](https://www.taosdata.com/cn/getting-started/#通过安装包安装)来安装。本快速指南仅适用于通过源码安装。 +TDengine 目前 3.0 版可以在 Linux、 Windows 等平台上安装和运行。任何 OS 的应用也可以选择 taosAdapter 的 RESTful 接口连接服务端 taosd。CPU 支持 X64/ARM64，后续会支持 MIPS64、Alpha64、ARM32、RISC-V 等 CPU 架构。 + +用户可根据需求选择通过[源码](https://www.taosdata.com/cn/getting-started/#通过源码安装)或者[安装包](https://www.taosdata.com/cn/getting-started/#通过安装包安装)来安装。本快速指南仅适用于通过源码安装。 ## 安装工具 @@ -106,6 +107,12 @@ go env -w GO111MODULE=on go env -w GOPROXY=https://goproxy.cn,direct ``` +默认情况下，内嵌的 http 服务仍然可以从 TDengine 源码构建。当然您也可以使用以下命令选择构建 taosAdapter 作为 RESTful 接口的服务。 + +``` +cmake .. -DBUILD_HTTP=false +``` + ### 设置 rust 开发环境 TDengine 包含数个使用 Rust 语言开发的组件. 请参考 rust-lang.org 官方文档设置 rust 开发环境。 @@ -300,12 +307,6 @@ TDengine 提供了丰富的应用程序开发接口，其中包括 C/C++、Java - [Rust](https://www.taosdata.com/cn/documentation/connector/rust) -# 运行和添加测试例 - -TDengine 的测试框架和所有测试例全部开源。 - -点击 [这里](https://github.com/taosdata/TDengine/blob/develop/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md)，了解如何运行测试例和添加新的测试例。 - # 成为社区贡献者 点击 [这里](https://www.taosdata.com/cn/contributor/)，了解如何成为 TDengine 的贡献者。 @@ -313,7 +314,3 @@ TDengine 的测试框架和所有测试例全部开源。 # 加入技术交流群 TDengine 官方社群「物联网大数据群」对外开放，欢迎您加入讨论。搜索微信号 "tdengine"，加小 T 为好友，即可入群。 - -# [谁在使用 TDengine](https://github.com/taosdata/TDengine/issues/2432) - -欢迎所有 TDengine 用户及贡献者在 [这里](https://github.com/taosdata/TDengine/issues/2432) 分享您在当前工作中开发/使用 TDengine 的故事。 diff --git a/examples/rust b/examples/rust new file mode 160000 index 0000000000..7ed7a97715 --- /dev/null +++ b/examples/rust @@ -0,0 +1 @@ +Subproject commit 7ed7a97715388fa144718764d6bf20f9bfc29a12 diff --git a/tools/taos-tools b/tools/taos-tools new file mode 160000 index 0000000000..57bdfbfbcd --- /dev/null +++ b/tools/taos-tools @@ -0,0 +1 @@ +Subproject commit 57bdfbfbcd8b4f8a3d38ab8eb9fd44d372a65911 From d48205bc82697cf0952baa6b0196ddf2e96e57ec Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Thu, 11 Aug 2022 21:20:43 +0800 Subject: [PATCH 5/6] doc: change readme doc --- README-CN.md | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/README-CN.md b/README-CN.md index 21c337793c..35ba07d6c2 100644 --- a/README-CN.md +++ b/README-CN.md @@ -86,15 +86,27 @@ sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel #### 在 CentOS 上构建 taosTools 安装依赖软件 -为了在 CentOS 上构建 [taosTools](https://github.com/taosdata/taos-tools) 需要安装如下依赖软件 +#### For CentOS 7/RHEL -```bash -sudo yum install zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static openssl-devel +``` +sudo yum install -y zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static openssl-devel ``` -注意：由于 snappy 缺乏 pkg-config 支持 -（参考 [链接](https://github.com/google/snappy/pull/86)），会导致 -cmake 提示无法发现 libsnappy，实际上工作正常。 +#### For CentOS 8/Rocky Linux + +``` +sudo yum install -y epel-release +sudo yum install -y dnf-plugins-core +sudo yum config-manager --set-enabled powertools +sudo yum install -y zlib-devel xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libstdc++-static openssl-devel +``` + +注意：由于 snappy 缺乏 pkg-config 支持（参考 [链接](https://github.com/google/snappy/pull/86)），会导致 cmake 提示无法发现 libsnappy，实际上工作正常。 + +若 powertools 安装失败，可以尝试改用： +``` +sudo yum config-manager --set-enabled Powertools +``` ### 设置 golang 开发环境 From 421353c1f5c91fe0dc80f28da90218aa97fba3f4 Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Thu, 11 Aug 2022 21:23:20 +0800 Subject: [PATCH 6/6] doc: change readme doc --- examples/rust | 1 - tools/taos-tools | 1 - 2 files changed, 2 deletions(-) delete mode 160000 examples/rust delete mode 160000 tools/taos-tools diff --git a/examples/rust b/examples/rust deleted file mode 160000 index 7ed7a97715..0000000000 --- a/examples/rust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ed7a97715388fa144718764d6bf20f9bfc29a12 diff --git a/tools/taos-tools b/tools/taos-tools deleted file mode 160000 index 57bdfbfbcd..0000000000 --- a/tools/taos-tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 57bdfbfbcd8b4f8a3d38ab8eb9fd44d372a65911