This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch remove_influx in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f657940115050a35766baa49f97b47d22073442a Author: HTHou <[email protected]> AuthorDate: Tue Aug 8 18:11:33 2023 +0800 Totally remove influxdb-protocol related files --- iotdb-client/service-rpc/pom.xml | 5 ----- .../main/java/org/apache/iotdb/rpc/RpcUtils.java | 25 ---------------------- .../iotdb/rpc/StatementExecutionException.java | 6 ------ 3 files changed, 36 deletions(-) diff --git a/iotdb-client/service-rpc/pom.xml b/iotdb-client/service-rpc/pom.xml index 86dca5ca52c..05c33078ee8 100644 --- a/iotdb-client/service-rpc/pom.xml +++ b/iotdb-client/service-rpc/pom.xml @@ -123,11 +123,6 @@ <artifactId>iotdb-thrift</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.iotdb</groupId> - <artifactId>influxdb-thrift</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java index 46326ff443b..fbe805bd07f 100644 --- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java +++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java @@ -21,7 +21,6 @@ package org.apache.iotdb.rpc; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.protocol.influxdb.rpc.thrift.InfluxTSStatus; import org.apache.iotdb.service.rpc.thrift.IClientRPCService; import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementResp; import org.apache.iotdb.service.rpc.thrift.TSFetchResultsResp; @@ -89,20 +88,6 @@ public class RpcUtils { } } - /** - * verify success. - * - * @param status -status - */ - public static void verifySuccess(InfluxTSStatus status) throws StatementExecutionException { - if (status.getCode() == TSStatusCode.REDIRECTION_RECOMMEND.getStatusCode()) { - return; - } - if (status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { - throw new StatementExecutionException(status); - } - } - public static void verifySuccessWithRedirection(TSStatus status) throws StatementExecutionException, RedirectException { verifySuccess(status); @@ -171,16 +156,6 @@ public class RpcUtils { return status; } - public static InfluxTSStatus getInfluxDBStatus(TSStatusCode tsStatusCode) { - return new InfluxTSStatus(tsStatusCode.getStatusCode()); - } - - public static InfluxTSStatus getInfluxDBStatus(int code, String message) { - InfluxTSStatus status = new InfluxTSStatus(code); - status.setMessage(message); - return status; - } - public static TSExecuteStatementResp getTSExecuteStatementResp(TSStatusCode tsStatusCode) { TSStatus status = getStatus(tsStatusCode); return getTSExecuteStatementResp(status); diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/StatementExecutionException.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/StatementExecutionException.java index 845b64d5cf4..0752931e56e 100644 --- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/StatementExecutionException.java +++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/StatementExecutionException.java @@ -20,7 +20,6 @@ package org.apache.iotdb.rpc; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.protocol.influxdb.rpc.thrift.InfluxTSStatus; public class StatementExecutionException extends Exception { @@ -31,11 +30,6 @@ public class StatementExecutionException extends Exception { this.statusCode = status.code; } - public StatementExecutionException(InfluxTSStatus status) { - super(String.format("%d: %s", status.code, status.message)); - this.statusCode = status.code; - } - public StatementExecutionException(String reason) { super(reason); }
