You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ne...@apache.org on 2021/04/30 02:02:24 UTC
[iotdb] branch rel/0.12 updated: [To rel/0.12] [IOTDB-1339]
optimize TimeoutChangeableTSnappyFramedTransport (#3112)
This is an automated email from the ASF dual-hosted git repository.
neuyilan pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.12 by this push:
new 771e11c [To rel/0.12] [IOTDB-1339] optimize TimeoutChangeableTSnappyFramedTransport (#3112)
771e11c is described below
commit 771e11c1f85f818e8c91241f9aba5674e14511c0
Author: wangchao316 <66...@users.noreply.github.com>
AuthorDate: Fri Apr 30 10:01:53 2021 +0800
[To rel/0.12] [IOTDB-1339] optimize TimeoutChangeableTSnappyFramedTransport (#3112)
---
.../org/apache/iotdb/rpc/RpcTransportFactory.java | 10 ++++++----
.../rpc/TimeoutChangeableTFastFramedTransport.java | 8 +++++---
.../rpc/TimeoutChangeableTSnappyFramedTransport.java | 20 ++++++++++++++++----
3 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
index fb5e624..7fd4307 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
@@ -19,8 +19,6 @@
package org.apache.iotdb.rpc;
-import org.apache.iotdb.rpc.TimeoutChangeableTFastFramedTransport.Factory;
-
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportFactory;
@@ -37,8 +35,12 @@ public class RpcTransportFactory extends TTransportFactory {
static {
INSTANCE =
USE_SNAPPY
- ? new RpcTransportFactory(new TimeoutChangeableTSnappyFramedTransport.Factory())
- : new RpcTransportFactory(new Factory(thriftDefaultBufferSize, thriftMaxFrameSize));
+ ? new RpcTransportFactory(
+ new TimeoutChangeableTSnappyFramedTransport.Factory(
+ thriftDefaultBufferSize, thriftMaxFrameSize))
+ : new RpcTransportFactory(
+ new TimeoutChangeableTFastFramedTransport.Factory(
+ thriftDefaultBufferSize, thriftMaxFrameSize));
}
private TTransportFactory inner;
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/TimeoutChangeableTFastFramedTransport.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/TimeoutChangeableTFastFramedTransport.java
index 038f897..17f05e3 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/TimeoutChangeableTFastFramedTransport.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/TimeoutChangeableTFastFramedTransport.java
@@ -30,8 +30,9 @@ public class TimeoutChangeableTFastFramedTransport extends TElasticFramedTranspo
private TSocket underlyingSocket;
- public TimeoutChangeableTFastFramedTransport(TSocket underlying) {
- super(underlying);
+ public TimeoutChangeableTFastFramedTransport(
+ TSocket underlying, int thriftDefaultBufferSize, int thriftMaxFrameSize) {
+ super(underlying, thriftDefaultBufferSize, thriftMaxFrameSize);
this.underlyingSocket = underlying;
}
@@ -58,7 +59,8 @@ public class TimeoutChangeableTFastFramedTransport extends TElasticFramedTranspo
@Override
public TTransport getTransport(TTransport trans) {
if (trans instanceof TSocket) {
- return new TimeoutChangeableTFastFramedTransport((TSocket) trans);
+ return new TimeoutChangeableTFastFramedTransport(
+ (TSocket) trans, thriftDefaultBufferSize, thriftMaxFrameSize);
} else {
return new TElasticFramedTransport(trans, thriftDefaultBufferSize, thriftMaxFrameSize);
}
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/TimeoutChangeableTSnappyFramedTransport.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/TimeoutChangeableTSnappyFramedTransport.java
index bcb3acf..c7d8975 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/TimeoutChangeableTSnappyFramedTransport.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/TimeoutChangeableTSnappyFramedTransport.java
@@ -30,8 +30,9 @@ public class TimeoutChangeableTSnappyFramedTransport extends TSnappyElasticFrame
private TSocket underlyingSocket;
- public TimeoutChangeableTSnappyFramedTransport(TSocket underlying) {
- super(underlying);
+ public TimeoutChangeableTSnappyFramedTransport(
+ TSocket underlying, int thriftDefaultBufferSize, int thriftMaxFrameSize) {
+ super(underlying, thriftDefaultBufferSize, thriftMaxFrameSize);
this.underlyingSocket = underlying;
}
@@ -46,12 +47,23 @@ public class TimeoutChangeableTSnappyFramedTransport extends TSnappyElasticFrame
}
public static class Factory extends TTransportFactory {
+
+ private final int thriftDefaultBufferSize;
+ protected final int thriftMaxFrameSize;
+
+ public Factory(int thriftDefaultBufferSize, int thriftMaxFrameSize) {
+ this.thriftDefaultBufferSize = thriftDefaultBufferSize;
+ this.thriftMaxFrameSize = thriftMaxFrameSize;
+ }
+
@Override
public TTransport getTransport(TTransport trans) {
if (trans instanceof TSocket) {
- return new TimeoutChangeableTSnappyFramedTransport((TSocket) trans);
+ return new TimeoutChangeableTSnappyFramedTransport(
+ (TSocket) trans, thriftDefaultBufferSize, thriftMaxFrameSize);
} else {
- return new TSnappyElasticFramedTransport(trans);
+ return new TSnappyElasticFramedTransport(
+ trans, thriftDefaultBufferSize, thriftMaxFrameSize);
}
}
}