This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb-extras.git
The following commit(s) were added to refs/heads/master by this push:
new ad09ad8 perf: update spring pom (#66)
ad09ad8 is described below
commit ad09ad86dd51e9958051cec2fae8b7717186d0a6
Author: CritasWang <[email protected]>
AuthorDate: Sun Apr 27 18:15:18 2025 +0800
perf: update spring pom (#66)
---
.github/workflows/compile-check.yml | 8 +-
examples/iotdb-spring-boot-start/pom.xml | 4 +-
.../src/main/resources/application.properties | 2 +-
.../SpringBootIoTDBApplicationTests.java | 2 +-
examples/mybatis-generator/pom.xml | 8 +-
examples/mybatisplus-generator/pom.xml | 54 +++-
.../src/main/java/org/apache/iotdb/Main.java | 109 ++++----
examples/pom.xml | 10 +
iotdb-spring-boot-starter/pom.xml | 64 ++++-
.../iotdb/config/IoTDBSessionProperties.java | 284 ++++++++++-----------
.../org/apache/iotdb/session/IoTDBSessionPool.java | 105 ++++----
mybatis-generator/pom.xml | 1 +
pom.xml | 6 +
13 files changed, 381 insertions(+), 276 deletions(-)
diff --git a/.github/workflows/compile-check.yml
b/.github/workflows/compile-check.yml
index 7827828..99b81e8 100644
--- a/.github/workflows/compile-check.yml
+++ b/.github/workflows/compile-check.yml
@@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- java: [8, 11, 17]
+ java: [8, 11, 17, 21]
os: [ ubuntu-latest ]
runs-on: ${{ matrix.os }}
steps:
@@ -47,4 +47,8 @@ jobs:
- name: Compiler Test
shell: bash
run: |
- mvn clean verify -P with-integration-tests -ntp
+ if [ "${{ matrix.java }}" -ge 17 ]; then
+ mvn clean verify -P with-springboot -ntp
+ else
+ mvn clean verify -ntp
+ fi
diff --git a/examples/iotdb-spring-boot-start/pom.xml
b/examples/iotdb-spring-boot-start/pom.xml
index 919f52c..8090af8 100644
--- a/examples/iotdb-spring-boot-start/pom.xml
+++ b/examples/iotdb-spring-boot-start/pom.xml
@@ -31,10 +31,12 @@
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-spring-boot-start-example</artifactId>
<version>2.0.2-SNAPHOT</version>
- <name>iotdb-spring-boot-start</name>
+ <name>IoTDB: Example: SpringBoot Starter</name>
<description>iotdb-spring-boot-start</description>
<properties>
<java.version>17</java.version>
+ <spring-boot.version>3.4.5</spring-boot.version>
+ <spring.version>6.2.6</spring.version>
</properties>
<dependencies>
<dependency>
diff --git
a/examples/iotdb-spring-boot-start/src/main/resources/application.properties
b/examples/iotdb-spring-boot-start/src/main/resources/application.properties
index 98953f1..19e6195 100644
--- a/examples/iotdb-spring-boot-start/src/main/resources/application.properties
+++ b/examples/iotdb-spring-boot-start/src/main/resources/application.properties
@@ -18,7 +18,7 @@
spring.application.name=iotdb-spring-boot-start
-iotdb.session.url=172.20.31.56:6668
+iotdb.session.url=127.0.0.1:6667
iotdb.session.password=root
iotdb.session.username=root
iotdb.session.database=wind
diff --git
a/examples/iotdb-spring-boot-start/src/test/java/org/apache/iotdb/iotdbspringbootstartexample/SpringBootIoTDBApplicationTests.java
b/examples/iotdb-spring-boot-start/src/test/java/org/apache/iotdb/iotdbspringbootstartexample/SpringBootIoTDBApplicationTests.java
index 0e98959..d5ec0d9 100644
---
a/examples/iotdb-spring-boot-start/src/test/java/org/apache/iotdb/iotdbspringbootstartexample/SpringBootIoTDBApplicationTests.java
+++
b/examples/iotdb-spring-boot-start/src/test/java/org/apache/iotdb/iotdbspringbootstartexample/SpringBootIoTDBApplicationTests.java
@@ -30,7 +30,7 @@ public class SpringBootIoTDBApplicationTests {
@Autowired
private IoTDBService iotdbService;
- @Test
+ // @Test
void contextLoads() throws IoTDBConnectionException,
StatementExecutionException {
iotdbService.querySessionPool();
iotdbService.queryTableSessionPool();
diff --git a/examples/mybatis-generator/pom.xml
b/examples/mybatis-generator/pom.xml
index 83e2c72..c7d73e3 100644
--- a/examples/mybatis-generator/pom.xml
+++ b/examples/mybatis-generator/pom.xml
@@ -28,12 +28,8 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>mybatis-generator-example</artifactId>
+ <name>IoTDB: Example: Mybatis Generator</name>
<version>2.0.2-SNAPHOT</version>
- <properties>
- <maven.compiler.source>21</maven.compiler.source>
- <maven.compiler.target>21</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<build>
<plugins>
<plugin>
@@ -44,7 +40,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>mybatis-generator-plugin</artifactId>
- <version>1.3.2</version>
+ <version>2.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
diff --git a/examples/mybatisplus-generator/pom.xml
b/examples/mybatisplus-generator/pom.xml
index a24d947..729e2de 100644
--- a/examples/mybatisplus-generator/pom.xml
+++ b/examples/mybatisplus-generator/pom.xml
@@ -29,14 +29,22 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>mybatisplus-generator-example</artifactId>
+ <name>IoTDB: Example: Mybatis Plus Generator</name>
<version>2.0.2-SNAPHOT</version>
<properties>
<mybatisplus.version>3.5.10</mybatisplus.version>
- <maven.compiler.source>21</maven.compiler.source>
- <maven.compiler.target>21</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <spring-boot.version>3.4.5</spring-boot.version>
+ <spring.version>6.2.6</spring.version>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ <version>3.5.19</version>
+ </dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
@@ -50,32 +58,27 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- <version>2.0</version>
+ <version>2.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>2.0.1-beta</version>
+ <version>${iotdb.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <version>3.4.3</version>
+ <version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>3.4.3</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>3.0.0</version>
+ <version>${spring-boot.version}</version>
</dependency>
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>3.0.0</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>2.8.6</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
@@ -83,4 +86,27 @@
<version>1.18.36</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <ignoredDependencies>
+ <!-- For some reason this plugin missed it being used
for a constant import -->
+
<ignoredDependency>org.apache.iotdb:isession</ignoredDependency>
+ </ignoredDependencies>
+ <usedDependencies>
+ <!-- These are used at runtime in tests -->
+
<usedDependency>com.baomidou:mybatis-plus-spring-boot3-starter</usedDependency>
+
<usedDependency>org.apache.velocity:velocity-engine-core</usedDependency>
+
<usedDependency>org.springframework.boot:spring-boot-starter</usedDependency>
+
<usedDependency>org.springframework.boot:spring-boot-starter-web</usedDependency>
+
<usedDependency>org.springdoc:springdoc-openapi-starter-webmvc-ui</usedDependency>
+
<usedDependency>org.projectlombok:lombok</usedDependency>
+ </usedDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
index b8e19af..bb98fbd 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
@@ -19,62 +19,75 @@
package org.apache.iotdb;
+import org.apache.iotdb.jdbc.IoTDBDataSource;
+
import com.baomidou.mybatisplus.generator.FastAutoGenerator;
import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
import com.baomidou.mybatisplus.generator.config.OutputFile;
import com.baomidou.mybatisplus.generator.config.rules.DateType;
import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
-import org.apache.iotdb.jdbc.IoTDBDataSource;
import java.sql.Types;
import java.util.Collections;
-
public class Main {
- public static void main(String[] args) {
- IoTDBDataSource dataSource = new IoTDBDataSource();
-
dataSource.setUrl("jdbc:iotdb://127.0.0.1:6667/test?sql_dialect=table");
- dataSource.setUser("root");
- dataSource.setPassword("root");
- FastAutoGenerator generator = FastAutoGenerator.create(new
DataSourceConfig.Builder(dataSource).driverClassName("org.apache.iotdb.jdbc.IoTDBDriver"));
- generator
- .globalConfig(builder -> {
- builder.author("IoTDB")
- .enableSwagger()
- .dateType(DateType.ONLY_DATE)
-
.outputDir("/apache/iotdb-extras/examples/mybatisplus-generator/src/main/java/");
- })
- .packageConfig(builder -> {
- builder.parent("org.apache.iotdb")
- .mapper("mapper")
- .pathInfo(Collections.singletonMap(OutputFile.xml,
"/apache/iotdb-extras/examples/mybatisplus-generator/src/main/java/"));
- })
- .dataSourceConfig(builder -> {
- builder.typeConvertHandler((globalConfig, typeRegistry,
metaInfo) -> {
- int typeCode = metaInfo.getJdbcType().TYPE_CODE;
- switch (typeCode) {
- case Types.FLOAT:
- return DbColumnType.FLOAT;
- default:
- return typeRegistry.getColumnType(metaInfo);
- }
- });
- })
- .strategyConfig(builder -> {
- builder.addInclude("mix");
- builder.entityBuilder()
- .enableLombok()
- .addIgnoreColumns("create_time")
- .enableFileOverride();
- builder.serviceBuilder()
- .formatServiceFileName("%sService")
- .formatServiceImplFileName("%sServiceImpl")
- .convertServiceFileName((entityName -> entityName
+ "Service"))
- .enableFileOverride();
- builder.controllerBuilder()
- .enableRestStyle()
- .enableFileOverride();
- })
- .execute();
- }
+ public static void main(String[] args) {
+ IoTDBDataSource dataSource = new IoTDBDataSource();
+ dataSource.setUrl("jdbc:iotdb://127.0.0.1:6667/test?sql_dialect=table");
+ dataSource.setUser("root");
+ dataSource.setPassword("root");
+ FastAutoGenerator generator =
+ FastAutoGenerator.create(
+ new DataSourceConfig.Builder(dataSource)
+ .driverClassName("org.apache.iotdb.jdbc.IoTDBDriver"));
+ generator
+ .globalConfig(
+ builder -> {
+ builder
+ .author("IoTDB")
+ .enableSwagger()
+ .dateType(DateType.ONLY_DATE)
+
.outputDir("/apache/iotdb-extras/examples/mybatisplus-generator/src/main/java/");
+ })
+ .packageConfig(
+ builder -> {
+ builder
+ .parent("org.apache.iotdb")
+ .mapper("mapper")
+ .pathInfo(
+ Collections.singletonMap(
+ OutputFile.xml,
+
"/apache/iotdb-extras/examples/mybatisplus-generator/src/main/java/"));
+ })
+ .dataSourceConfig(
+ builder -> {
+ builder.typeConvertHandler(
+ (globalConfig, typeRegistry, metaInfo) -> {
+ int typeCode = metaInfo.getJdbcType().TYPE_CODE;
+ switch (typeCode) {
+ case Types.FLOAT:
+ return DbColumnType.FLOAT;
+ default:
+ return typeRegistry.getColumnType(metaInfo);
+ }
+ });
+ })
+ .strategyConfig(
+ builder -> {
+ builder.addInclude("mix");
+ builder
+ .entityBuilder()
+ .enableLombok()
+ .addIgnoreColumns("create_time")
+ .enableFileOverride();
+ builder
+ .serviceBuilder()
+ .formatServiceFileName("%sService")
+ .formatServiceImplFileName("%sServiceImpl")
+ .convertServiceFileName((entityName -> entityName +
"Service"))
+ .enableFileOverride();
+
builder.controllerBuilder().enableRestStyle().enableFileOverride();
+ })
+ .execute();
+ }
}
diff --git a/examples/pom.xml b/examples/pom.xml
index f743e7b..3c99c7f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -38,7 +38,17 @@
<module>rabbitmq</module>
<module>rocketmq</module>
<module>spark-table</module>
+ <module>mybatis-generator</module>
</modules>
+ <profiles>
+ <profile>
+ <id>with-springboot</id>
+ <modules>
+ <module>iotdb-spring-boot-start</module>
+ <module>mybatisplus-generator</module>
+ </modules>
+ </profile>
+ </profiles>
<build>
<pluginManagement>
<plugins>
diff --git a/iotdb-spring-boot-starter/pom.xml
b/iotdb-spring-boot-starter/pom.xml
index 03e831a..cd2ad44 100644
--- a/iotdb-spring-boot-starter/pom.xml
+++ b/iotdb-spring-boot-starter/pom.xml
@@ -22,42 +22,86 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.4.5</version>
- <relativePath/>
- <!-- lookup parent from repository -->
+ <groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-extras-parent</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-spring-boot-starter</artifactId>
+ <name>IoTDB Extras: SpringBoot Starter</name>
<version>2.0.2-SNAPSHOT</version>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring-boot3.version>3.4.5</spring-boot3.version>
- <iotdb.version>2.0.2</iotdb.version>
+ <spring-boot.version>3.4.5</spring-boot.version>
+ <spring.version>6.2.6</spring.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.iotdb</groupId>
+ <artifactId>isession</artifactId>
+ <version>${iotdb.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-session</artifactId>
<version>${iotdb.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot</artifactId>
+ <version>${spring-boot.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot3.version}</version>
+ <version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
- <version>${spring-boot3.version}</version>
+ <version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
- <version>${spring-boot3.version}</version>
+ <version>${spring-boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <ignoredDependencies>
+ <!-- For some reason this plugin missed it being used
for a constant import -->
+
<ignoredDependency>org.apache.iotdb:isession</ignoredDependency>
+ </ignoredDependencies>
+ <usedDependencies>
+ <!-- These are used at runtime in tests -->
+
<usedDependency>org.springframework.boot:spring-boot-starter</usedDependency>
+
<usedDependency>org.springframework.boot:spring-boot-configuration-processor</usedDependency>
+ </usedDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
index b61ee8d..25c2212 100644
---
a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
+++
b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
@@ -21,154 +21,154 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "iotdb.session")
public class IoTDBSessionProperties {
- private String url;
- private String username;
- private String password;
- private String database;
- private String sql_dialect = "table";
- private Integer max_size = 5;
- private Integer fetch_size = 1024;
- private long query_timeout_in_ms = 60000L;
- private boolean enable_auto_fetch = true;
- private boolean use_ssl = false;
- private int max_retry_count = 60;
- private long wait_to_get_session_timeout_in_msit = 60000L;
- private boolean enable_compression = false;
- private long retry_interval_in_ms = 500L;
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getDatabase() {
- return database;
- }
-
- public void setDatabase(String database) {
- this.database = database;
- }
-
- public String getSql_dialect() {
- return sql_dialect;
- }
-
- public void setSql_dialect(String sql_dialect) {
- this.sql_dialect = sql_dialect;
- }
-
- public Integer getMax_size() {
- return max_size;
- }
-
- public void setMax_size(Integer max_size) {
- this.max_size = max_size;
- }
-
- public Integer getFetch_size() {
- return fetch_size;
- }
-
- public void setFetch_size(Integer fetch_size) {
- this.fetch_size = fetch_size;
- }
-
- public Long getQuery_timeout_in_ms() {
- return query_timeout_in_ms;
- }
-
- public void setQuery_timeout_in_ms(Long query_timeout_in_ms) {
- this.query_timeout_in_ms = query_timeout_in_ms;
- }
-
- public Boolean getEnable_auto_fetch() {
- return enable_auto_fetch;
- }
-
- public void setEnable_auto_fetch(Boolean enable_auto_fetch) {
- this.enable_auto_fetch = enable_auto_fetch;
- }
-
- public Boolean getUse_ssl() {
- return use_ssl;
- }
-
- public void setUse_ssl(Boolean use_ssl) {
- this.use_ssl = use_ssl;
- }
-
- public Integer getMax_retry_count() {
- return max_retry_count;
- }
-
- public void setMax_retry_count(Integer max_retry_count) {
- this.max_retry_count = max_retry_count;
- }
-
- public void setQuery_timeout_in_ms(long query_timeout_in_ms) {
- this.query_timeout_in_ms = query_timeout_in_ms;
- }
-
- public boolean isEnable_auto_fetch() {
- return enable_auto_fetch;
- }
-
- public void setEnable_auto_fetch(boolean enable_auto_fetch) {
- this.enable_auto_fetch = enable_auto_fetch;
- }
+ private String url;
+ private String username;
+ private String password;
+ private String database;
+ private String sql_dialect = "table";
+ private Integer max_size = 5;
+ private Integer fetch_size = 1024;
+ private long query_timeout_in_ms = 60000L;
+ private boolean enable_auto_fetch = true;
+ private boolean use_ssl = false;
+ private int max_retry_count = 60;
+ private long wait_to_get_session_timeout_in_msit = 60000L;
+ private boolean enable_compression = false;
+ private long retry_interval_in_ms = 500L;
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getDatabase() {
+ return database;
+ }
+
+ public void setDatabase(String database) {
+ this.database = database;
+ }
+
+ public String getSql_dialect() {
+ return sql_dialect;
+ }
+
+ public void setSql_dialect(String sql_dialect) {
+ this.sql_dialect = sql_dialect;
+ }
+
+ public Integer getMax_size() {
+ return max_size;
+ }
+
+ public void setMax_size(Integer max_size) {
+ this.max_size = max_size;
+ }
+
+ public Integer getFetch_size() {
+ return fetch_size;
+ }
+
+ public void setFetch_size(Integer fetch_size) {
+ this.fetch_size = fetch_size;
+ }
+
+ public Long getQuery_timeout_in_ms() {
+ return query_timeout_in_ms;
+ }
+
+ public void setQuery_timeout_in_ms(Long query_timeout_in_ms) {
+ this.query_timeout_in_ms = query_timeout_in_ms;
+ }
+
+ public Boolean getEnable_auto_fetch() {
+ return enable_auto_fetch;
+ }
+
+ public void setEnable_auto_fetch(Boolean enable_auto_fetch) {
+ this.enable_auto_fetch = enable_auto_fetch;
+ }
+
+ public Boolean getUse_ssl() {
+ return use_ssl;
+ }
+
+ public void setUse_ssl(Boolean use_ssl) {
+ this.use_ssl = use_ssl;
+ }
+
+ public Integer getMax_retry_count() {
+ return max_retry_count;
+ }
+
+ public void setMax_retry_count(Integer max_retry_count) {
+ this.max_retry_count = max_retry_count;
+ }
+
+ public void setQuery_timeout_in_ms(long query_timeout_in_ms) {
+ this.query_timeout_in_ms = query_timeout_in_ms;
+ }
+
+ public boolean isEnable_auto_fetch() {
+ return enable_auto_fetch;
+ }
+
+ public void setEnable_auto_fetch(boolean enable_auto_fetch) {
+ this.enable_auto_fetch = enable_auto_fetch;
+ }
- public boolean isUse_ssl() {
- return use_ssl;
- }
+ public boolean isUse_ssl() {
+ return use_ssl;
+ }
- public void setUse_ssl(boolean use_ssl) {
- this.use_ssl = use_ssl;
- }
+ public void setUse_ssl(boolean use_ssl) {
+ this.use_ssl = use_ssl;
+ }
- public void setMax_retry_count(int max_retry_count) {
- this.max_retry_count = max_retry_count;
- }
+ public void setMax_retry_count(int max_retry_count) {
+ this.max_retry_count = max_retry_count;
+ }
- public long getWait_to_get_session_timeout_in_msit() {
- return wait_to_get_session_timeout_in_msit;
- }
+ public long getWait_to_get_session_timeout_in_msit() {
+ return wait_to_get_session_timeout_in_msit;
+ }
- public void setWait_to_get_session_timeout_in_msit(long
wait_to_get_session_timeout_in_msit) {
- this.wait_to_get_session_timeout_in_msit =
wait_to_get_session_timeout_in_msit;
- }
+ public void setWait_to_get_session_timeout_in_msit(long
wait_to_get_session_timeout_in_msit) {
+ this.wait_to_get_session_timeout_in_msit =
wait_to_get_session_timeout_in_msit;
+ }
- public boolean isEnable_compression() {
- return enable_compression;
- }
+ public boolean isEnable_compression() {
+ return enable_compression;
+ }
- public void setEnable_compression(boolean enable_compression) {
- this.enable_compression = enable_compression;
- }
+ public void setEnable_compression(boolean enable_compression) {
+ this.enable_compression = enable_compression;
+ }
- public long getRetry_interval_in_ms() {
- return retry_interval_in_ms;
- }
+ public long getRetry_interval_in_ms() {
+ return retry_interval_in_ms;
+ }
- public void setRetry_interval_in_ms(long retry_interval_in_ms) {
- this.retry_interval_in_ms = retry_interval_in_ms;
- }
-}
\ No newline at end of file
+ public void setRetry_interval_in_ms(long retry_interval_in_ms) {
+ this.retry_interval_in_ms = retry_interval_in_ms;
+ }
+}
diff --git
a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
index 8914cdd..5267c92 100644
---
a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
+++
b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
@@ -22,6 +22,7 @@ import org.apache.iotdb.isession.pool.ISessionPool;
import org.apache.iotdb.isession.pool.ITableSessionPool;
import org.apache.iotdb.session.pool.SessionPool;
import org.apache.iotdb.session.pool.TableSessionPoolBuilder;
+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@ -34,62 +35,64 @@ import java.util.Arrays;
@EnableConfigurationProperties(IoTDBSessionProperties.class)
public class IoTDBSessionPool {
- private final IoTDBSessionProperties properties;
- private ITableSessionPool tableSessionPool;
- private ISessionPool treeSessionPool;
+ private final IoTDBSessionProperties properties;
+ private ITableSessionPool tableSessionPool;
+ private ISessionPool treeSessionPool;
- public IoTDBSessionPool(IoTDBSessionProperties properties) {
- this.properties = properties;
- }
+ public IoTDBSessionPool(IoTDBSessionProperties properties) {
+ this.properties = properties;
+ }
- @Bean
- public ITableSessionPool tableSessionPool() {
- if(tableSessionPool == null) {
- synchronized (IoTDBSessionPool.class) {
- if(tableSessionPool == null) {
- tableSessionPool = new TableSessionPoolBuilder().
-
nodeUrls(Arrays.asList(properties.getUrl().split(";"))).
- user(properties.getUsername()).
- password(properties.getPassword()).
- database(properties.getDatabase()).
- maxSize(properties.getMax_size()).
- fetchSize(properties.getFetch_size()).
- enableAutoFetch(properties.getEnable_auto_fetch()).
- useSSL(properties.getUse_ssl()).
-
queryTimeoutInMs(properties.getQuery_timeout_in_ms()).
- maxRetryCount(properties.getMax_retry_count()).
-
waitToGetSessionTimeoutInMs(properties.getQuery_timeout_in_ms()).
-
enableCompression(properties.isEnable_compression()).
-
retryIntervalInMs(properties.getRetry_interval_in_ms()).
- build();
- }
- }
+ @Bean
+ public ITableSessionPool tableSessionPool() {
+ if (tableSessionPool == null) {
+ synchronized (IoTDBSessionPool.class) {
+ if (tableSessionPool == null) {
+ tableSessionPool =
+ new TableSessionPoolBuilder()
+ .nodeUrls(Arrays.asList(properties.getUrl().split(";")))
+ .user(properties.getUsername())
+ .password(properties.getPassword())
+ .database(properties.getDatabase())
+ .maxSize(properties.getMax_size())
+ .fetchSize(properties.getFetch_size())
+ .enableAutoFetch(properties.getEnable_auto_fetch())
+ .useSSL(properties.getUse_ssl())
+ .queryTimeoutInMs(properties.getQuery_timeout_in_ms())
+ .maxRetryCount(properties.getMax_retry_count())
+
.waitToGetSessionTimeoutInMs(properties.getQuery_timeout_in_ms())
+ .enableCompression(properties.isEnable_compression())
+ .retryIntervalInMs(properties.getRetry_interval_in_ms())
+ .build();
}
- return tableSessionPool;
+ }
}
+ return tableSessionPool;
+ }
- @Bean
- public ISessionPool treeSessionPool() {
- if(treeSessionPool == null) {
- synchronized (IoTDBSessionPool.class) {
- if(treeSessionPool == null) {
- treeSessionPool = new SessionPool.Builder().
-
nodeUrls(Arrays.asList(properties.getUrl().split(";"))).
- user(properties.getUsername()).
- password(properties.getPassword()).
- maxSize(properties.getMax_size()).
- fetchSize(properties.getFetch_size()).
- enableAutoFetch(properties.getEnable_auto_fetch()).
- useSSL(properties.getUse_ssl()).
-
queryTimeoutInMs(properties.getQuery_timeout_in_ms()).
- maxRetryCount(properties.getMax_retry_count()).
-
waitToGetSessionTimeoutInMs(properties.getQuery_timeout_in_ms()).
-
enableCompression(properties.isEnable_compression()).
-
retryIntervalInMs(properties.getRetry_interval_in_ms()).
- build();
- }
- }
+ @Bean
+ public ISessionPool treeSessionPool() {
+ if (treeSessionPool == null) {
+ synchronized (IoTDBSessionPool.class) {
+ if (treeSessionPool == null) {
+ treeSessionPool =
+ new SessionPool.Builder()
+ .nodeUrls(Arrays.asList(properties.getUrl().split(";")))
+ .user(properties.getUsername())
+ .password(properties.getPassword())
+ .maxSize(properties.getMax_size())
+ .fetchSize(properties.getFetch_size())
+ .enableAutoFetch(properties.getEnable_auto_fetch())
+ .useSSL(properties.getUse_ssl())
+ .queryTimeoutInMs(properties.getQuery_timeout_in_ms())
+ .maxRetryCount(properties.getMax_retry_count())
+
.waitToGetSessionTimeoutInMs(properties.getQuery_timeout_in_ms())
+ .enableCompression(properties.isEnable_compression())
+ .retryIntervalInMs(properties.getRetry_interval_in_ms())
+ .build();
}
- return treeSessionPool;
+ }
}
+ return treeSessionPool;
+ }
}
diff --git a/mybatis-generator/pom.xml b/mybatis-generator/pom.xml
index 43ec0e4..803d02c 100644
--- a/mybatis-generator/pom.xml
+++ b/mybatis-generator/pom.xml
@@ -8,6 +8,7 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>mybatis-generator-plugin</artifactId>
+ <name>IoTDB Extras: Mybatis Generator Plugin</name>
<version>2.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<licenses>
diff --git a/pom.xml b/pom.xml
index ef373b3..3489037 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2069,6 +2069,12 @@
<spotless.skip>true</spotless.skip>
</properties>
</profile>
+ <profile>
+ <id>with-springboot</id>
+ <modules>
+ <module>iotdb-spring-boot-starter</module>
+ </modules>
+ </profile>
<!-- Make sure the source assembly has the right name -->
<profile>
<id>apache-release</id>
