This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch yym_rpc_compress
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/yym_rpc_compress by this push:
new be542c9d09b refactor configurations
be542c9d09b is described below
commit be542c9d09bab66dc0ead4f5aedbfd215bf795fb
Author: Tian Jiang <[email protected]>
AuthorDate: Tue Jul 15 19:03:37 2025 +0800
refactor configurations
---
.../iotdb/session/it/IoTDBSessionCompressedIT.java | 12 ++--
.../apache/iotdb/tool/data/ImportDataTable.java | 2 +-
.../iotdb/tool/schema/ExportSchemaTable.java | 2 +-
.../iotdb/tool/schema/ImportSchemaTable.java | 2 +-
.../apache/iotdb/isession/pool/ISessionPool.java | 2 +-
.../iotdb/session/AbstractSessionBuilder.java | 2 +
.../java/org/apache/iotdb/session/Session.java | 29 ++++++++--
.../apache/iotdb/session/SessionConnection.java | 2 +-
.../apache/iotdb/session/TableSessionBuilder.java | 8 +--
.../session/pool/AbstractSessionPoolBuilder.java | 1 -
.../org/apache/iotdb/session/pool/SessionPool.java | 67 +++++++++++++++-------
.../session/pool/TableSessionPoolBuilder.java | 9 ++-
.../apache/iotdb/session/RpcCompressedTest.java | 12 ++--
.../apache/iotdb/session/pool/SessionPoolTest.java | 4 +-
14 files changed, 97 insertions(+), 57 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionCompressedIT.java
b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionCompressedIT.java
index 23a3ac0e5a1..82d28c34ff6 100644
---
a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionCompressedIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionCompressedIT.java
@@ -65,10 +65,9 @@ public class IoTDBSessionCompressedIT {
.nodeUrls(nodeUrls)
.username(CommonDescriptor.getInstance().getConfig().getAdminName())
.password(CommonDescriptor.getInstance().getConfig().getAdminPassword())
- .enableCompression(false)
+ .enableCompression(true)
.enableRedirection(true)
.enableAutoFetch(false)
- .isCompressed(true)
.withCompressionType(CompressionType.SNAPPY)
.withBooleanEncoding(TSEncoding.PLAIN)
.withInt32Encoding(TSEncoding.CHIMP)
@@ -86,10 +85,9 @@ public class IoTDBSessionCompressedIT {
.nodeUrls(nodeUrls)
.username(CommonDescriptor.getInstance().getConfig().getAdminName())
.password(CommonDescriptor.getInstance().getConfig().getAdminPassword())
- .enableCompression(false)
+ .enableCompression(true)
.enableRedirection(true)
.enableAutoFetch(false)
- .isCompressed(true)
.withCompressionType(CompressionType.SNAPPY)
.withBooleanEncoding(TSEncoding.PLAIN)
.withInt32Encoding(TSEncoding.SPRINTZ)
@@ -107,10 +105,9 @@ public class IoTDBSessionCompressedIT {
.nodeUrls(nodeUrls)
.username(CommonDescriptor.getInstance().getConfig().getAdminName())
.password(CommonDescriptor.getInstance().getConfig().getAdminPassword())
- .enableCompression(false)
+ .enableCompression(true)
.enableRedirection(true)
.enableAutoFetch(false)
- .isCompressed(true)
.withCompressionType(CompressionType.GZIP)
.withBooleanEncoding(TSEncoding.RLE)
.withInt32Encoding(TSEncoding.TS_2DIFF)
@@ -128,10 +125,9 @@ public class IoTDBSessionCompressedIT {
.nodeUrls(nodeUrls)
.username(CommonDescriptor.getInstance().getConfig().getAdminName())
.password(CommonDescriptor.getInstance().getConfig().getAdminPassword())
- .enableCompression(false)
+ .enableCompression(true)
.enableRedirection(true)
.enableAutoFetch(false)
- .isCompressed(true)
.withCompressionType(CompressionType.LZMA2)
.withBooleanEncoding(TSEncoding.PLAIN)
.withInt32Encoding(TSEncoding.GORILLA)
diff --git
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/ImportDataTable.java
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/ImportDataTable.java
index 1b3e2689e9c..9be471d265b 100644
---
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/ImportDataTable.java
+++
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/ImportDataTable.java
@@ -72,7 +72,7 @@ public class ImportDataTable extends AbstractImportData {
.user(username)
.password(password)
.maxSize(threadNum + 1)
- .enableCompression(false)
+ .enableThriftCompression(false)
.enableRedirection(false)
.enableAutoFetch(false)
.database(database)
diff --git
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/schema/ExportSchemaTable.java
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/schema/ExportSchemaTable.java
index e80bdeac82e..8a322665fca 100644
---
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/schema/ExportSchemaTable.java
+++
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/schema/ExportSchemaTable.java
@@ -58,7 +58,7 @@ public class ExportSchemaTable extends AbstractExportSchema {
.user(username)
.password(password)
.maxSize(threadNum + 1)
- .enableCompression(false)
+ .enableThriftCompression(false)
.enableRedirection(false)
.enableAutoFetch(false)
.database(database)
diff --git
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/schema/ImportSchemaTable.java
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/schema/ImportSchemaTable.java
index 25119e48623..c4e86fdeaad 100644
---
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/schema/ImportSchemaTable.java
+++
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/schema/ImportSchemaTable.java
@@ -54,7 +54,7 @@ public class ImportSchemaTable extends AbstractImportSchema {
.user(username)
.password(password)
.maxSize(threadNum + 1)
- .enableCompression(false)
+ .enableThriftCompression(false)
.enableRedirection(false)
.enableAutoFetch(false)
.database(database)
diff --git
a/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
b/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
index 1193435889d..acf3a9bac91 100644
---
a/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
+++
b/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
@@ -535,7 +535,7 @@ public interface ISessionPool {
long getWaitToGetSessionTimeoutInMs();
- boolean isEnableCompression();
+ boolean isEnableThriftCompression();
void setEnableRedirection(boolean enableRedirection);
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/AbstractSessionBuilder.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/AbstractSessionBuilder.java
index ec828ea2aa5..1f406f94c14 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/AbstractSessionBuilder.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/AbstractSessionBuilder.java
@@ -77,6 +77,8 @@ public abstract class AbstractSessionBuilder {
public Boolean isCompressed = false;
+ public Boolean isCompacted = false;
+
public CompressionType compressionType = CompressionType.UNCOMPRESSED;
public Map<TSDataType, TSEncoding> columnEncodersMap;
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java
index 647bc76e466..43b9a27cdc0 100644
--- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -138,6 +138,7 @@ public class Session implements ISession {
*/
private long queryTimeoutInMs = -1;
+ protected boolean enableRPCCompaction;
protected boolean enableRPCCompression;
protected int connectionTimeoutInMs;
protected ZoneId zoneId;
@@ -453,6 +454,7 @@ public class Session implements ISession {
this.defaultEndPoint = new TEndPoint(builder.host, builder.rpcPort);
this.enableQueryRedirection = builder.enableRedirection;
}
+ this.enableRPCCompaction = builder.isCompacted;
this.enableRPCCompression = builder.isCompressed;
this.compressionType = builder.compressionType;
this.columnEncodersMap = builder.columnEncodersMap;
@@ -502,12 +504,12 @@ public class Session implements ISession {
}
@Override
- public synchronized void open(boolean enableRPCCompression) throws
IoTDBConnectionException {
- open(enableRPCCompression, SessionConfig.DEFAULT_CONNECTION_TIMEOUT_MS);
+ public synchronized void open(boolean enableRPCCompaction) throws
IoTDBConnectionException {
+ open(enableRPCCompaction, SessionConfig.DEFAULT_CONNECTION_TIMEOUT_MS);
}
@Override
- public synchronized void open(boolean enableRPCCompression, int
connectionTimeoutInMs)
+ public synchronized void open(boolean enableRPCCompaction, int
connectionTimeoutInMs)
throws IoTDBConnectionException {
if (!isClosed) {
return;
@@ -537,13 +539,12 @@ public class Session implements ISession {
useSSL,
trustStore,
trustStorePwd,
- enableRPCCompression,
+ enableRPCCompaction,
version.toString());
} else {
this.availableNodes = new DummyNodesSupplier(getNodeUrls());
}
- this.enableRPCCompression = enableRPCCompression;
this.connectionTimeoutInMs = connectionTimeoutInMs;
setDefaultSessionConnection(constructSessionConnection(this,
defaultEndPoint, zoneId));
getDefaultSessionConnection().setEnableRedirect(enableQueryRedirection);
@@ -4232,6 +4233,14 @@ public class Session implements ISession {
this.defaultSessionConnection = defaultSessionConnection;
}
+ public boolean isEnableRPCCompaction() {
+ return enableRPCCompaction;
+ }
+
+ public void setEnableRPCCompaction(boolean enableRPCCompaction) {
+ this.enableRPCCompaction = enableRPCCompaction;
+ }
+
public static class Builder extends AbstractSessionBuilder {
public Builder host(String host) {
@@ -4264,6 +4273,16 @@ public class Session implements ISession {
return this;
}
+ public Builder isCompressed(boolean isCompressed) {
+ this.isCompressed = isCompressed;
+ return this;
+ }
+
+ public Builder isCompacted(boolean isCompacted) {
+ this.isCompacted = isCompacted;
+ return this;
+ }
+
public Builder thriftDefaultBufferSize(int thriftDefaultBufferSize) {
this.thriftDefaultBufferSize = thriftDefaultBufferSize;
return this;
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
index 477eba234eb..c8b94c4e6da 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
@@ -207,7 +207,7 @@ public class SessionConnection {
throw new IoTDBConnectionException(e);
}
- if (session.enableRPCCompression) {
+ if (session.enableRPCCompaction) {
client = new IClientRPCService.Client(new TCompactProtocol(transport));
} else {
client = new IClientRPCService.Client(new TBinaryProtocol(transport));
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/TableSessionBuilder.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/TableSessionBuilder.java
index 27c642507c6..6f8c8da7e05 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/TableSessionBuilder.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/TableSessionBuilder.java
@@ -247,7 +247,7 @@ public class TableSessionBuilder extends
AbstractSessionBuilder {
* @defaultValue false
*/
public TableSessionBuilder enableCompression(boolean enableCompression) {
- this.enableCompression = enableCompression;
+ this.isCompressed = enableCompression;
return this;
}
@@ -263,8 +263,8 @@ public class TableSessionBuilder extends
AbstractSessionBuilder {
return this;
}
- public TableSessionBuilder isCompressed(Boolean isCompressed) {
- this.isCompressed = isCompressed;
+ public TableSessionBuilder enableCompaction(boolean enableCompaction) {
+ this.isCompacted = enableCompaction;
return this;
}
@@ -385,7 +385,7 @@ public class TableSessionBuilder extends
AbstractSessionBuilder {
newSession.enableRPCCompression = isCompressed;
try {
- newSession.open(enableCompression, connectionTimeoutInMs);
+ newSession.open(isCompacted, connectionTimeoutInMs);
} catch (IoTDBConnectionException e) {
newSession.close();
throw e;
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/AbstractSessionPoolBuilder.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/AbstractSessionPoolBuilder.java
index cbadc8cf932..91c93d8dd63 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/AbstractSessionPoolBuilder.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/AbstractSessionPoolBuilder.java
@@ -25,6 +25,5 @@ import org.apache.iotdb.session.AbstractSessionBuilder;
public class AbstractSessionPoolBuilder extends AbstractSessionBuilder {
int maxSize = SessionConfig.DEFAULT_SESSION_POOL_MAX_SIZE;
long waitToGetSessionTimeoutInMs = 60_000;
- boolean enableCompression = false;
int connectionTimeoutInMs = SessionConfig.DEFAULT_CONNECTION_TIMEOUT_MS;
}
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
index 1ed3d7a8531..36e1888b467 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
@@ -145,7 +145,8 @@ public class SessionPool implements ISessionPool {
// parameters for Session#open()
private final int connectionTimeoutInMs;
- private final boolean enableCompression;
+ private final boolean enableIoTDBRpcCompression;
+ private final boolean enableThriftCompression;
// whether the queue is closed.
private boolean closed;
@@ -244,7 +245,12 @@ public class SessionPool implements ISessionPool {
}
public SessionPool(
- String host, int port, String user, String password, int maxSize,
boolean enableCompression) {
+ String host,
+ int port,
+ String user,
+ String password,
+ int maxSize,
+ boolean enableThriftCompression) {
this(
host,
port,
@@ -253,7 +259,7 @@ public class SessionPool implements ISessionPool {
maxSize,
SessionConfig.DEFAULT_FETCH_SIZE,
60_000,
- enableCompression,
+ enableThriftCompression,
null,
SessionConfig.DEFAULT_REDIRECTION_MODE,
SessionConfig.DEFAULT_CONNECTION_TIMEOUT_MS,
@@ -263,7 +269,11 @@ public class SessionPool implements ISessionPool {
}
public SessionPool(
- List<String> nodeUrls, String user, String password, int maxSize,
boolean enableCompression) {
+ List<String> nodeUrls,
+ String user,
+ String password,
+ int maxSize,
+ boolean enableThriftCompression) {
this(
nodeUrls,
user,
@@ -271,7 +281,7 @@ public class SessionPool implements ISessionPool {
maxSize,
SessionConfig.DEFAULT_FETCH_SIZE,
60_000,
- enableCompression,
+ enableThriftCompression,
null,
SessionConfig.DEFAULT_REDIRECTION_MODE,
SessionConfig.DEFAULT_CONNECTION_TIMEOUT_MS,
@@ -286,7 +296,7 @@ public class SessionPool implements ISessionPool {
String user,
String password,
int maxSize,
- boolean enableCompression,
+ boolean enableThriftCompression,
boolean enableRedirection) {
this(
host,
@@ -296,7 +306,7 @@ public class SessionPool implements ISessionPool {
maxSize,
SessionConfig.DEFAULT_FETCH_SIZE,
60_000,
- enableCompression,
+ enableThriftCompression,
null,
enableRedirection,
SessionConfig.DEFAULT_CONNECTION_TIMEOUT_MS,
@@ -310,7 +320,7 @@ public class SessionPool implements ISessionPool {
String user,
String password,
int maxSize,
- boolean enableCompression,
+ boolean enableThriftCompression,
boolean enableRedirection) {
this(
nodeUrls,
@@ -319,7 +329,7 @@ public class SessionPool implements ISessionPool {
maxSize,
SessionConfig.DEFAULT_FETCH_SIZE,
60_000,
- enableCompression,
+ enableThriftCompression,
null,
enableRedirection,
SessionConfig.DEFAULT_CONNECTION_TIMEOUT_MS,
@@ -374,7 +384,7 @@ public class SessionPool implements ISessionPool {
int maxSize,
int fetchSize,
long waitToGetSessionTimeoutInMs,
- boolean enableCompression,
+ boolean enableThriftCompression,
ZoneId zoneId,
boolean enableRedirection,
int connectionTimeoutInMs,
@@ -389,7 +399,8 @@ public class SessionPool implements ISessionPool {
this.password = password;
this.fetchSize = fetchSize;
this.waitToGetSessionTimeoutInMs = waitToGetSessionTimeoutInMs;
- this.enableCompression = enableCompression;
+ this.enableThriftCompression = enableThriftCompression;
+ this.enableIoTDBRpcCompression = false;
this.zoneId = zoneId;
this.enableRedirection = enableRedirection;
if (this.enableRedirection) {
@@ -413,7 +424,7 @@ public class SessionPool implements ISessionPool {
int maxSize,
int fetchSize,
long waitToGetSessionTimeoutInMs,
- boolean enableCompression,
+ boolean enableThriftCompression,
ZoneId zoneId,
boolean enableRedirection,
int connectionTimeoutInMs,
@@ -431,7 +442,8 @@ public class SessionPool implements ISessionPool {
this.password = password;
this.fetchSize = fetchSize;
this.waitToGetSessionTimeoutInMs = waitToGetSessionTimeoutInMs;
- this.enableCompression = enableCompression;
+ this.enableThriftCompression = enableThriftCompression;
+ this.enableIoTDBRpcCompression = false;
this.zoneId = zoneId;
this.enableRedirection = enableRedirection;
if (this.enableRedirection) {
@@ -458,7 +470,7 @@ public class SessionPool implements ISessionPool {
int maxSize,
int fetchSize,
long waitToGetSessionTimeoutInMs,
- boolean enableCompression,
+ boolean enableThriftCompression,
ZoneId zoneId,
boolean enableRedirection,
int connectionTimeoutInMs,
@@ -476,7 +488,8 @@ public class SessionPool implements ISessionPool {
this.password = password;
this.fetchSize = fetchSize;
this.waitToGetSessionTimeoutInMs = waitToGetSessionTimeoutInMs;
- this.enableCompression = enableCompression;
+ this.enableThriftCompression = enableThriftCompression;
+ this.enableIoTDBRpcCompression = false;
this.zoneId = zoneId;
this.enableRedirection = enableRedirection;
if (this.enableRedirection) {
@@ -498,7 +511,8 @@ public class SessionPool implements ISessionPool {
this.password = builder.pw;
this.fetchSize = builder.fetchSize;
this.waitToGetSessionTimeoutInMs = builder.waitToGetSessionTimeoutInMs;
- this.enableCompression = builder.enableCompression;
+ this.enableThriftCompression = builder.isCompacted;
+ this.enableIoTDBRpcCompression = builder.isCompressed;
this.zoneId = builder.zoneId;
this.enableRedirection = builder.enableRedirection;
if (this.enableRedirection) {
@@ -576,6 +590,8 @@ public class SessionPool implements ISessionPool {
.sqlDialect(sqlDialect)
.database(database)
.timeOut(queryTimeoutInMs)
+ .isCompressed(enableIoTDBRpcCompression)
+ .isCompacted(enableThriftCompression)
.build();
} else {
// Construct redirect-able Session
@@ -599,6 +615,8 @@ public class SessionPool implements ISessionPool {
.sqlDialect(sqlDialect)
.database(database)
.timeOut(queryTimeoutInMs)
+ .isCompressed(enableIoTDBRpcCompression)
+ .isCompacted(enableThriftCompression)
.build();
}
session.setEnableQueryRedirection(enableQueryRedirection);
@@ -636,7 +654,7 @@ public class SessionPool implements ISessionPool {
useSSL,
trustStore,
trustStorePwd,
- enableCompression,
+ enableThriftCompression,
version.toString());
}
@@ -710,7 +728,7 @@ public class SessionPool implements ISessionPool {
try {
session.open(
- enableCompression,
+ enableThriftCompression,
connectionTimeoutInMs,
deviceIdToEndpoint,
tableModelDeviceIdToEndpoint,
@@ -824,7 +842,7 @@ public class SessionPool implements ISessionPool {
Session session = constructNewSession();
try {
session.open(
- enableCompression,
+ enableThriftCompression,
connectionTimeoutInMs,
deviceIdToEndpoint,
tableModelDeviceIdToEndpoint,
@@ -3473,8 +3491,8 @@ public class SessionPool implements ISessionPool {
}
@Override
- public boolean isEnableCompression() {
- return enableCompression;
+ public boolean isEnableThriftCompression() {
+ return enableThriftCompression;
}
@Override
@@ -3663,8 +3681,13 @@ public class SessionPool implements ISessionPool {
return this;
}
+ public Builder enableCompaction(boolean enableCompaction) {
+ this.isCompacted = enableCompaction;
+ return this;
+ }
+
public Builder enableCompression(boolean enableCompression) {
- this.enableCompression = enableCompression;
+ this.isCompressed = enableCompression;
return this;
}
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/TableSessionPoolBuilder.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/TableSessionPoolBuilder.java
index 4deb9423946..dd1d5ee58d3 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/TableSessionPoolBuilder.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/TableSessionPoolBuilder.java
@@ -175,8 +175,13 @@ public class TableSessionPoolBuilder extends
AbstractSessionPoolBuilder {
* @return the current {@link TableSessionPoolBuilder} instance.
* @defaultValue false
*/
- public TableSessionPoolBuilder enableCompression(boolean enableCompression) {
- this.enableCompression = enableCompression;
+ public TableSessionPoolBuilder enableIoTDBRpcCompression(boolean
enableCompression) {
+ this.isCompressed = enableCompression;
+ return this;
+ }
+
+ public TableSessionPoolBuilder enableThriftCompression(boolean
enableCompression) {
+ this.isCompacted = enableCompression;
return this;
}
diff --git
a/iotdb-client/session/src/test/java/org/apache/iotdb/session/RpcCompressedTest.java
b/iotdb-client/session/src/test/java/org/apache/iotdb/session/RpcCompressedTest.java
index 157271317a2..7caf4dfc841 100644
---
a/iotdb-client/session/src/test/java/org/apache/iotdb/session/RpcCompressedTest.java
+++
b/iotdb-client/session/src/test/java/org/apache/iotdb/session/RpcCompressedTest.java
@@ -60,10 +60,9 @@ public class RpcCompressedTest {
.nodeUrls(nodeUrls)
.username("root")
.password("root")
- .enableCompression(false)
+ .enableCompression(true)
.enableRedirection(true)
.enableAutoFetch(false)
- .isCompressed(true)
.withCompressionType(CompressionType.SNAPPY)
.withBooleanEncoding(TSEncoding.PLAIN)
.withInt32Encoding(TSEncoding.CHIMP)
@@ -81,10 +80,9 @@ public class RpcCompressedTest {
.nodeUrls(nodeUrls)
.username("root")
.password("root")
- .enableCompression(false)
+ .enableCompression(true)
.enableRedirection(true)
.enableAutoFetch(false)
- .isCompressed(true)
.withCompressionType(CompressionType.SNAPPY)
.withBooleanEncoding(TSEncoding.PLAIN)
.withInt32Encoding(TSEncoding.SPRINTZ)
@@ -102,10 +100,9 @@ public class RpcCompressedTest {
.nodeUrls(nodeUrls)
.username("root")
.password("root")
- .enableCompression(false)
+ .enableCompression(true)
.enableRedirection(true)
.enableAutoFetch(false)
- .isCompressed(true)
.withCompressionType(CompressionType.GZIP)
.withBooleanEncoding(TSEncoding.RLE)
.withInt32Encoding(TSEncoding.TS_2DIFF)
@@ -123,10 +120,9 @@ public class RpcCompressedTest {
.nodeUrls(nodeUrls)
.username("root")
.password("root")
- .enableCompression(false)
+ .enableCompression(true)
.enableRedirection(true)
.enableAutoFetch(false)
- .isCompressed(true)
.withCompressionType(CompressionType.LZMA2)
.withBooleanEncoding(TSEncoding.PLAIN)
.withInt32Encoding(TSEncoding.GORILLA)
diff --git
a/iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java
b/iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java
index 650d0087eb6..fa7c8c611c2 100644
---
a/iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java
+++
b/iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java
@@ -125,7 +125,7 @@ public class SessionPoolTest {
assertEquals(1, pool.getFetchSize());
assertEquals(2, pool.getWaitToGetSessionTimeoutInMs());
assertTrue(pool.isEnableRedirection());
- assertTrue(pool.isEnableCompression());
+ assertTrue(pool.isEnableThriftCompression());
assertEquals(3, pool.getConnectionTimeoutInMs());
assertEquals(ZoneOffset.UTC, pool.getZoneId());
assertEquals(Version.V_1_0, pool.getVersion());
@@ -157,7 +157,7 @@ public class SessionPoolTest {
assertEquals(1, pool.getFetchSize());
assertEquals(2, pool.getWaitToGetSessionTimeoutInMs());
assertTrue(pool.isEnableRedirection());
- assertTrue(pool.isEnableCompression());
+ assertTrue(pool.isEnableThriftCompression());
assertEquals(3, pool.getConnectionTimeoutInMs());
assertEquals(ZoneOffset.UTC, pool.getZoneId());
assertEquals(Version.V_1_0, pool.getVersion());
