未验证 提交 40617cd3 编写于 作者: J Jackie Tien 提交者: GitHub

Revert removed dependencies to avoid write performance declining (#10921)

上级 0cd30225
...@@ -268,6 +268,7 @@ org.osgi:org.osgi.core:6.0.0 ...@@ -268,6 +268,7 @@ org.osgi:org.osgi.core:6.0.0
org.osgi:osgi.cmpn:6.0.0 org.osgi:osgi.cmpn:6.0.0
org.ops4j.pax.jdbc:pax-jdbc-common:1.4.5 org.ops4j.pax.jdbc:pax-jdbc-common:1.4.5
org.xerial.snappy:snappy-java:1.1.8.4 org.xerial.snappy:snappy-java:1.1.8.4
io.airlift.airline:0.8
net.minidev:accessors-smart:1.2 net.minidev:accessors-smart:1.2
...@@ -303,6 +304,7 @@ CDDL 1.1 ...@@ -303,6 +304,7 @@ CDDL 1.1
javax.annotation:javax.annotation-api:1.3.2 javax.annotation:javax.annotation-api:1.3.2
javax.servlet:javax.servlet-api:3.1.0 javax.servlet:javax.servlet-api:3.1.0
javax.xml.bind:jaxb-api:2.4.0-b180725.0427 javax.xml.bind:jaxb-api:2.4.0-b180725.0427
org.glassfish.jaxb:jaxb-runtime:2.4.0-b180725.0644
Public Domain Public Domain
......
...@@ -223,6 +223,20 @@ ...@@ -223,6 +223,20 @@
<groupId>io.airlift</groupId> <groupId>io.airlift</groupId>
<artifactId>stats</artifactId> <artifactId>stats</artifactId>
</dependency> </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>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
......
...@@ -40,13 +40,13 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePie ...@@ -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.FragInstanceDispatchResult;
import org.apache.iotdb.db.queryengine.plan.scheduler.IFragInstanceDispatcher; import org.apache.iotdb.db.queryengine.plan.scheduler.IFragInstanceDispatcher;
import org.apache.iotdb.db.storageengine.StorageEngine; 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.TLoadCommandReq;
import org.apache.iotdb.mpp.rpc.thrift.TLoadResp; import org.apache.iotdb.mpp.rpc.thrift.TLoadResp;
import org.apache.iotdb.mpp.rpc.thrift.TTsFilePieceReq; import org.apache.iotdb.mpp.rpc.thrift.TTsFilePieceReq;
import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.rpc.TSStatusCode;
import io.airlift.concurrent.SetThreadName;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
......
...@@ -25,9 +25,19 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; ...@@ -25,9 +25,19 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.Binary;
import com.google.common.base.Throwables; 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 org.apache.commons.lang3.StringUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
@SuppressWarnings("java:S106") // for console outputs @SuppressWarnings("java:S106") // for console outputs
public class CommonUtils { public class CommonUtils {
...@@ -213,6 +223,39 @@ public class CommonUtils { ...@@ -213,6 +223,39 @@ public class CommonUtils {
throw new QueryProcessException("The BOOLEAN should be true/TRUE, false/FALSE or 0/1"); 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) { private static void badUse(Exception e) {
System.out.println("node-tool: " + e.getMessage()); System.out.println("node-tool: " + e.getMessage());
System.out.println("See 'node-tool help' or 'node-tool help <command>'."); System.out.println("See 'node-tool help' or 'node-tool help <command>'.");
......
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
we'll stay at 0.14.1. we'll stay at 0.14.1.
--> -->
<thrift.version>0.14.1</thrift.version> <thrift.version>0.14.1</thrift.version>
<airline.version>0.8</airline.version>
<jackson.version>2.13.5</jackson.version> <jackson.version>2.13.5</jackson.version>
<disrupter.version>3.4.2</disrupter.version> <disrupter.version>3.4.2</disrupter.version>
<jackson.databind.version>2.13.4.2</jackson.databind.version> <jackson.databind.version>2.13.4.2</jackson.databind.version>
...@@ -165,6 +166,7 @@ ...@@ -165,6 +166,7 @@
<javax.annotation-api.version>1.3.2</javax.annotation-api.version> <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<log4j.version>1.2.24</log4j.version> <log4j.version>1.2.24</log4j.version>
<lz4-java.version>1.8.0</lz4-java.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> <mockito-core.version>2.23.4</mockito-core.version>
<objenesis.version>3.2</objenesis.version> <objenesis.version>3.2</objenesis.version>
<powermock-core.version>2.0.9</powermock-core.version> <powermock-core.version>2.0.9</powermock-core.version>
...@@ -395,6 +397,22 @@ ...@@ -395,6 +397,22 @@
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core-asl</artifactId>
<version>${jackson-core-asl.version}</version> <version>${jackson-core-asl.version}</version>
</dependency> </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> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
...@@ -486,6 +504,11 @@ ...@@ -486,6 +504,11 @@
<artifactId>units</artifactId> <artifactId>units</artifactId>
<version>${io.airlift.units.version}</version> <version>${io.airlift.units.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.airlift</groupId>
<artifactId>airline</artifactId>
<version>${airline.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.airlift</groupId> <groupId>io.airlift</groupId>
<artifactId>slice</artifactId> <artifactId>slice</artifactId>
...@@ -1203,6 +1226,10 @@ ...@@ -1203,6 +1226,10 @@
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
</dependencies> </dependencies>
</profile> </profile>
<!-- Add argLine for Java 16 and above, due to [JEP 396: Strongly Encapsulate JDK Internals by Default] <!-- Add argLine for Java 16 and above, due to [JEP 396: Strongly Encapsulate JDK Internals by Default]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册