You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/12/24 06:08:31 UTC
[iotdb] branch change_transport_resize_policy updated: rename
maxSoftLength to softMaxLength
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch change_transport_resize_policy
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/change_transport_resize_policy by this push:
new 488511d rename maxSoftLength to softMaxLength
488511d is described below
commit 488511df14b6f1f6fe03992f0876c281f2bccc7e
Author: jt <jt...@163.com>
AuthorDate: Thu Dec 24 14:05:53 2020 +0800
rename maxSoftLength to softMaxLength
---
.../rpc/TCompressedElasticFramedTransport.java | 10 +++++-----
.../apache/iotdb/rpc/TElasticFramedTransport.java | 22 +++++++++++-----------
.../iotdb/rpc/TSnappyElasticFramedTransport.java | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/TCompressedElasticFramedTransport.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/TCompressedElasticFramedTransport.java
index dba5e45..4dd8cb9 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/TCompressedElasticFramedTransport.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/TCompressedElasticFramedTransport.java
@@ -36,8 +36,8 @@ public abstract class TCompressedElasticFramedTransport extends TElasticFramedTr
private int bufTooLargeCounter = MAX_BUFFER_OVERSIZE_TIME;
protected TCompressedElasticFramedTransport(TTransport underlying, int initialBufferCapacity,
- int maxSoftLength) {
- super(underlying, initialBufferCapacity, maxSoftLength);
+ int softMaxLength) {
+ super(underlying, initialBufferCapacity, softMaxLength);
writeCompressBuffer = new TByteBuffer(ByteBuffer.allocate(initialBufferCapacity));
readCompressBuffer = new TByteBuffer(ByteBuffer.allocate(initialBufferCapacity));
}
@@ -86,7 +86,7 @@ public abstract class TCompressedElasticFramedTransport extends TElasticFramedTr
int newCapacity = Math.max(growCapacity, size);
byteBuffer = new TByteBuffer(ByteBuffer.allocate(newCapacity));
bufTooLargeCounter = MAX_BUFFER_OVERSIZE_TIME;
- } else if (currentCapacity > maxSoftLength && currentCapacity * loadFactor > size
+ } else if (currentCapacity > softMaxLength && currentCapacity * loadFactor > size
&& bufTooLargeCounter-- <= 0
&& System.currentTimeMillis() - lastShrinkTime > MIN_SHRINK_INTERVAL) {
// do not shrink beneath the initial size and do not shrink too often
@@ -116,8 +116,8 @@ public abstract class TCompressedElasticFramedTransport extends TElasticFramedTr
}
writeBuffer.reset();
- if (maxSoftLength < length) {
- writeBuffer.resizeIfNecessary(maxSoftLength);
+ if (softMaxLength < length) {
+ writeBuffer.resizeIfNecessary(softMaxLength);
}
underlying.flush();
}
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/TElasticFramedTransport.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/TElasticFramedTransport.java
index 4dd288b..87ca996 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/TElasticFramedTransport.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/TElasticFramedTransport.java
@@ -31,7 +31,7 @@ public class TElasticFramedTransport extends TTransport {
public static class Factory extends TTransportFactory {
protected final int initialCapacity;
- protected final int maxSoftLength;
+ protected final int softMaxLength;
public Factory() {
this(DEFAULT_BUF_CAPACITY, DEFAULT_MAX_LENGTH);
@@ -41,14 +41,14 @@ public class TElasticFramedTransport extends TTransport {
this(initialCapacity, DEFAULT_MAX_LENGTH);
}
- public Factory(int initialCapacity, int maxSoftLength) {
+ public Factory(int initialCapacity, int softMaxLength) {
this.initialCapacity = initialCapacity;
- this.maxSoftLength = maxSoftLength;
+ this.softMaxLength = softMaxLength;
}
@Override
public TTransport getTransport(TTransport trans) {
- return new TElasticFramedTransport(trans, initialCapacity, maxSoftLength);
+ return new TElasticFramedTransport(trans, initialCapacity, softMaxLength);
}
}
@@ -56,9 +56,9 @@ public class TElasticFramedTransport extends TTransport {
this(underlying, DEFAULT_BUF_CAPACITY, DEFAULT_MAX_LENGTH);
}
- public TElasticFramedTransport(TTransport underlying, int initialBufferCapacity, int maxSoftLength) {
+ public TElasticFramedTransport(TTransport underlying, int initialBufferCapacity, int softMaxLength) {
this.underlying = underlying;
- this.maxSoftLength = maxSoftLength;
+ this.softMaxLength = softMaxLength;
readBuffer = new AutoScalingBufferReadTransport(initialBufferCapacity);
writeBuffer = new AutoScalingBufferWriteTransport(initialBufferCapacity);
}
@@ -70,7 +70,7 @@ public class TElasticFramedTransport extends TTransport {
* The shrinking is limited at most once per minute to reduce overhead when maxSoftLength is
* set unreasonably or the workload naturally contains both ver large and very small requests.
*/
- protected final int maxSoftLength;
+ protected final int softMaxLength;
protected final TTransport underlying;
protected AutoScalingBufferReadTransport readBuffer;
protected AutoScalingBufferWriteTransport writeBuffer;
@@ -120,8 +120,8 @@ public class TElasticFramedTransport extends TTransport {
+ ")!");
}
- if (size < maxSoftLength) {
- readBuffer.resizeIfNecessary(maxSoftLength);
+ if (size < softMaxLength) {
+ readBuffer.resizeIfNecessary(softMaxLength);
}
readBuffer.fill(underlying, size);
}
@@ -133,8 +133,8 @@ public class TElasticFramedTransport extends TTransport {
underlying.write(i32buf, 0, 4);
underlying.write(writeBuffer.getBuf().array(), 0, length);
writeBuffer.reset();
- if (length > maxSoftLength) {
- writeBuffer.resizeIfNecessary(maxSoftLength);
+ if (length > softMaxLength) {
+ writeBuffer.resizeIfNecessary(softMaxLength);
}
underlying.flush();
}
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/TSnappyElasticFramedTransport.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/TSnappyElasticFramedTransport.java
index 5c4ed6f..1a013ee 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/TSnappyElasticFramedTransport.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/TSnappyElasticFramedTransport.java
@@ -43,7 +43,7 @@ public class TSnappyElasticFramedTransport extends TCompressedElasticFramedTrans
@Override
public TTransport getTransport(TTransport trans) {
- return new TSnappyElasticFramedTransport(trans, initialCapacity, maxSoftLength);
+ return new TSnappyElasticFramedTransport(trans, initialCapacity, softMaxLength);
}
}