This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch mpp_rest in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0c3b4d245ea83c1a5e40aeb1bb6c983258da16c4 Author: HTHou <[email protected]> AuthorDate: Thu Jun 30 16:42:44 2022 +0800 [IOTDB-3322] Support RestApi for MPP framework --- openapi/pom.xml | 26 ++++++++++++++++++++++ .../iotdb/db/conf/rest/IoTDBRestServiceConfig.java | 2 +- .../java/org/apache/iotdb/db/service/DataNode.java | 4 ++-- .../java/org/apache/iotdb/db/service/NewIoTDB.java | 4 ++-- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/openapi/pom.xml b/openapi/pom.xml index b0421a9d0a..c3310cdc54 100644 --- a/openapi/pom.xml +++ b/openapi/pom.xml @@ -89,6 +89,32 @@ <artifactId>openapi-generator-maven-plugin</artifactId> <version>${openapi.generator.version}</version> <executions> + <execution> + <id>generate-java-mpp-rest-codes</id> + <goals> + <goal>generate</goal> + </goals> + <configuration> + <inputSpec>${project.basedir}/src/main/openapi3/iotdb-rest.yaml</inputSpec> + <output>${project.build.directory}/generated-sources/java</output> + <apiPackage>org.apache.iotdb.db.protocol.mpprest</apiPackage> + <modelPackage>org.apache.iotdb.db.protocol.mpprest.model</modelPackage> + <invokerPackage>org.apache.iotdb.db.protocol.mpprest.invoker</invokerPackage> + <generatorName>jaxrs-jersey</generatorName> + <groupId>org.apache.iotdb</groupId> + <artifactId>iotdb-rest-service</artifactId> + <artifactVersion>${project.version}</artifactVersion> + <addCompileSourceRoot>true</addCompileSourceRoot> + <configOptions> + <licenseName>Apache License 2.0</licenseName> + <groupId>org.apache.iotdb</groupId> + <artifactId>iotdb-rest-service</artifactId> + <artifactVersion>${project.version}</artifactVersion> + <dateLibrary>java8</dateLibrary> + <useGzipFeature>true</useGzipFeature> + </configOptions> + </configuration> + </execution> <execution> <id>generate-java-rest-codes</id> <goals> diff --git a/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceConfig.java index ebe3a49a12..162fc47eb7 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceConfig.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceConfig.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.conf.rest; public class IoTDBRestServiceConfig { static final String CONFIG_NAME = "iotdb-rest.properties"; /** if the enableRestService is true, we will start REST Service */ - private boolean enableRestService = false; + private boolean enableRestService = true; /** set the REST Service port. */ private int restServicePort = 18080; diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java index 4762f54a41..ca980095dd 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -56,7 +56,7 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.metadata.schemaregion.SchemaEngine; import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeService; import org.apache.iotdb.db.mpp.execution.schedule.DriverScheduler; -import org.apache.iotdb.db.protocol.rest.RestService; +import org.apache.iotdb.db.protocol.mpprest.MPPRestService; import org.apache.iotdb.db.service.basic.ServiceProvider; import org.apache.iotdb.db.service.basic.StandaloneServiceProvider; import org.apache.iotdb.db.service.metrics.MetricsService; @@ -447,7 +447,7 @@ public class DataNode implements DataNodeMBean { registerManager.register(MQTTService.getInstance()); } if (IoTDBRestServiceDescriptor.getInstance().getConfig().isEnableRestService()) { - registerManager.register(RestService.getInstance()); + registerManager.register(MPPRestService.getInstance()); } } diff --git a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java index 853931db1f..c601c9c882 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java +++ b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java @@ -44,7 +44,7 @@ import org.apache.iotdb.db.localconfignode.LocalConfigNode; import org.apache.iotdb.db.metadata.LocalSchemaProcessor; import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeService; import org.apache.iotdb.db.mpp.execution.schedule.DriverScheduler; -import org.apache.iotdb.db.protocol.rest.RestService; +import org.apache.iotdb.db.protocol.mpprest.MPPRestService; import org.apache.iotdb.db.rescon.PrimitiveArrayManager; import org.apache.iotdb.db.rescon.SystemInfo; import org.apache.iotdb.db.service.metrics.MetricsService; @@ -193,7 +193,7 @@ public class NewIoTDB implements NewIoTDBMBean { registerManager.register(MQTTService.getInstance()); } if (IoTDBRestServiceDescriptor.getInstance().getConfig().isEnableRestService()) { - registerManager.register(RestService.getInstance()); + registerManager.register(MPPRestService.getInstance()); } }
