diff --git a/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDB.java b/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDB.java index e4cae6f0e..f64ae606e 100644 --- a/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDB.java +++ b/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDB.java @@ -726,8 +726,10 @@ protected Status executeQueryAndGetStatus(String sql, Operation operation) { isOk.set(false); } long resultPointNum = line.get(); - resultPointNum *= config.getQUERY_SENSOR_NUM(); - resultPointNum *= config.getQUERY_DEVICE_NUM(); + if (!Operation.LATEST_POINT_QUERY.equals(operation)) { + resultPointNum *= config.getQUERY_SENSOR_NUM(); + resultPointNum *= config.getQUERY_DEVICE_NUM(); + } queryResultPointNum.set(resultPointNum); }); try { diff --git a/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDBSessionBase.java b/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDBSessionBase.java index 548cb8a36..01c474ffd 100644 --- a/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDBSessionBase.java +++ b/iotdb-1.1/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb110/IoTDBSessionBase.java @@ -56,6 +56,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; public class IoTDBSessionBase extends IoTDB { @@ -174,9 +175,8 @@ protected Status executeQueryAndGetStatus(String sql, Operation operation) { LOGGER.info("{} query SQL: {}", Thread.currentThread().getName(), executeSQL); } AtomicInteger line = new AtomicInteger(); - AtomicInteger queryResultPointNum = new AtomicInteger(); + AtomicLong queryResultPointNum = new AtomicLong(); AtomicBoolean isOk = new AtomicBoolean(true); - try { List> records = new ArrayList<>(); future = @@ -224,8 +224,12 @@ protected Status executeQueryAndGetStatus(String sql, Operation operation) { LOGGER.error("exception occurred when execute query={}", executeSQL, e); isOk.set(false); } - queryResultPointNum.set( - line.get() * config.getQUERY_SENSOR_NUM() * config.getQUERY_DEVICE_NUM()); + long resultPointNum = line.get(); + if (!Operation.LATEST_POINT_QUERY.equals(operation)) { + resultPointNum *= config.getQUERY_SENSOR_NUM(); + resultPointNum *= config.getQUERY_DEVICE_NUM(); + } + queryResultPointNum.set(resultPointNum); }); try { future.get(config.getREAD_OPERATION_TIMEOUT_MS(), TimeUnit.MILLISECONDS);