This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/1.2_add_group_api in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit de48bd7030c7b871d7122ec01cb95a7fe76d5b83 Author: Beyyes <[email protected]> AuthorDate: Tue Jul 18 16:32:51 2023 +0800 remove useless code --- .../apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java | 7 ------- .../org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java | 4 ++++ iotdb-protocol/thrift/src/main/thrift/client.thrift | 1 - 3 files changed, 4 insertions(+), 8 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 7b42bb0896e..f256a15ed88 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 @@ -181,7 +181,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; @@ -236,9 +235,6 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler { return pair.right; }; - private static final Semaphore querySemaphore = - new Semaphore(Runtime.getRuntime().availableProcessors() * 2); - public ClientRPCServiceImpl() { partitionFetcher = ClusterPartitionFetcher.getInstance(); schemaFetcher = ClusterSchemaFetcher.getInstance(); @@ -748,8 +744,6 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler { throws TException { try { - querySemaphore.acquire(); - IClientSession clientSession = SESSION_MANAGER.getCurrSessionAndUpdateIdleTime(); String database = req.getDatabase(); @@ -808,7 +802,6 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler { return RpcUtils.getTSExecuteStatementResp( onQueryException(e, "\"" + req + "\". " + OperationType.EXECUTE_AGG_QUERY)); } finally { - querySemaphore.release(); SESSION_MANAGER.updateIdleTime(); } } diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java index 4fe31cc0331..44848a01967 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java @@ -21,6 +21,7 @@ package org.apache.iotdb.tsfile.read.filter.factory; import org.apache.iotdb.tsfile.read.filter.GroupByFilter; import org.apache.iotdb.tsfile.read.filter.GroupByMonthFilter; +import org.apache.iotdb.tsfile.read.filter.TimeFilter; import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.read.filter.operator.AndFilter; import org.apache.iotdb.tsfile.read.filter.operator.Between; @@ -106,6 +107,9 @@ public class FilterFactory { case BETWEEN: filter = new Between<>(); break; + case TIME_GTEQ_AND_LT: + filter = new TimeFilter.TimeGtEqAndLt(); + break; default: throw new UnsupportedOperationException("Unknown filter type " + id); } diff --git a/iotdb-protocol/thrift/src/main/thrift/client.thrift b/iotdb-protocol/thrift/src/main/thrift/client.thrift index 45d3aa608df..323b955f1da 100644 --- a/iotdb-protocol/thrift/src/main/thrift/client.thrift +++ b/iotdb-protocol/thrift/src/main/thrift/client.thrift @@ -517,7 +517,6 @@ service IClientRPCService { TSExecuteStatementResp executeGroupByQueryIntervalQuery(1:TSGroupByQueryIntervalReq req); - TSFetchResultsResp fetchResultsV2(1:TSFetchResultsReq req); TSOpenSessionResp openSession(1:TSOpenSessionReq req);
