This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch airline-delete in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bc05f56cf6fa9c2fa6e6a9be24cff718112f785e Author: JackieTien97 <[email protected]> AuthorDate: Tue Aug 15 16:26:20 2023 +0800 Delete airline --- LICENSE-binary | 1 - iotdb-core/datanode/pom.xml | 10 ----- .../org/apache/iotdb/db/utils/CommonUtils.java | 43 ---------------------- pom.xml | 6 --- 4 files changed, 60 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 16ce4641f27..ffa062f186d 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -268,7 +268,6 @@ org.osgi:org.osgi.core:6.0.0 org.osgi:osgi.cmpn:6.0.0 org.ops4j.pax.jdbc:pax-jdbc-common:1.4.5 org.xerial.snappy:snappy-java:1.1.8.4 -io.airlift.airline:0.8 net.minidev:accessors-smart:1.2 diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index 375781bb686..29dd3912020 100644 --- a/iotdb-core/datanode/pom.xml +++ b/iotdb-core/datanode/pom.xml @@ -223,16 +223,6 @@ <groupId>io.airlift</groupId> <artifactId>stats</artifactId> </dependency> - <dependency> - <groupId>io.airlift</groupId> - <artifactId>airline</artifactId> - <exclusions> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>io.airlift</groupId> <artifactId>concurrent</artifactId> diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java index de6d3cec39f..8c93bacb3f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java @@ -25,19 +25,9 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.utils.Binary; import com.google.common.base.Throwables; -import io.airlift.airline.Cli; -import io.airlift.airline.Help; -import io.airlift.airline.ParseArgumentsMissingException; -import io.airlift.airline.ParseArgumentsUnexpectedException; -import io.airlift.airline.ParseCommandMissingException; -import io.airlift.airline.ParseCommandUnrecognizedException; -import io.airlift.airline.ParseOptionConversionException; -import io.airlift.airline.ParseOptionMissingException; -import io.airlift.airline.ParseOptionMissingValueException; import org.apache.commons.lang3.StringUtils; import java.util.Arrays; -import java.util.List; @SuppressWarnings("java:S106") // for console outputs public class CommonUtils { @@ -223,39 +213,6 @@ public class CommonUtils { throw new QueryProcessException("The BOOLEAN should be true/TRUE, false/FALSE or 0/1"); } - public static int runCli( - List<Class<? extends Runnable>> commands, - String[] args, - String cliName, - String cliDescription) { - Cli.CliBuilder<Runnable> builder = Cli.builder(cliName); - - builder.withDescription(cliDescription).withDefaultCommand(Help.class).withCommands(commands); - - Cli<Runnable> parser = builder.build(); - - int status = 0; - try { - Runnable parse = parser.parse(args); - parse.run(); - } catch (IllegalArgumentException - | IllegalStateException - | ParseArgumentsMissingException - | ParseArgumentsUnexpectedException - | ParseOptionConversionException - | ParseOptionMissingException - | ParseOptionMissingValueException - | ParseCommandMissingException - | ParseCommandUnrecognizedException e) { - badUse(e); - status = 1; - } catch (Exception e) { - err(Throwables.getRootCause(e)); - status = 2; - } - return status; - } - private static void badUse(Exception e) { System.out.println("node-tool: " + e.getMessage()); System.out.println("See 'node-tool help' or 'node-tool help <command>'."); diff --git a/pom.xml b/pom.xml index 1ca78c7c380..ebba73be92e 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,6 @@ we'll stay at 0.14.1. --> <thrift.version>0.14.1</thrift.version> - <airline.version>0.8</airline.version> <jackson.version>2.13.5</jackson.version> <disrupter.version>3.4.2</disrupter.version> <jackson.databind.version>2.13.4.2</jackson.databind.version> @@ -505,11 +504,6 @@ <artifactId>units</artifactId> <version>${io.airlift.units.version}</version> </dependency> - <dependency> - <groupId>io.airlift</groupId> - <artifactId>airline</artifactId> - <version>${airline.version}</version> - </dependency> <dependency> <groupId>io.airlift</groupId> <artifactId>slice</artifactId>
