This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch rc/1.2.1 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fbf2a3e4d2382c5336289062f41d6ce1c1d3adf4 Author: HTHou <[email protected]> AuthorDate: Mon Aug 21 16:21:26 2023 +0800 Revert "[To rel/1.2] Stop generating FilterExpression if we don't specify the time filter in last query session api" This reverts commit d4f745365d086a88f32796398428a87d1d2073a1. --- .../protocol/thrift/impl/ClientRPCServiceImpl.java | 2 +- .../queryengine/plan/parser/StatementGenerator.java | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java index 25e7d3db2c6..64f147c4977 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java @@ -952,7 +952,7 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler { paths.add(req.deviceId + "." + sensor); } TSLastDataQueryReq tsLastDataQueryReq = - new TSLastDataQueryReq(req.sessionId, paths, Long.MIN_VALUE, req.statementId); + new TSLastDataQueryReq(req.sessionId, paths, 0, req.statementId); tsLastDataQueryReq.setFetchSize(req.fetchSize); tsLastDataQueryReq.setEnableRedirectQuery(req.enableRedirectQuery); tsLastDataQueryReq.setLegalPathNodes(req.legalPathNodes); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index 74cb4fb8aa2..8a2e98d3be2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -197,21 +197,18 @@ public class StatementGenerator { new ResultColumn( new TimeSeriesOperand(new PartialPath("", false)), ResultColumn.ColumnType.RAW)); - QueryStatement lastQueryStatement = new QueryStatement(); - - if (lastDataQueryReq.getTime() != Long.MIN_VALUE) { - // set query filter - WhereCondition whereCondition = new WhereCondition(); - GreaterEqualExpression predicate = - new GreaterEqualExpression( - new TimestampOperand(), - new ConstantOperand(TSDataType.INT64, Long.toString(lastDataQueryReq.getTime()))); - whereCondition.setPredicate(predicate); - lastQueryStatement.setWhereCondition(whereCondition); - } + // set query filter + WhereCondition whereCondition = new WhereCondition(); + GreaterEqualExpression predicate = + new GreaterEqualExpression( + new TimestampOperand(), + new ConstantOperand(TSDataType.INT64, Long.toString(lastDataQueryReq.getTime()))); + whereCondition.setPredicate(predicate); + QueryStatement lastQueryStatement = new QueryStatement(); lastQueryStatement.setSelectComponent(selectComponent); lastQueryStatement.setFromComponent(fromComponent); + lastQueryStatement.setWhereCondition(whereCondition); PERFORMANCE_OVERVIEW_METRICS.recordParseCost(System.nanoTime() - startTime); return lastQueryStatement;
