You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2023/08/15 12:11:18 UTC
[iotdb] branch airline-delete created (now 0a4c6958a57)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch airline-delete
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 0a4c6958a57 delete jaxb-runtime
This branch includes the following new commits:
new bc05f56cf6f Delete airline
new 8fc4088a2af Delete concurrent-200
new 0a4c6958a57 delete jaxb-runtime
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 02/03: Delete concurrent-200
Posted by ja...@apache.org.
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 8fc4088a2af687efcad2c4452f02283e4798c8a9
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Aug 15 16:47:28 2023 +0800
Delete concurrent-200
---
iotdb-core/datanode/pom.xml | 4 ----
.../db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml
index 29dd3912020..3a242e17f8a 100644
--- a/iotdb-core/datanode/pom.xml
+++ b/iotdb-core/datanode/pom.xml
@@ -223,10 +223,6 @@
<groupId>io.airlift</groupId>
<artifactId>stats</artifactId>
</dependency>
- <dependency>
- <groupId>io.airlift</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java
index 075c6e1433a..fdab6fd6b23 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java
@@ -40,13 +40,13 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePie
import org.apache.iotdb.db.queryengine.plan.scheduler.FragInstanceDispatchResult;
import org.apache.iotdb.db.queryengine.plan.scheduler.IFragInstanceDispatcher;
import org.apache.iotdb.db.storageengine.StorageEngine;
+import org.apache.iotdb.db.utils.SetThreadName;
import org.apache.iotdb.mpp.rpc.thrift.TLoadCommandReq;
import org.apache.iotdb.mpp.rpc.thrift.TLoadResp;
import org.apache.iotdb.mpp.rpc.thrift.TTsFilePieceReq;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
-import io.airlift.concurrent.SetThreadName;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
[iotdb] 01/03: Delete airline
Posted by ja...@apache.org.
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 <ja...@gmail.com>
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>
[iotdb] 03/03: delete jaxb-runtime
Posted by ja...@apache.org.
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 0a4c6958a57eb4356d859f5158d0eafd16facb65
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Aug 15 20:11:02 2023 +0800
delete jaxb-runtime
---
LICENSE-binary | 1 -
pom.xml | 22 +---------------------
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index ffa062f186d..9354552b789 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -303,7 +303,6 @@ CDDL 1.1
javax.annotation:javax.annotation-api:1.3.2
javax.servlet:javax.servlet-api:3.1.0
javax.xml.bind:jaxb-api:2.4.0-b180725.0427
-org.glassfish.jaxb:jaxb-runtime:2.4.0-b180725.0644
Public Domain
diff --git a/pom.xml b/pom.xml
index ebba73be92e..733f147ec93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,7 +165,6 @@
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<log4j.version>1.2.24</log4j.version>
<lz4-java.version>1.8.0</lz4-java.version>
- <jaxb-runtime.version>3.0.2</jaxb-runtime.version>
<mockito-core.version>2.23.4</mockito-core.version>
<objenesis.version>3.2</objenesis.version>
<powermock-core.version>2.0.9</powermock-core.version>
@@ -397,22 +396,7 @@
<artifactId>jackson-core-asl</artifactId>
<version>${jackson-core-asl.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${jaxb-runtime.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.24.1-GA</version>
- </dependency>-->
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@ -1226,10 +1210,6 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </dependency>
</dependencies>
</profile>
<!-- Add argLine for Java 16 and above, due to [JEP 396: Strongly Encapsulate JDK Internals by Default]