init SessionPool in BenchmarkSessionPool

thulab · Jul 20, 2023 · 6cc73e9 · 6cc73e9
1 parent 8537045
commit 6cc73e9
Showing 1 changed file with 11 additions and 16 deletions.
diff --git a/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDBClusterSession.java b/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDBClusterSession.java
@@ -19,25 +19,15 @@
 
 package cn.edu.tsinghua.iot.benchmark.iotdb110;
 
+import cn.edu.tsinghua.iot.benchmark.tsdb.DBConfig;
+import cn.edu.tsinghua.iot.benchmark.tsdb.TsdbException;
 import org.apache.iotdb.isession.pool.SessionDataSetWrapper;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.pool.SessionPool;
 import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
 import org.apache.iotdb.tsfile.read.common.RowRecord;
 import org.apache.iotdb.tsfile.write.record.Tablet;
-
-import cn.edu.tsinghua.iot.benchmark.client.operation.Operation;
-import cn.edu.tsinghua.iot.benchmark.conf.Config;
-import cn.edu.tsinghua.iot.benchmark.conf.ConfigDescriptor;
-import cn.edu.tsinghua.iot.benchmark.entity.Batch.IBatch;
-import cn.edu.tsinghua.iot.benchmark.entity.DeviceSummary;
-import cn.edu.tsinghua.iot.benchmark.entity.Record;
-import cn.edu.tsinghua.iot.benchmark.entity.Sensor;
-import cn.edu.tsinghua.iot.benchmark.measurement.Status;
-import cn.edu.tsinghua.iot.benchmark.schema.schemaImpl.DeviceSchema;
-import cn.edu.tsinghua.iot.benchmark.tsdb.DBConfig;
-import cn.edu.tsinghua.iot.benchmark.tsdb.TsdbException;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
@@ -48,8 +38,14 @@ public class IoTDBClusterSession extends IoTDBSessionBase {
   private class BenchmarkSessionPool implements IBenchmarkSession {
     private final SessionPool sessionPool;
 
-    public BenchmarkSessionPool(SessionPool sessionPool) {
-      this.sessionPool = sessionPool;
+    public BenchmarkSessionPool(List<String> hostUrls, String user, String password, int maxSize, boolean enableCompression, boolean enableRedirection) {
+      this.sessionPool = new SessionPool(
+          hostUrls,
+          dbConfig.getUSERNAME(),
+          dbConfig.getPASSWORD(),
+          MAX_SESSION_CONNECTION_PER_CLIENT,
+          config.isENABLE_THRIFT_COMPRESSION(),
+          true);
     }
 
     @Override
@@ -168,13 +164,12 @@ public IoTDBClusterSession(DBConfig dbConfig) {
     }
     sessionWrapper =
         new BenchmarkSessionPool(
-            new SessionPool(
                 hostUrls,
                 dbConfig.getUSERNAME(),
                 dbConfig.getPASSWORD(),
                 MAX_SESSION_CONNECTION_PER_CLIENT,
                 config.isENABLE_THRIFT_COMPRESSION(),
-                true));
+                true);
   }
 
   @Override