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/23 09:02:38 UTC
[incubator-iotdb] branch master updated (fcff4ee -> 5f086ed)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from fcff4ee Fix latest url (#292)
add 4a41d5f Fix 'latest' in documents link url to '0.8.0'
add b2267c0 change latest to version in documents url
new 3ece144 Merge branch 'master' of github.com:apache/incubator-iotdb
new 222467a move artifacts to target folder
new 29506e7 Fix wrong Windows path and a small Chinese grammar mistake.
new 5f086ed Fix wrong Windows path.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
client/pom.xml | 6 +++---
docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md | 9 +++++----
.../UserGuide/8-System Tools/2-Memory Estimation Tool.md | 4 ++--
docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md | 5 +++--
docs/Documentation/UserGuide/8-System Tools/1-Sync.md | 7 ++++---
.../UserGuide/8-System Tools/2-Memory Estimation Tool.md | 4 ++--
docs/Documentation/UserGuide/8-Tools-Grafana.md | 2 +-
grafana/readme.md | 2 +-
grafana/readme_zh.md | 2 +-
server/pom.xml | 8 ++++----
10 files changed, 26 insertions(+), 23 deletions(-)
[incubator-iotdb] 02/04: move artifacts to target folder
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 222467aae9a962ece331e3b46605eb3ff09e36b3
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Jul 23 16:04:33 2019 +0800
move artifacts to target folder
---
client/pom.xml | 6 +++---
server/pom.xml | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index e4e16ab..279daaa 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -113,17 +113,17 @@
<configuration>
<target>
<echo>ANT TASK - copying client files....</echo>
- <copy todir="${maven.multiModuleProjectDirectory}/lib/" overwrite="true" flatten="true">
+ <copy todir="${maven.multiModuleProjectDirectory}/target/lib/" overwrite="true" flatten="true">
<fileset dir="${project.basedir}/cli/lib" includes="*.jar">
<include name="*.jar"/>
</fileset>
</copy>
- <copy todir="${maven.multiModuleProjectDirectory}/sbin/" overwrite="true" flatten="true">
+ <copy todir="${maven.multiModuleProjectDirectory}/target/sbin/" overwrite="true" flatten="true">
<fileset dir="${project.basedir}/cli/sbin" includes="*">
<include name="*"/>
</fileset>
</copy>
- <copy todir="${maven.multiModuleProjectDirectory}/tools/" overwrite="true" flatten="true">
+ <copy todir="${maven.multiModuleProjectDirectory}/target/tools/" overwrite="true" flatten="true">
<fileset dir="${project.basedir}/cli/tools" includes="*">
<include name="*"/>
</fileset>
diff --git a/server/pom.xml b/server/pom.xml
index e1f3184..a19d28c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -169,22 +169,22 @@
<configuration>
<target>
<echo>ANT TASK - copying server files....</echo>
- <copy todir="${maven.multiModuleProjectDirectory}/conf/" overwrite="true" flatten="true">
+ <copy todir="${maven.multiModuleProjectDirectory}/target/conf/" overwrite="true" flatten="true">
<fileset dir="${project.basedir}/iotdb/conf" includes="*">
<include name="*"/>
</fileset>
</copy>
- <copy todir="${maven.multiModuleProjectDirectory}/lib/" overwrite="true" flatten="true">
+ <copy todir="${maven.multiModuleProjectDirectory}/target/lib/" overwrite="true" flatten="true">
<fileset dir="${project.basedir}/iotdb/lib" includes="*.jar">
<include name="*.jar"/>
</fileset>
</copy>
- <copy todir="${maven.multiModuleProjectDirectory}/sbin/" overwrite="true" flatten="true">
+ <copy todir="${maven.multiModuleProjectDirectory}/target/sbin/" overwrite="true" flatten="true">
<fileset dir="${project.basedir}/iotdb/sbin" includes="*">
<include name="*"/>
</fileset>
</copy>
- <copy todir="${maven.multiModuleProjectDirectory}/tools/" overwrite="true" flatten="true">
+ <copy todir="${maven.multiModuleProjectDirectory}/target/tools/" overwrite="true" flatten="true">
<fileset dir="${project.basedir}/iotdb/tools" includes="*">
<include name="*"/>
</fileset>
[incubator-iotdb] 04/04: Fix wrong Windows path.
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 5f086ed2de805d55b444c4b2fdb0272f582d69ca
Author: zhutianci <zh...@gmail.com>
AuthorDate: Sun Jul 21 10:35:29 2019 +0800
Fix wrong Windows path.
---
docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md | 4 ++--
.../UserGuide/8-System Tools/2-Memory Estimation Tool.md | 4 ++--
docs/Documentation/UserGuide/8-System Tools/1-Sync.md | 7 ++++---
.../UserGuide/8-System Tools/2-Memory Estimation Tool.md | 4 ++--
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md b/docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md
index a619b2b..dbe5eb9 100644
--- a/docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md
+++ b/docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md
@@ -263,7 +263,7 @@ Linux系统与MacOS系统启动命令如下:
```
Windows系统启动命令如下:
```
- Shell >$IOTDB_HOME/bin/start-sync-client.bat
+ Shell >$IOTDB_HOME\bin\start-sync-client.bat
```
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto; margin-right:auto; display:block;" src="https://user-images.githubusercontent.com/26211279/59494951-dc283b80-8ec0-11e9-9575-5d8578c08ceb.png">
@@ -276,6 +276,6 @@ Linux系统与MacOS系统停止命令如下:
```
Windows系统停止命令如下:
```
- Shell >$IOTDB_HOME/bin/stop-sync-client.bat
+ Shell >$IOTDB_HOME\bin\stop-sync-client.bat
```
diff --git a/docs/Documentation-CHN/UserGuide/8-System Tools/2-Memory Estimation Tool.md b/docs/Documentation-CHN/UserGuide/8-System Tools/2-Memory Estimation Tool.md
index b8b2464..6052670 100644
--- a/docs/Documentation-CHN/UserGuide/8-System Tools/2-Memory Estimation Tool.md
+++ b/docs/Documentation-CHN/UserGuide/8-System Tools/2-Memory Estimation Tool.md
@@ -81,10 +81,10 @@ Linux系统与MacOS系统启动命令如下:
Windows系统启动命令如下:
* 以20个存储组,共10w条时间序列,时间序列在存储组中均分为例:
```
- Shell >$IOTDB_HOME/bin/memory-tool.bat calmem -sg 20 -ts 100000
+ Shell >$IOTDB_HOME\bin\memory-tool.bat calmem -sg 20 -ts 100000
```
* 以20个存储组,共10w条时间序列,存储组中最大时间序列数为50000为例:
```
- Shell >$IOTDB_HOME/bin/memory-tool.bat calmem -sg 20 -ts 100000 -tsm -50000
+ Shell >$IOTDB_HOME\bin\memory-tool.bat calmem -sg 20 -ts 100000 -tsm -50000
```
diff --git a/docs/Documentation/UserGuide/8-System Tools/1-Sync.md b/docs/Documentation/UserGuide/8-System Tools/1-Sync.md
index 8cfa849..741b365 100644
--- a/docs/Documentation/UserGuide/8-System Tools/1-Sync.md
+++ b/docs/Documentation/UserGuide/8-System Tools/1-Sync.md
@@ -268,7 +268,7 @@ For Linux and Mac OS X users:
```
For Windows users:
```
- Shell >$IOTDB_HOME/bin/start-sync-client.bat
+ Shell >$IOTDB_HOME\bin\start-sync-client.bat
```
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto; margin-right:auto; display:block;" src="https://user-images.githubusercontent.com/26211279/59494951-dc283b80-8ec0-11e9-9575-5d8578c08ceb.png">
@@ -280,5 +280,6 @@ For Linux and Mac OS X users:
```
For Windows users:
```
- Shell >$IOTDB_HOME/bin/stop-sync-client.bat
-```
\ No newline at end of file
+ Shell >$IOTDB_HOME\bin\stop-sync-client.bat
+```
+
diff --git a/docs/Documentation/UserGuide/8-System Tools/2-Memory Estimation Tool.md b/docs/Documentation/UserGuide/8-System Tools/2-Memory Estimation Tool.md
index 3c40ef2..e11aedb 100644
--- a/docs/Documentation/UserGuide/8-System Tools/2-Memory Estimation Tool.md
+++ b/docs/Documentation/UserGuide/8-System Tools/2-Memory Estimation Tool.md
@@ -74,10 +74,10 @@ For Linux and Mac OS X users:
For Windows users:
* Assume that there are 20 storage groups, 10w timeseries and timeseries are evenly distributed in the storage groups:
```
- Shell >$IOTDB_HOME/bin/memory-tool.bat calmem -sg 20 -ts 100000
+ Shell >$IOTDB_HOME\bin\memory-tool.bat calmem -sg 20 -ts 100000
```
* Assume that there are 20 storage groups, 10w timeseries and maximum timeseries number among storage groups is 50000:
```
- Shell >$IOTDB_HOME/bin/memory-tool.bat calmem -sg 20 -ts 100000 -tsm -50000
+ Shell >$IOTDB_HOME\bin\memory-tool.bat calmem -sg 20 -ts 100000 -tsm -50000
```
[incubator-iotdb] 01/04: Merge branch 'master' of
github.com:apache/incubator-iotdb
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 3ece1445096e1dc36e5e8b254e8419c3fd612b20
Merge: b2267c0 fcff4ee
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Jul 23 16:57:34 2019 +0800
Merge branch 'master' of github.com:apache/incubator-iotdb
[incubator-iotdb] 03/04: Fix wrong Windows path and a small Chinese
grammar mistake.
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 29506e71b0e0a88fcf00a4a38d63867f6a9193b3
Author: zhutianci <zh...@gmail.com>
AuthorDate: Sun Jul 21 10:21:44 2019 +0800
Fix wrong Windows path and a small Chinese grammar mistake.
---
docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md | 5 +++--
docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md | 5 +++--
docs/Documentation/UserGuide/8-Tools-Grafana.md | 2 +-
grafana/readme.md | 2 +-
grafana/readme_zh.md | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md b/docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md
index d9315f5..a619b2b 100644
--- a/docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md
+++ b/docs/Documentation-CHN/UserGuide/8-System Tools/1-Sync.md
@@ -35,7 +35,7 @@
<!-- /TOC -->
# 介绍
-同步工具是定期将本地磁盘中和新增的已持久化的tsfile文件上传至云端并加载的IoTDB套件工具。
+同步工具是定期将本地磁盘中和新增的已持久化的tsfile文件上传至云端并加载到IoTDB套件工具。
在同步工具的发送端,同步模块是一个独立的进程,独立于本地的IoTDB。通过独立的脚本进行启动和关闭(详见章节`使用方式`),同步的频率周期可由用户设置。
@@ -277,4 +277,5 @@ Linux系统与MacOS系统停止命令如下:
Windows系统停止命令如下:
```
Shell >$IOTDB_HOME/bin/stop-sync-client.bat
-```
\ No newline at end of file
+```
+
diff --git a/docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md b/docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md
index 479928e..ace7603 100644
--- a/docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md
+++ b/docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md
@@ -52,7 +52,7 @@ Grafana是开源的指标量监测和可视化工具,可用于展示时序数
* 插件名称: simple-json-datasource
* 下载地址: https://github.com/grafana/simple-json-datasource
-具体下载方法是:到Grafana的插件目录中:`{Grafana文件目录}/data/plugin/`(Windows系统,启动Grafana后会自动创建`data/plugin`目录)或`/var/lib/grafana/plugins` (Linux系统,plugins目录需要手动创建)或`/usr/local/var/lib/grafana/plugins`(MacOS系统,具体位置参看使用`brew install`安装Grafana后命令行给出的位置提示。
+具体下载方法是:到Grafana的插件目录中:`{Grafana文件目录}\data\plugin\`(Windows系统,启动Grafana后会自动创建`data\plugin`目录)或`/var/lib/grafana/plugins` (Linux系统,plugins目录需要手动创建)或`/usr/local/var/lib/grafana/plugins`(MacOS系统,具体位置参看使用`brew install`安装Grafana后命令行给出的位置提示。
执行下面的命令:
@@ -132,4 +132,5 @@ Grafana以网页的dashboard形式为您展示数据,在使用时请您打开
进入Grafana可视化页面后,可以选择添加时间序列,如图 6.9。您也可以按照Grafana官方文档进行相应的操作,详情可参看Grafana官方文档:http://docs.grafana.org/guides/getting_started/。
-<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto; margin-right:auto; display:block;" src="https://user-images.githubusercontent.com/13203019/51664878-6e54a380-1ff5-11e9-9718-4d0e24627fa8.png">
\ No newline at end of file
+<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto; margin-right:auto; display:block;" src="https://user-images.githubusercontent.com/13203019/51664878-6e54a380-1ff5-11e9-9718-4d0e24627fa8.png">
+
diff --git a/docs/Documentation/UserGuide/8-Tools-Grafana.md b/docs/Documentation/UserGuide/8-Tools-Grafana.md
index 25b90d5..e670d52 100644
--- a/docs/Documentation/UserGuide/8-Tools-Grafana.md
+++ b/docs/Documentation/UserGuide/8-Tools-Grafana.md
@@ -59,7 +59,7 @@ grafana-cli plugins install grafana-simple-json-datasource
Alternatively, you can manually download the .zip file and unpack it into your grafana plugins directory.
-* `{grafana-install-directory}/data/plugin/` (Windows)
+* `{grafana-install-directory}\data\plugin\` (Windows)
* `/var/lib/grafana/plugins` (Linux)
* `/usr/local/var/lib/grafana/plugins`(Mac)
diff --git a/grafana/readme.md b/grafana/readme.md
index f1e8362..df3ea75 100644
--- a/grafana/readme.md
+++ b/grafana/readme.md
@@ -39,7 +39,7 @@ After downloading this plugin, you can use the grafana-cli tool to install Simpl
Alternatively, you can manually download the .zip file and unpack it into your grafana plugins directory.
-* `{grafana-install-directory}/data/plugin/` (Windows)
+* `{grafana-install-directory}\data\plugin\` (Windows)
* `/var/lib/grafana/plugins` (Linux)
### Start Grafana
diff --git a/grafana/readme_zh.md b/grafana/readme_zh.md
index 51ad093..3e0f411 100644
--- a/grafana/readme_zh.md
+++ b/grafana/readme_zh.md
@@ -32,7 +32,7 @@ Grafana下载地址:https://grafana.com/grafana/download
插件下载地址:https://github.com/grafana/simple-json-datasource
下载并解压,将文件放到Grafana的目录中:
-`data/plugin/`(Windows)或`/var/lib/grafana/plugins` (Linux)
+`data\plugin\`(Windows)或`/var/lib/grafana/plugins` (Linux)
# 启动Grafana
启动 Grafana