Skip to content

Commit a9f1a9b

Browse files
jt2594838jt2594838
committed
Merge branch 'master' into strong_password
2 parents 89b77f7 + 2c6e00f commit a9f1a9b

110 files changed

Lines changed: 1777 additions & 715 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎code-coverage/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-parent</artifactId>
27-
<version>2.0.5-SNAPSHOT</version>
27+
<version>2.0.6-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>iotdb-code-coverage</artifactId>
3030
<packaging>pom</packaging>

‎distribution/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-parent</artifactId>
27-
<version>2.0.5-SNAPSHOT</version>
27+
<version>2.0.6-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>iotdb-distribution</artifactId>
3030
<packaging>pom</packaging>
@@ -33,25 +33,25 @@
3333
<dependency>
3434
<groupId>org.apache.iotdb</groupId>
3535
<artifactId>iotdb-server</artifactId>
36-
<version>2.0.5-SNAPSHOT</version>
36+
<version>2.0.6-SNAPSHOT</version>
3737
<type>zip</type>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.apache.iotdb</groupId>
4141
<artifactId>iotdb-cli</artifactId>
42-
<version>2.0.5-SNAPSHOT</version>
42+
<version>2.0.6-SNAPSHOT</version>
4343
<type>zip</type>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.apache.iotdb</groupId>
4747
<artifactId>iotdb-confignode</artifactId>
48-
<version>2.0.5-SNAPSHOT</version>
48+
<version>2.0.6-SNAPSHOT</version>
4949
<type>zip</type>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.apache.iotdb</groupId>
5353
<artifactId>library-udf</artifactId>
54-
<version>2.0.5-SNAPSHOT</version>
54+
<version>2.0.6-SNAPSHOT</version>
5555
</dependency>
5656
</dependencies>
5757
<build>
@@ -174,7 +174,7 @@
174174
<dependency>
175175
<groupId>org.apache.iotdb</groupId>
176176
<artifactId>iotdb-ainode</artifactId>
177-
<version>2.0.5-SNAPSHOT</version>
177+
<version>2.0.6-SNAPSHOT</version>
178178
</dependency>
179179
</dependencies>
180180
<build>

‎docker/src/main/DockerCompose/docker-compose-ainode.yml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,30 @@
1717
# under the License.
1818
#
1919

20+
volumes:
21+
ainode-data:
22+
driver: local
23+
driver_opts:
24+
type: none
25+
device: /data/ainode
26+
o: bind
27+
2028
services:
2129
iotdb-ainode:
22-
image: apache/iotdb:2.0.5-SNAPSHOT-ainode
23-
hostname: iotdb-ainode
30+
image: apache/iotdb:<version>-ainode
2431
container_name: iotdb-ainode
25-
ports:
26-
- "10810:10810"
32+
network_mode: host
2733
environment:
28-
- ain_seed_config_node=iotdb-confignode:10710
29-
- ain_inference_rpc_address=iotdb-ainode
30-
- ain_inference_rpc_port=10810
34+
- cluster_name=defaultCluster
35+
- ain_seed_config_node=<iotdb-confignode>:10710
36+
- ain_rpc_address=<iotdb-ainode>
37+
- ain_rpc_port=10810
38+
- ain_cluster_ingress_address=<iotdb-datanode>
39+
- ain_cluster_ingress_port=6667
40+
- ain_cluster_ingress_username=root
41+
- ain_cluster_ingress_password=root
42+
- ain_cluster_ingress_time_zone=UTC+8
3143
volumes:
32-
- ./logs/ainode:/ainode/logs
44+
- ainode-data:/ainode/data
45+
- ./logs/ainode:/ainode/logs
46+
# - ./lib/ainode:/ainode/lib # Uncomment for rolling upgrade

‎docker/src/main/DockerCompose/docker-compose-cluster-1c1d1a.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ services:
5555
container_name: iotdb-ainode
5656
environment:
5757
- ain_seed_config_node=iotdb-service:10710
58-
- ain_inference_rpc_address=iotdb-ainode
59-
- ain_inference_rpc_port=10810
58+
- ain_rpc_address=iotdb-ainode
59+
- ain_rpc_port=10810
6060
volumes:
6161
- ./logs/ainode:/ainode/logs
6262
networks:

‎docker/src/main/Dockerfile-1.0.0-ainode‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN apt update \
3636
COPY target/${target}.zip /
3737
RUN cd / && unzip ${target}.zip \
3838
&& rm ${target}.zip \
39-
&& mv apache-iotdb-${version}-ainode-bin ainode
39+
&& mv ${target} ainode
4040

4141
ENV IOTDB_AINODE_HOME=/ainode VERSION=${version}
4242
WORKDIR ${IOTDB_AINODE_HOME}/sbin
@@ -62,8 +62,5 @@ ENV PATH="${IOTDB_AINODE_HOME}/sbin/:${IOTDB_AINODE_HOME}/tools/:${PATH}"
6262
RUN bash start-ainode.sh || true
6363
RUN rm -r ${IOTDB_AINODE_HOME}/logs/*
6464

65-
EXPOSE 10810
66-
VOLUME $IOTDB_AINODE_HOME/logs
67-
6865
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
6966
CMD ["bash", "-c", "entrypoint.sh ainode"]

‎example/client-cpp-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.5-SNAPSHOT</version>
27+
<version>2.0.6-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>client-cpp-example</artifactId>
3030
<name>IoTDB: Example: CPP Client</name>

‎example/jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.5-SNAPSHOT</version>
27+
<version>2.0.6-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>jdbc-example</artifactId>
3030
<name>IoTDB: Example: JDBC</name>

‎example/mqtt-customize/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.5-SNAPSHOT</version>
27+
<version>2.0.6-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>customize-mqtt-example</artifactId>
3030
<name>IoTDB: Example: Customized MQTT</name>

‎example/mqtt/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.5-SNAPSHOT</version>
27+
<version>2.0.6-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>mqtt-example</artifactId>
3030
<name>IoTDB: Example: MQTT</name>

‎example/pipe-count-point-processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.iotdb</groupId>
2626
<artifactId>iotdb-examples</artifactId>
27-
<version>2.0.5-SNAPSHOT</version>
27+
<version>2.0.6-SNAPSHOT</version>
2828
</parent>
2929
<artifactId>pipe-count-point-processor-example</artifactId>
3030
<name>IoTDB: Example: Pipe: Count Point Processor</name>

0 commit comments

Comments
 (0)