Skip to content
Permalink
Browse files
Merge branch 'master' into hot_compaction
  • Loading branch information
HTHou committed Jun 29, 2020
2 parents b44f46a + ab5f7cc commit b01f724fd94ef06bc2f93865a6085ea4bb6e49f5
Showing 85 changed files with 2,378 additions and 685 deletions.
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-cli</artifactId>
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-distribution</artifactId>
@@ -32,9 +32,9 @@ RUN apt update \
&& 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" \
&& cd target/ \
&& unzip apache-iotdb-0.10.0-SNAPSHOT-incubating-bin.zip \
&& unzip apache-iotdb-0.11.0-SNAPSHOT-incubating-bin.zip \
&& mkdir /iotdb \
&& mv apache-iotdb-0.10.0-SNAPSHOT-incubating/* /iotdb/ \
&& mv apache-iotdb-0.11.0-SNAPSHOT-incubating/* /iotdb/ \
&& cd ../../ \
&& mvn clean \
&& ls -lh ~/.m2 \
@@ -0,0 +1,41 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

FROM openjdk:11-jre-slim
RUN apt update \
# procps is for `free` command
&& apt install wget unzip lsof procps -y \
&& wget https://www-us.apache.org/dist/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip \
# if you are in China, use the following URL
#&& wget http://mirrors.tuna.tsinghua.edu.cn/apache/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip \
&& unzip apache-iotdb-0.10.0-incubating-bin.zip \
&& rm apache-iotdb-0.10.0-incubating-bin.zip \
&& mv apache-iotdb-0.10.0-incubating /iotdb \
&& apt remove wget unzip -y \
&& apt autoremove -y \
&& apt purge --auto-remove -y \
&& apt clean -y
EXPOSE 6667
EXPOSE 31999
EXPOSE 5555
EXPOSE 8181
VOLUME /iotdb/data
VOLUME /iotdb/logs
ENV PATH="/iotdb/sbin/:/iotdb/tools/:${PATH}"
ENTRYPOINT ["/iotdb/sbin/start-server.sh"]
@@ -28,6 +28,16 @@
<th colspan="3">IoTDB Sources</th>
<th>release notes</th>
</tr>
<tr>
<td>0.10.0</td>
<td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip">Release</a></td>
<td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip.sha512">SHA512</a></td>
<td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip.asc">ASC</a></td>
<td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-source-release.zip">Sources</a></td>
<td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-source-release.zip.sha512">SHA512</a></td>
<td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-source-release.zip.asc">ASC</a></td>
<td><a href="https://raw.githubusercontent.com/apache/incubator-iotdb/release/0.10.0/RELEASE_NOTES.md">release notes</a></td>
</tr>
<tr>
<td>0.9.3</td>
<td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip">Release</a></td>
@@ -51,8 +61,34 @@

</table>

**<font color=red>Attention</font>**:

- How to upgrade a minor version (e.g., from v0.9.0 to v0.9.3)?
* versions which have the same major version are compatible.
* Just download and unzip the new version. Then modify the configuration files to keep consistent
with what you set in the old version.
* stop the old vesion instance, and start the new one.

- How to upgrade from v.9.x to v0.10.x?
* Upgrading from v0.9 to v0.10 is more complex than v0.8 to v0.9.
* Stop writing new data.
* Call `flush` command using sbin/start-client.sh in v0.9 to close all TsFiles.
* We recommend to backup the data file (also the wal files and mlog.txt) before upgrading for rolling back.
* Just download, unzip v0.10.x.zip, and modify conf/iotdb-engine.proeprties to let all the
directories point to the folders set in v0.9.x (or the backup folder).
You can also modify other settings if you want.
* Stop IoTDB v0.9 instance, and start v0.10.x, then the IoTDB will upgrade data file format automatically.

- How to upgrade from 0.8.x to v0.9.x?
* We recommend to backup the data file (also the wal files and mlog.txt) before upgrading for rolling back.
* Just download, unzip v0.9.x.zip, and modify conf/iotdb-engine.proeprties to let all the
directories point to the folders set in v0.8.x (or the backup folder).
You can also modify other settings if you want.
* Stop IoTDB v0.8 instance, and start v0.9.x, then the IoTDB will upgrade data file format automatically.





# All releases

0 comments on commit b01f724

Please sign in to comment.