You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/07/29 03:23:05 UTC
[incubator-iotdb] branch rel/0.8 updated: fixed documents again
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/rel/0.8 by this push:
new c918be2 fixed documents again
new 4260092 Merge pull request #321 from Genius-pig/rel/0.8
c918be2 is described below
commit c918be236d7cc2da2b41204d70985225750d5965
Author: zhutianci <zh...@gmail.com>
AuthorDate: Sun Jul 28 10:10:55 2019 +0800
fixed documents again
fixed documents again
---
docs/Documentation-CHN/QuickStart.md | 14 +++++++-------
docs/Documentation-CHN/UserGuide/8-Tools-Cli.md | 8 ++++----
docs/Documentation/Frequently asked questions.md | 10 +++++-----
.../7-Build and use IoTDB by Dockerfile.md | 4 ++--
docs/Documentation/UserGuide/8-Tools-Cli.md | 8 ++++----
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/docs/Documentation-CHN/QuickStart.md b/docs/Documentation-CHN/QuickStart.md
index 826ba8d..9fa9a16 100755
--- a/docs/Documentation-CHN/QuickStart.md
+++ b/docs/Documentation-CHN/QuickStart.md
@@ -66,12 +66,12 @@ IoTDB支持多种安装途径。用户可以使用三种方式对IoTDB进行安
Linux系统与MacOS系统启动命令如下：
```
-> $IOTDB_HOME/bin/start-server.sh
+> $IOTDB_HOME/sbin/start-server.sh
```
Windows系统启动命令如下：
```
-> $IOTDB_HOME\bin\start-server.bat
+> $IOTDB_HOME\sbin\start-server.bat
```
当服务器输出log中包含ERROR输出时，服务器启动不成功。
@@ -88,12 +88,12 @@ IoTDB为用户提供多种与服务器交互的方式，您可以选择使用Cli
Linux系统与MacOS系统启动命令如下：
```
-> $IOTDB_HOME/bin/start-client.sh -h 127.0.0.1 -p 6667 -u root
+> $IOTDB_HOME/sbin/start-client.sh -h 127.0.0.1 -p 6667 -u root
```
Windows系统启动命令如下：
```
-> $IOTDB_HOME\bin\start-client.bat -h 127.0.0.1 -p 6667 -u root
+> $IOTDB_HOME\sbin\start-client.bat -h 127.0.0.1 -p 6667 -u root
```
回车后输入root用户的密码，即可成功启动客户端。启动后出现如图提示即为启动成功。
@@ -294,14 +294,14 @@ quit normally
### 停止IoTDB
#### 使用stop-server脚本强制停止
-用户可以使用$IOTDB_HOME/bin文件夹下的stop-server脚本停止IoTDB（注意，此停止方式为强制停止，若希望安全停止IoTDB，请使用Jconsole工具的停止方法）。
+用户可以使用$IOTDB_HOME/sbin文件夹下的stop-server脚本停止IoTDB（注意，此停止方式为强制停止，若希望安全停止IoTDB，请使用Jconsole工具的停止方法）。
Linux系统与MacOS系统停止命令如下：
```
-> $IOTDB_HOME/bin/stop-server.sh
+> $IOTDB_HOME/sbin/stop-server.sh
```
Windows系统停止命令如下：
```
-> $IOTDB_HOME\bin\stop-server.bat
+> $IOTDB_HOME\sbin\stop-server.bat
```
diff --git a/docs/Documentation-CHN/UserGuide/8-Tools-Cli.md b/docs/Documentation-CHN/UserGuide/8-Tools-Cli.md
index d6a2832..9edb47d 100644
--- a/docs/Documentation-CHN/UserGuide/8-Tools-Cli.md
+++ b/docs/Documentation-CHN/UserGuide/8-Tools-Cli.md
@@ -37,12 +37,12 @@ IOTDB为用户提供CLI/Shell工具用于启动客户端和服务端程序。下
Linux系统与MacOS系统启动命令如下：
```
- Shell > ./bin/start-client.sh -h 127.0.0.1 -p 6667 -u root -pw root
+ Shell > ./sbin/start-client.sh -h 127.0.0.1 -p 6667 -u root -pw root
```
Windows系统启动命令如下：
```
- Shell > \bin\start-client.bat -h 127.0.0.1 -p 6667 -u root -pw root
+ Shell > \sbin\start-client.bat -h 127.0.0.1 -p 6667 -u root -pw root
```
回车后即可成功启动客户端。启动后出现如图提示即为启动成功。
```
@@ -76,10 +76,10 @@ IoTDB>
Linux系统与MacOS系统启动命令如下：
```
- Shell >./bin/start-client.sh -h 10.129.187.21 -p 6667 -u root -pw root -disableIS08601 -maxPRC 10
+ Shell >./sbin/start-client.sh -h 10.129.187.21 -p 6667 -u root -pw root -disableIS08601 -maxPRC 10
```
Windows系统启动命令如下：
```
- Shell > \bin\start-client.bat -h 10.129.187.21 -p 6667 -u root -pw root -disableIS08601 -maxPRC 10
+ Shell > \sbin\start-client.bat -h 10.129.187.21 -p 6667 -u root -pw root -disableIS08601 -maxPRC 10
```
diff --git a/docs/Documentation/Frequently asked questions.md b/docs/Documentation/Frequently asked questions.md
index 069cd82..b098eec 100644
--- a/docs/Documentation/Frequently asked questions.md
+++ b/docs/Documentation/Frequently asked questions.md
@@ -73,15 +73,15 @@ $ pwd
/workspace/incubator-iotdb
$ ls -l
-iotdb/
-iotdb-cli/
+server/
+client/
pom.xml
Readme.md
...
```
-Let $IOTDB_HOME = /workspace/incubator-iotdb/iotdb/iotdb
-Let $IOTDB_CLI_HOME = /workspace/incubator-iotdb/iotdb-cli/cli/
+Let $IOTDB_HOME = /workspace/incubator-iotdb/server/iotdb
+Let $IOTDB_CLI_HOME = /workspace/incubator-iotdb/client/cli/
By default settings, the logs are stored under ```IOTDB_HOME/logs```. You can change log level and storage path by configuring ```logback.xml``` under ```IOTDB_HOME/conf```.
@@ -141,6 +141,6 @@ IoTDB> show timeseries root.fit.d1.*
The default IoTDB's CLI time display format is human readable (e.g. ```1970-01-01T08:00:00.001```), if you want to display time in timestamp type or other readable format, add parameter ```-disableIS08601``` in start command:
```
-> $IOTDB_CLI_HOME/bin/start-client.sh -h 127.0.0.1 -p 6667 -u root -pw root -disableIS08601
+> $IOTDB_CLI_HOME/sbin/start-client.sh -h 127.0.0.1 -p 6667 -u root -pw root -disableIS08601
```
diff --git a/docs/Documentation/UserGuide/4-Deployment and Management/7-Build and use IoTDB by Dockerfile.md b/docs/Documentation/UserGuide/4-Deployment and Management/7-Build and use IoTDB by Dockerfile.md
index 97bf033..227e8f1 100644
--- a/docs/Documentation/UserGuide/4-Deployment and Management/7-Build and use IoTDB by Dockerfile.md
+++ b/docs/Documentation/UserGuide/4-Deployment and Management/7-Build and use IoTDB by Dockerfile.md
@@ -66,12 +66,12 @@ suppose the IP is <C_IP>.
4. If you just want to have a try by using iotdb-cli, you can:
```
$ docker exec -it /bin/bash <C_ID>
-$ (now you have enter the container): /cli/bin/start-client.sh -h localhost -p 6667 -u root -pw root
+$ (now you have enter the container): /cli/sbin/start-client.sh -h localhost -p 6667 -u root -pw root
```
Or, run a new docker container as the client:
```
-$ docker run -it iotdb:base /cli/bin/start-client.sh -h <C_IP> -p 6667 -u root -pw root
+$ docker run -it iotdb:base /cli/sbin/start-client.sh -h <C_IP> -p 6667 -u root -pw root
```
Or, if you have a iotdb-cli locally (e.g., you have compiled the source code by `mvn package`), and suppose your work_dir is cli/bin, then you can just run:
```
diff --git a/docs/Documentation/UserGuide/8-Tools-Cli.md b/docs/Documentation/UserGuide/8-Tools-Cli.md
index 7131d50..111cb17 100644
--- a/docs/Documentation/UserGuide/8-Tools-Cli.md
+++ b/docs/Documentation/UserGuide/8-Tools-Cli.md
@@ -43,12 +43,12 @@ the port number of the server running, set the specific IP and PORT at -h and -p
The Linux and MacOS system startup commands are as follows:
```
- Shell > ./bin/start-client.sh -h 127.0.0.1 -p 6667 -u root -pw root
+ Shell > ./sbin/start-client.sh -h 127.0.0.1 -p 6667 -u root -pw root
```
The Windows system startup commands are as follows:
```
- Shell > \bin\start-client.bat -h 127.0.0.1 -p 6667 -u root -pw root
+ Shell > \sbin\start-client.bat -h 127.0.0.1 -p 6667 -u root -pw root
```
After using these commands, the client can be started successfully. The successful status will be as follows:
@@ -84,10 +84,10 @@ Following is a client command which connects the host with IP
The Linux and MacOS system startup commands are as follows:
```
- Shell >./bin/start-client.sh -h 10.129.187.21 -p 6667 -u root -pw root -disableIS08601 -maxPRC 10
+ Shell >./sbin/start-client.sh -h 10.129.187.21 -p 6667 -u root -pw root -disableIS08601 -maxPRC 10
```
The Windows system startup commands are as follows:
```
- Shell > \bin\start-client.bat -h 10.129.187.21 -p 6667 -u root -pw root -disableIS08601 -maxPRC 10
+ Shell > \sbin\start-client.bat -h 10.129.187.21 -p 6667 -u root -pw root -disableIS08601 -maxPRC 10
```