jixuan1989
/
IoTDB
mirror of https://github.com/apache/iotdb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update version (#618)

This commit is contained in:
Jialin Qiao 2019-12-03 19:36:55 +08:00 committed by GitHub
parent be7c91f746
commit 036968e556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
52 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -78,7 +78,7 @@ For the latest information about IoTDB, please visit our [IoTDB official website
# Quick Start # Quick Start
This short guide will walk you through the basic process of using IoTDB. For a more-complete guide, please visit our website's [User Guide](https://iotdb.apache.org/#/Documents/0.8.0/chap1/sec1). This short guide will walk you through the basic process of using IoTDB. For a more-complete guide, please visit our website's [User Guide](https://iotdb.apache.org/#/Documents/0.10.0/chap1/sec1).
## Prerequisites ## Prerequisites
@ -276,7 +276,7 @@ or
IoTDB> exit IoTDB> exit
``` ```
For more on what commands are supported by IoTDB SQL, see [Chapter 5: IoTDB SQL Documentation](https://iotdb.apache.org/#/Documents/0.8.0/chap5/sec1). For more on what commands are supported by IoTDB SQL, see [Chapter 5: IoTDB SQL Documentation](https://iotdb.apache.org/#/Documents/0.10.0/chap5/sec1).
### Stop IoTDB ### Stop IoTDB

2
client/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>iotdb-client</artifactId> <artifactId>iotdb-client</artifactId>

2
distribution/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>iotdb-distribution</artifactId> <artifactId>iotdb-distribution</artifactId>

4
docker/src/main/Dockerfile
View File

@ -31,9 +31,9 @@ RUN apt update \
&& cd incubator-iotdb-master \ && cd incubator-iotdb-master \
&& mvn package -pl server,client -am -Papache-release -DskipTests -Dthrift.download-url="http://www.apache.org/licenses/LICENSE-2.0.txt" -Dthrift.exec.absolute.path="/usr/bin/thrift" \ && mvn package -pl server,client -am -Papache-release -DskipTests -Dthrift.download-url="http://www.apache.org/licenses/LICENSE-2.0.txt" -Dthrift.exec.absolute.path="/usr/bin/thrift" \
&& cd target/ \ && cd target/ \
&& unzip apache-iotdb-0.9.0-SNAPSHOT-incubating-bin.zip \ && unzip apache-iotdb-0.10.0-SNAPSHOT-incubating-bin.zip \
&& mkdir /iotdb \ && mkdir /iotdb \
&& mv apache-iotdb-0.9.0-SNAPSHOT-incubating/* /iotdb/ \ && mv apache-iotdb-0.10.0-SNAPSHOT-incubating/* /iotdb/ \
&& cd ../../ \ && cd ../../ \
&& mvn clean \ && mvn clean \
&& ls -lh ~/.m2 \ && ls -lh ~/.m2 \

2
docs/Documentation-CHN/UserGuide/4-Client/3-Programming - Session.md
View File

@ -45,7 +45,7 @@
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-session</artifactId> <artifactId>iotdb-session</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
``` ```

2
docs/Documentation-CHN/UserGuide/5-Operation Manual/4-SQL Reference.md
View File

@ -30,7 +30,7 @@ show version
``` ```
+---------------------------------------------------------------------------+ +---------------------------------------------------------------------------+
| 0.9.0-SNAPSHOT| | 0.10.0|
+---------------------------------------------------------------------------+ +---------------------------------------------------------------------------+
It costs 0.001s It costs 0.001s
``` ```

2
docs/Documentation-CHN/UserGuide/6-System Tools/5-Log Visualizer.md
View File

@ -67,7 +67,7 @@
> mvn clean package -pl server -DskipTests > mvn clean package -pl server -DskipTests
之后您能在这个目录下找到LogVisualizer的启动脚本： 之后您能在这个目录下找到LogVisualizer的启动脚本：
`server/target/iotdb-server-{project-version}-SNAPSHOT/tools/logVisualize` `server/target/iotdb-server-{project-version}/tools/logVisualize`
如果您想要掌握本工具的一些进阶使用方法，您需要对正则表达式（特别是Java风格的正则表达式）有一些基本的 如果您想要掌握本工具的一些进阶使用方法，您需要对正则表达式（特别是Java风格的正则表达式）有一些基本的
了解。您只有在熟悉正则表达式以后才能新建可视化计划或者对已有的计划进行修改。如果您对正则表达式一无所知， 了解。您只有在熟悉正则表达式以后才能新建可视化计划或者对已有的计划进行修改。如果您对正则表达式一无所知，

2
docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/2-MapReduce TsFile.md
View File

@ -48,7 +48,7 @@ TsFile的Hadoop连接器实现了对Hadoop读取外部Tsfile类型的文件格
|Hadoop 版本 | Java 版本 | TsFile 版本 | |Hadoop 版本 | Java 版本 | TsFile 版本 |
|------------- | ------------ |------------ | |------------- | ------------ |------------ |
| `2.7.3` | `1.8` | `0.8.0-SNAPSHOT`| | `2.7.3` | `1.8` | `0.10.0`|
>注意：关于如何下载和使用Tsfile, 请参考以下链接: https://github.com/apache/incubator-iotdb/tree/master/tsfile. >注意：关于如何下载和使用Tsfile, 请参考以下链接: https://github.com/apache/incubator-iotdb/tree/master/tsfile.

8
docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/5-Hive TsFile.md
View File

@ -52,7 +52,7 @@ TsFile的Hive连接器实现了对Hive读取外部Tsfile类型的文件格式的
|Hadoop Version |Hive Version | Java Version | TsFile | |Hadoop Version |Hive Version | Java Version | TsFile |
|------------- |------------ | ------------ |------------ | |------------- |------------ | ------------ |------------ |
| `2.7.3` or `3.2.1` | `2.3.6` or `3.1.2` | `1.8` | `0.9.0-SNAPSHOT`| | `2.7.3` or `3.2.1` | `2.3.6` or `3.1.2` | `1.8` | `0.10.0`|
> 注意：关于如何下载和使用Tsfile, 请参考以下链接: <https://github.com/apache/incubator-iotdb/tree/master/tsfile>。 > 注意：关于如何下载和使用Tsfile, 请参考以下链接: <https://github.com/apache/incubator-iotdb/tree/master/tsfile>。
@ -77,10 +77,10 @@ TsFile的Hive连接器实现了对Hive读取外部Tsfile类型的文件格式的
然后在hive的命令行中，使用`add jar XXX`命令添加依赖。例如: 然后在hive的命令行中，使用`add jar XXX`命令添加依赖。例如:
``` ```
hive> add jar /Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.9.0-SNAPSHOT-jar-with-dependencies.jar; hive> add jar /Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-SNAPSHOT-jar-with-dependencies.jar;
Added [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.9.0-SNAPSHOT-jar-with-dependencies.jar] to class path Added [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-SNAPSHOT-jar-with-dependencies.jar] to class path
Added resources: [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.9.0-SNAPSHOT-jar-with-dependencies.jar] Added resources: [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-SNAPSHOT-jar-with-dependencies.jar]
``` ```

8
docs/Documentation-CHN/UserGuide/8-System Design (Developer)/1-Hierarchy.md
View File

@ -272,7 +272,7 @@ TsFile 是以6个字节的magic string (`TsFile`) 作为结束.
#### 1.3.1 TsFileResource 打印工具 #### 1.3.1 TsFileResource 打印工具
该工具的启动脚本会在编译 server 之后生成至 `server\target\iotdb-server-0.9.0-SNAPSHOT\tools` 目录中。 该工具的启动脚本会在编译 server 之后生成至 `server\target\iotdb-server-0.10.0\tools` 目录中。
使用方式: 使用方式:
@ -291,7 +291,7 @@ Linux or MacOs:
在Windows系统中的示例: 在Windows系统中的示例:
``` ```
D:\incubator-iotdb\server\target\iotdb-server-0.9.0-SNAPSHOT\tools>.\print-tsfile-resource-files.bat D:\data\data\sequence\root.vehicle D:\incubator-iotdb\server\target\iotdb-server-0.10.0\tools>.\print-tsfile-resource-files.bat D:\data\data\sequence\root.vehicle
​```````````````````````` ​````````````````````````
Starting Printing the TsFileResources Starting Printing the TsFileResources
​```````````````````````` ​````````````````````````
@ -303,7 +303,7 @@ analyzing the resource file finished.
#### 1.3.2 TsFile 描述工具 #### 1.3.2 TsFile 描述工具
该工具的启动脚本会在编译 server 之后生成至 `server\target\iotdb-server-0.9.0-SNAPSHOT\tools` 目录中。 该工具的启动脚本会在编译 server 之后生成至 `server\target\iotdb-server-0.10.0\tools` 目录中。
使用方式: 使用方式:
@ -326,7 +326,7 @@ Linux or MacOs:
在Windows系统中的示例: 在Windows系统中的示例:
```$xslt ```$xslt
D:\incubator-iotdb\server\target\iotdb-server-0.9.0-SNAPSHOT\tools>.\print-tsfile-sketch.bat D:\data\data\sequence\root.vehicle\1572496142067-101-0.tsfile D:\incubator-iotdb\server\target\iotdb-server-0.10.0\tools>.\print-tsfile-sketch.bat D:\data\data\sequence\root.vehicle\1572496142067-101-0.tsfile
​```````````````````````` ​````````````````````````
Starting Printing the TsFile Sketch Starting Printing the TsFile Sketch
​```````````````````````` ​````````````````````````

6
docs/Documentation-CHN/UserGuide/8-System Design (Developer)/3-Writing Data on HDFS.md
View File

@ -39,7 +39,7 @@
首先，使用maven打包server和Hadoop模块：`mvn clean package -pl server,hadoop -am -Dmaven.test.skip=true` 首先，使用maven打包server和Hadoop模块：`mvn clean package -pl server,hadoop -am -Dmaven.test.skip=true`
然后，将Hadoop模块的target jar包`hadoop-tsfile-0.9.0-SNAPSHOT-jar-with-dependencies.jar`复制到server模块的target lib文件夹 `.../server/target/iotdb-server-0.9.0-SNAPSHOT/lib`下。 然后，将Hadoop模块的target jar包`hadoop-tsfile-0.10.0-jar-with-dependencies.jar`复制到server模块的target lib文件夹 `.../server/target/iotdb-server-0.10.0/lib`下。
编辑`iotdb-engine.properties`中的用户配置。相关配置项包括： 编辑`iotdb-engine.properties`中的用户配置。相关配置项包括：
@ -153,7 +153,7 @@
启动server, Tsfile将会被存储到HDFS上。 启动server, Tsfile将会被存储到HDFS上。
如果你想要恢复将TSFile存储到本地文件系统，只需编辑配置项`tsfile_storage_fs`为`LOCAL`。在这种情况下，如果你已经在HDFS上存储了一些数据文件，你需要将它们下载到本地，并移动到你所配置的数据文件文件夹（默认为`../server/target/iotdb-server-0.9.0-SNAPSHOT/data/data`）， 或者重新开始你的整个导入数据过程。 如果你想要恢复将TSFile存储到本地文件系统，只需编辑配置项`tsfile_storage_fs`为`LOCAL`。在这种情况下，如果你已经在HDFS上存储了一些数据文件，你需要将它们下载到本地，并移动到你所配置的数据文件文件夹（默认为`../server/target/iotdb-server-0.10.0/data/data`）， 或者重新开始你的整个导入数据过程。
### 常见问题 ### 常见问题
@ -168,4 +168,4 @@ ERROR org.apache.iotdb.tsfile.fileSystem.fsFactory.HDFSFactory:62 - Failed to ge
A: 这表明你没有将Hadoop模块的以来放到IoTDB server中。你可以这样解决： A: 这表明你没有将Hadoop模块的以来放到IoTDB server中。你可以这样解决：
* 使用Maven打包Hadoop模块: `mvn clean package -pl hadoop -am -Dmaven.test.skip=true` * 使用Maven打包Hadoop模块: `mvn clean package -pl hadoop -am -Dmaven.test.skip=true`
* 将Hadoop模块的target jar包`hadoop-tsfile-0.9.0-SNAPSHOT-jar-with-dependencies.jar`复制到server模块的target lib文件夹 `.../server/target/iotdb-server-0.9.0-SNAPSHOT/lib`下。 * 将Hadoop模块的target jar包`hadoop-tsfile-0.10.0-jar-with-dependencies.jar`复制到server模块的target lib文件夹 `.../server/target/iotdb-server-0.10.0/lib`下。

2
docs/Documentation/UserGuide/0-Get Started/2-Frequently asked questions.md
View File

@ -55,7 +55,7 @@ There are several ways to identify the version of IoTDB that you are using:
* Check pom.xml file: * Check pom.xml file:
``` ```
<version>0.9.0-SNAPSHOT</version> <version>0.10.0</version>
``` ```
* Use JDBC API: * Use JDBC API:

2
docs/Documentation/UserGuide/3-Server/5-Docker Image.md
View File

@ -82,7 +82,7 @@ $ start-client.sh -h localhost -p 6667 -u root -pw root
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId> <artifactId>iotdb-jdbc</artifactId>
<version>0.8.0-SNAPSHOT</version> <version>0.8.0</version>
</dependency> </dependency>
``` ```
Some examples about how to use IoTDB with IoTDB-JDBC can be found at: https://github.com/apache/incubator-iotdb/tree/master/example/jdbc/src/main/java/org/apache/iotdb Some examples about how to use IoTDB with IoTDB-JDBC can be found at: https://github.com/apache/incubator-iotdb/tree/master/example/jdbc/src/main/java/org/apache/iotdb

2
docs/Documentation/UserGuide/4-Client/2-Programming - JDBC.md
View File

@ -50,7 +50,7 @@ mvn clean install -pl jdbc -am -Dmaven.test.skip=true
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId> <artifactId>iotdb-jdbc</artifactId>
<version>0.8.0-SNAPSHOT</version> <version>0.8.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
``` ```

2
docs/Documentation/UserGuide/4-Client/3-Programming - Session.md
View File

@ -45,7 +45,7 @@ In root directory:
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-session</artifactId> <artifactId>iotdb-session</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
``` ```

6
docs/Documentation/UserGuide/4-Client/5-Programming - TsFile API.md
View File

@ -37,7 +37,7 @@ There are two ways to use TsFile in your own project.
cd tsfile/ cd tsfile/
mvn clean package -Dmaven.test.skip=true mvn clean package -Dmaven.test.skip=true
``` ```
Then, all the jars can be get in folder named `target/`. Import `target/tsfile-0.9.0-SNAPSHOT-jar-with-dependencies.jar` to your project. Then, all the jars can be get in folder named `target/`. Import `target/tsfile-0.10.0-jar-with-dependencies.jar` to your project.
* Using as a maven dependency: * Using as a maven dependency:
@ -60,7 +60,7 @@ There are two ways to use TsFile in your own project.
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId> <artifactId>tsfile</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
``` ```
@ -93,7 +93,7 @@ There are two ways to use TsFile in your own project.
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId> <artifactId>tsfile</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
``` ```

2
docs/Documentation/UserGuide/5-Operation Manual/4-SQL Reference.md
View File

@ -38,7 +38,7 @@ show version
``` ```
+---------------------------------------------------------------------------+ +---------------------------------------------------------------------------+
| 0.9.0-SNAPSHOT| | 0.10.0|
+---------------------------------------------------------------------------+ +---------------------------------------------------------------------------+
It costs 0.001s It costs 0.001s
``` ```

2
docs/Documentation/UserGuide/6-System Tools/5-Log Visualizer.md
View File

@ -72,7 +72,7 @@ server module as a tool, you can build the server together with LogVisualizer us
> mvn clean package -pl server -DskipTests > mvn clean package -pl server -DskipTests
Then you fan find the scripts to start LogVisualizer in: Then you fan find the scripts to start LogVisualizer in:
`server/target/iotdb-server-{project-version}-SNAPSHOT/tools/logVisualize` `server/target/iotdb-server-{project-version}/tools/logVisualize`
To have access to the advanced usages of this tool, you must have some basic knowledge about regular To have access to the advanced usages of this tool, you must have some basic knowledge about regular
expressions, especially Java style ones. Knowing about regular expressions enables to create your own expressions, especially Java style ones. Knowing about regular expressions enables to create your own

2
docs/Documentation/UserGuide/7-Ecosystem Integration/2-MapReduce TsFile.md
View File

@ -48,7 +48,7 @@ With this connector, you can
|Hadoop Version | Java Version | TsFile Version| |Hadoop Version | Java Version | TsFile Version|
|------------- | ------------ |------------ | |------------- | ------------ |------------ |
| `2.7.3` | `1.8` | `0.8.0-SNAPSHOT`| | `2.7.3` | `1.8` | `0.8.0`|
> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile. > Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.

6
docs/Documentation/UserGuide/7-Ecosystem Integration/3-Spark TsFile.md
View File

@ -36,7 +36,7 @@ With this connector, you can
|Spark Version | Scala Version | Java Version | TsFile | |Spark Version | Scala Version | Java Version | TsFile |
|------------- | ------------- | ------------ |------------ | |------------- | ------------- | ------------ |------------ |
| `2.4.3` | `2.11.8` | `1.8` | `0.8.0-SNAPSHOT`| | `2.4.3` | `2.11.8` | `1.8` | `0.10.0`|
> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile. > Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
@ -46,7 +46,7 @@ With this connector, you can
Start Spark with TsFile-Spark-Connector in local mode: Start Spark with TsFile-Spark-Connector in local mode:
``` ```
./<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-SNAPSHOT-jar-with-dependencies.jar ./<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.10.0-jar-with-dependencies.jar
``` ```
Note: Note:
@ -61,7 +61,7 @@ Note:
Start Spark with TsFile-Spark-Connector in distributed mode (That is, the spark cluster is connected by spark-shell): Start Spark with TsFile-Spark-Connector in distributed mode (That is, the spark cluster is connected by spark-shell):
``` ```
. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-SNAPSHOT-jar-with-dependencies.jar --master spark://ip:7077 . /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-jar-with-dependencies.jar --master spark://ip:7077
``` ```
Note: Note:

8
docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB.md
View File

@ -26,7 +26,7 @@ The versions required for Spark and Java are as follow:
| Spark Version | Scala Version | Java Version | TsFile | | Spark Version | Scala Version | Java Version | TsFile |
| ------------- | ------------- | ------------ |------------ | | ------------- | ------------- | ------------ |------------ |
| `2.4.3` | `2.11` | `1.8` | `0.9.0-SNAPSHOT`| | `2.4.3` | `2.11` | `1.8` | `0.10.0`|
## install ## install
@ -39,7 +39,7 @@ mvn clean scala:compile compile install
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>spark-iotdb-connector</artifactId> <artifactId>spark-iotdb-connector</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
``` ```
@ -47,7 +47,7 @@ mvn clean scala:compile compile install
# 2. spark-shell user guide # 2. spark-shell user guide
``` ```
spark-shell --jars spark-iotdb-connector-0.9.0-SNAPSHOT.jar,iotdb-jdbc-0.9.0-SNAPSHOT-jar-with-dependencies.jar spark-shell --jars spark-iotdb-connector-0.10.0.jar,iotdb-jdbc-0.10.0-jar-with-dependencies.jar
import org.apache.iotdb.spark.db._ import org.apache.iotdb.spark.db._
@ -60,7 +60,7 @@ df.show()
### if you want to partition your rdd, you can do as following ### if you want to partition your rdd, you can do as following
``` ```
spark-shell --jars spark-iotdb-connector-0.9.0-SNAPSHOT.jar,iotdb-jdbc-0.9.0-SNAPSHOT-jar-with-dependencies.jar spark-shell --jars spark-iotdb-connector-0.10.0.jar,iotdb-jdbc-0.10.0-jar-with-dependencies.jar
import org.apache.iotdb.spark.db._ import org.apache.iotdb.spark.db._

10
docs/Documentation/UserGuide/7-Ecosystem Integration/5-Hive TsFile.md
View File

@ -50,7 +50,7 @@ With this connector, you can
|Hadoop Version |Hive Version | Java Version | TsFile | |Hadoop Version |Hive Version | Java Version | TsFile |
|------------- |------------ | ------------ |------------ | |------------- |------------ | ------------ |------------ |
| `2.7.3` or `3.2.1` | `2.3.6` or `3.1.2` | `1.8` | `0.9.0-SNAPSHOT`| | `2.7.3` or `3.2.1` | `2.3.6` or `3.1.2` | `1.8` | `0.10.0`|
> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile. > Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
@ -70,15 +70,15 @@ With this connector, you can
To use hive-connector in hive, we should add the hive-connector jar into hive. To use hive-connector in hive, we should add the hive-connector jar into hive.
After downloading the code of iotdb from <https://github.com/apache/incubator-iotdb>, you can use the command of `mvn clean package -pl hive-connector -am -Dmaven.test.skip=true` to get a `hive-connector-X.X.X-SNAPSHOT-jar-with-dependencies.jar`. After downloading the code of iotdb from <https://github.com/apache/incubator-iotdb>, you can use the command of `mvn clean package -pl hive-connector -am -Dmaven.test.skip=true` to get a `hive-connector-X.X.X-jar-with-dependencies.jar`.
Then in hive, use the command of `add jar XXX` to add the dependency. For example: Then in hive, use the command of `add jar XXX` to add the dependency. For example:
``` ```
hive> add jar /Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.9.0-SNAPSHOT-jar-with-dependencies.jar; hive> add jar /Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-jar-with-dependencies.jar;
Added [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.9.0-SNAPSHOT-jar-with-dependencies.jar] to class path Added [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-jar-with-dependencies.jar] to class path
Added resources: [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.9.0-SNAPSHOT-jar-with-dependencies.jar] Added resources: [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-jar-with-dependencies.jar]
``` ```

8
docs/Documentation/UserGuide/8-System Design (Developer)/1-Hierarchy.md
View File

@ -271,7 +271,7 @@ Congratulations! You have finished the journey of discovering TsFile.
#### 1.3.1 TsFileResource Print Tool #### 1.3.1 TsFileResource Print Tool
After building the server, the startup script of this tool will appear under the `server\target\iotdb-server-0.9.0-SNAPSHOT\tools` directory. After building the server, the startup script of this tool will appear under the `server\target\iotdb-server-0.10.0\tools` directory.
Command: Command:
@ -290,7 +290,7 @@ For Linux or MacOs:
An example on Windows: An example on Windows:
``` ```
D:\incubator-iotdb\server\target\iotdb-server-0.9.0-SNAPSHOT\tools>.\print-tsfile-resource-files.bat D:\data\data\sequence\root.vehicle D:\incubator-iotdb\server\target\iotdb-server-0.10.0\tools>.\print-tsfile-resource-files.bat D:\data\data\sequence\root.vehicle
​```````````````````````` ​````````````````````````
Starting Printing the TsFileResources Starting Printing the TsFileResources
​```````````````````````` ​````````````````````````
@ -302,7 +302,7 @@ analyzing the resource file finished.
#### 1.3.2 TsFile Sketch Tool #### 1.3.2 TsFile Sketch Tool
After building the server, the startup script of this tool will appear under the `server\target\iotdb-server-0.9.0-SNAPSHOT\tools` directory. After building the server, the startup script of this tool will appear under the `server\target\iotdb-server-0.10.0\tools` directory.
Command: Command:
@ -325,7 +325,7 @@ For Linux or MacOs:
An example on Windows: An example on Windows:
```$xslt ```$xslt
D:\incubator-iotdb\server\target\iotdb-server-0.9.0-SNAPSHOT\tools>.\print-tsfile-sketch.bat D:\data\data\sequence\root.vehicle\1572496142067-101-0.tsfile D:\incubator-iotdb\server\target\iotdb-server-0.10.0\tools>.\print-tsfile-sketch.bat D:\data\data\sequence\root.vehicle\1572496142067-101-0.tsfile
​```````````````````````` ​````````````````````````
Starting Printing the TsFile Sketch Starting Printing the TsFile Sketch
​```````````````````````` ​````````````````````````

6
docs/Documentation/UserGuide/8-System Design (Developer)/3-Writing Data on HDFS.md
View File

@ -39,7 +39,7 @@ If you want to store TSFile and related data files in HDFS, here are the steps:
First, build server and Hadoop module by: `mvn clean package -pl server,hadoop -am -Dmaven.test.skip=true` First, build server and Hadoop module by: `mvn clean package -pl server,hadoop -am -Dmaven.test.skip=true`
Then, copy the target jar of Hadoop module `hadoop-tsfile-0.9.0-SNAPSHOT-jar-with-dependencies.jar` into server target lib folder `.../server/target/iotdb-server-0.9.0-SNAPSHOT/lib`. Then, copy the target jar of Hadoop module `hadoop-tsfile-0.10.0-jar-with-dependencies.jar` into server target lib folder `.../server/target/iotdb-server-0.10.0/lib`.
Edit user config in `iotdb-engine.properties`. Related configurations are: Edit user config in `iotdb-engine.properties`. Related configurations are:
@ -153,7 +153,7 @@ Edit user config in `iotdb-engine.properties`. Related configurations are:
Start server, and Tsfile will be stored on HDFS. Start server, and Tsfile will be stored on HDFS.
If you'd like to reset storage file system to local, just edit configuration `tsfile_storage_fs` to `LOCAL`. In this situation, if you have already had some data files on HDFS, you should either download them to local and move them to your config data file folder (`../server/target/iotdb-server-0.9.0-SNAPSHOT/data/data` by default), or restart your process and import data to IoTDB. If you'd like to reset storage file system to local, just edit configuration `tsfile_storage_fs` to `LOCAL`. In this situation, if you have already had some data files on HDFS, you should either download them to local and move them to your config data file folder (`../server/target/iotdb-server-0.10.0/data/data` by default), or restart your process and import data to IoTDB.
### Frequent questions ### Frequent questions
@ -168,4 +168,4 @@ ERROR org.apache.iotdb.tsfile.fileSystem.fsFactory.HDFSFactory:62 - Failed to ge
A: It indicates that you forget to put Hadoop module dependency in IoTDB server. You can solve it by: A: It indicates that you forget to put Hadoop module dependency in IoTDB server. You can solve it by:
* Build Hadoop module: `mvn clean package -pl hadoop -am -Dmaven.test.skip=true` * Build Hadoop module: `mvn clean package -pl hadoop -am -Dmaven.test.skip=true`
* Copy the target jar of Hadoop module `hadoop-tsfile-0.9.0-SNAPSHOT-jar-with-dependencies.jar` into server target lib folder `.../server/target/iotdb-server-0.9.0-SNAPSHOT/lib`. * Copy the target jar of Hadoop module `hadoop-tsfile-0.10.0-jar-with-dependencies.jar` into server target lib folder `.../server/target/iotdb-server-0.10.0/lib`.

6
example/hadoop/pom.xml
View File

@ -24,17 +24,17 @@
<parent> <parent>
<artifactId>iotdb-examples</artifactId> <artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>hadoop-example</artifactId> <artifactId>hadoop-example</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<name>hadoop-example</name> <name>hadoop-example</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId> <artifactId>hadoop-tsfile</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
example/jdbc/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>iotdb-examples</artifactId> <artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>jdbc-example</artifactId> <artifactId>jdbc-example</artifactId>

4
example/kafka/pom.xml
View File

@ -24,12 +24,12 @@
<!-- you need to add the following content if you remove the parent pom. <!-- you need to add the following content if you remove the parent pom.
<groupId>org.apache.iotdb.example</groupId> <groupId>org.apache.iotdb.example</groupId>
<artifactId>kafka-example</artifactId> <artifactId>kafka-example</artifactId>
<version>0.9.0</version> <version>0.10.0</version>
--> -->
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId> <artifactId>iotdb-examples</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>kafka-example</artifactId> <artifactId>kafka-example</artifactId>

4
example/kafka/readme.md
View File

@ -25,7 +25,7 @@ The example is to show how to send data from localhost to IoTDB through Kafka.
``` ```
## Usage ## Usage
### Version usage ### Version usage
IoTDB: 0.9.0-SNAPSHOT IoTDB: 0.10.0
Kafka: 0.8.2.0 Kafka: 0.8.2.0
### Dependencies with Maven ### Dependencies with Maven
@ -39,7 +39,7 @@ Kafka: 0.8.2.0
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId> <artifactId>iotdb-jdbc</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
``` ```

2
example/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>

2
example/rocketmq/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId> <artifactId>iotdb-examples</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>rocketmq-example</artifactId> <artifactId>rocketmq-example</artifactId>

4
example/rocketmq/readme.md
View File

@ -46,7 +46,7 @@ Producers insert IoTDB insert statements into partitions according to devices, e
## Usage ## Usage
### Version usage ### Version usage
IoTDB: 0.8.0-SNAPSHOT IoTDB: 0.10.0
Kafka: 4.4.0 Kafka: 4.4.0
### Dependencies with Maven ### Dependencies with Maven
@ -55,7 +55,7 @@ Kafka: 4.4.0
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId> <artifactId>iotdb-jdbc</artifactId>
<version>0.8.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>org.apache.rocketmq</groupId>

2
example/session/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>iotdb-examples</artifactId> <artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>client-example</artifactId> <artifactId>client-example</artifactId>

2
example/tsfile/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId> <artifactId>iotdb-examples</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>tsfile-example</artifactId> <artifactId>tsfile-example</artifactId>

2
example/tsfile/readme.md
View File

@ -31,7 +31,7 @@ The example is to show how to write and read a TsFile File.
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId> <artifactId>tsfile</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
``` ```

2
grafana/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<!--parent> <!--parent>

2
hadoop/README.md
View File

@ -47,7 +47,7 @@ With this connector, you can
|Hadoop Version | Java Version | TsFile Version| |Hadoop Version | Java Version | TsFile Version|
|------------- | ------------ |------------ | |------------- | ------------ |------------ |
| `2.7.3` | `1.8` | `0.8.0-SNAPSHOT`| | `2.7.3` | `1.8` | `0.10.0`|
> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile. > Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.

4
hadoop/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>hadoop-tsfile</artifactId> <artifactId>hadoop-tsfile</artifactId>
@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId> <artifactId>tsfile</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

6
hive-connector/pom.xml
View File

@ -24,11 +24,11 @@
<parent> <parent>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>hive-connector</artifactId> <artifactId>hive-connector</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId> <artifactId>hadoop-tsfile</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hive</groupId> <groupId>org.apache.hive</groupId>

2
jdbc/README.md
View File

@ -47,7 +47,7 @@ mvn clean install -pl jdbc -am -Dmaven.test.skip=true
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId> <artifactId>iotdb-jdbc</artifactId>
<version>0.8.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
``` ```

2
jdbc/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>iotdb-jdbc</artifactId> <artifactId>iotdb-jdbc</artifactId>

4
pom.xml
View File

@ -28,7 +28,7 @@
</parent> </parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Apache IoTDB (incubating) Project Parent POM</name> <name>Apache IoTDB (incubating) Project Parent POM</name>
<description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description> <description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description>
@ -42,7 +42,7 @@
<connection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</connection> <connection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</connection>
<developerConnection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</developerConnection> <developerConnection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</developerConnection>
<url>ssh://git@github.com:apache/incubator-iotdb.git</url> <url>ssh://git@github.com:apache/incubator-iotdb.git</url>
<tag>rel/0.8</tag> <tag>rel/0.10</tag>
</scm> </scm>
<modules> <modules>
<module>tsfile</module> <module>tsfile</module>

2
server/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>iotdb-server</artifactId> <artifactId>iotdb-server</artifactId>

2
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
View File

@ -26,7 +26,7 @@ public class IoTDBConstant {
public static final String ENV_FILE_NAME = "iotdb-env"; public static final String ENV_FILE_NAME = "iotdb-env";
public static final String IOTDB_CONF = "IOTDB_CONF"; public static final String IOTDB_CONF = "IOTDB_CONF";
public static final String GLOBAL_DB_NAME = "IoTDB"; public static final String GLOBAL_DB_NAME = "IoTDB";
public static final String VERSION = "0.9.0-SNAPSHOT"; public static final String VERSION = "0.10.0-SNAPSHOT";
public static final String REMOTE_JMX_PORT_NAME = "com.sun.management.jmxremote.port"; public static final String REMOTE_JMX_PORT_NAME = "com.sun.management.jmxremote.port";
public static final String IOTDB_LOCAL_JMX_PORT_NAME = "iotdb.jmx.local.port"; public static final String IOTDB_LOCAL_JMX_PORT_NAME = "iotdb.jmx.local.port";
public static final String IOTDB_REMOTE_JMX_PORT_NAME = "iotdb.jmx.remote.port"; public static final String IOTDB_REMOTE_JMX_PORT_NAME = "iotdb.jmx.remote.port";

2
service-rpc/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>service-rpc</artifactId> <artifactId>service-rpc</artifactId>

2
session/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>iotdb-session</artifactId> <artifactId>iotdb-session</artifactId>

8
spark-iotdb-connector/Readme.md
View File

@ -25,7 +25,7 @@ The versions required for Spark and Java are as follow:
| Spark Version | Scala Version | Java Version | TsFile | | Spark Version | Scala Version | Java Version | TsFile |
| ------------- | ------------- | ------------ |------------ | | ------------- | ------------- | ------------ |------------ |
| `2.4.3` | `2.11` | `1.8` | `0.9.0-SNAPSHOT`| | `2.4.3` | `2.11` | `1.8` | `0.10.0`|
## install ## install
@ -38,7 +38,7 @@ mvn clean scala:compile compile install
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>spark-iotdb-connector</artifactId> <artifactId>spark-iotdb-connector</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0</version>
</dependency> </dependency>
``` ```
@ -46,7 +46,7 @@ mvn clean scala:compile compile install
# 2. spark-shell user guide # 2. spark-shell user guide
``` ```
spark-shell --jars spark-iotdb-connector-0.9.0-SNAPSHOT.jar,iotdb-jdbc-0.9.0-SNAPSHOT-jar-with-dependencies.jar spark-shell --jars spark-iotdb-connector-0.10.0.jar,iotdb-jdbc-0.10.0-jar-with-dependencies.jar
import org.apache.iotdb.spark.db._ import org.apache.iotdb.spark.db._
@ -59,7 +59,7 @@ df.show()
### if you want to partition your rdd, you can do as following ### if you want to partition your rdd, you can do as following
``` ```
spark-shell --jars spark-iotdb-connector-0.9.0-SNAPSHOT.jar,iotdb-jdbc-0.9.0-SNAPSHOT-jar-with-dependencies.jar spark-shell --jars spark-iotdb-connector-0.10.0.jar,iotdb-jdbc-0.10.0-jar-with-dependencies.jar
import org.apache.iotdb.spark.db._ import org.apache.iotdb.spark.db._

2
spark-iotdb-connector/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>spark-iotdb-connector</artifactId> <artifactId>spark-iotdb-connector</artifactId>

6
spark-tsfile/README.md
View File

@ -33,7 +33,7 @@ With this connector, you can
|Spark Version | Scala Version | Java Version | TsFile | |Spark Version | Scala Version | Java Version | TsFile |
|------------- | ------------- | ------------ |------------ | |------------- | ------------- | ------------ |------------ |
| `2.4.3` | `2.11.8` | `1.8` | `0.8.0-SNAPSHOT`| | `2.4.3` | `2.11.8` | `1.8` | `0.10.0`|
> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile. > Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
@ -43,7 +43,7 @@ With this connector, you can
Start Spark with TsFile-Spark-Connector in local mode: Start Spark with TsFile-Spark-Connector in local mode:
``` ```
./<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-SNAPSHOT-jar-with-dependencies.jar ./<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.10.0-jar-with-dependencies.jar
``` ```
Note: Note:
@ -58,7 +58,7 @@ Note:
Start Spark with TsFile-Spark-Connector in distributed mode (That is, the spark cluster is connected by spark-shell): Start Spark with TsFile-Spark-Connector in distributed mode (That is, the spark cluster is connected by spark-shell):
``` ```
. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-SNAPSHOT-jar-with-dependencies.jar --master spark://ip:7077 . /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.10.0-jar-with-dependencies.jar --master spark://ip:7077
``` ```
Note: Note:

4
spark-tsfile/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>spark-tsfile</artifactId> <artifactId>spark-tsfile</artifactId>
@ -39,7 +39,7 @@
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId> <artifactId>hadoop-tsfile</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>

2
tsfile/README.md
View File

@ -25,7 +25,7 @@ ___________ ___________.__.__
\__ ___/____\_ _____/|__| | ____ \__ ___/____\_ _____/|__| | ____
| | / ___/| __) | | | _/ __ \ | | / ___/| __) | | | _/ __ \
| | \___ \ | \ | | |_\ ___/ | | \___ \ | \ | | |_\ ___/
|____|/____ >\___ / |__|____/\___ > version 0.8.0 |____|/____ >\___ / |__|____/\___ > version 0.10.0
\/ \/ \/ \/ \/ \/
</pre> </pre>
## Abstract ## Abstract

2
tsfile/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId> <artifactId>iotdb-parent</artifactId>
<version>0.9.0-SNAPSHOT</version> <version>0.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>tsfile</artifactId> <artifactId>tsfile</artifactId>

6
tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
View File

@ -52,9 +52,9 @@ public class TSFileConfig {
public static final Charset STRING_CHARSET = Charset.forName(STRING_ENCODING); public static final Charset STRING_CHARSET = Charset.forName(STRING_ENCODING);
public static final String CONFIG_FILE_NAME = "iotdb-engine.properties"; public static final String CONFIG_FILE_NAME = "iotdb-engine.properties";
public static final String MAGIC_STRING = "TsFile"; public static final String MAGIC_STRING = "TsFile";
public static final String VERSION_NUMBER = "000001"; public static final String VERSION_NUMBER = "000002";
public static final String OLD_MAGIC_STRING = "TsFilev0.8.0"; public static final String OLD_MAGIC_STRING = "TsFile";
public static final String OLD_VERSION = "v0.8.0"; public static final String OLD_VERSION = "000001";
/** /**
* Bloom filter constrain * Bloom filter constrain